AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

* csu/libc-start.c: Don't handle VDSO_SETUP here.

Browse Source 
* sysdeps/unix/sysv/linux/init-first.c: Handle it here instead.
	* sysdeps/unix/sysv/linux/x86_64/libc-start.c: Renamed to...
	* sysdeps/unix/sysv/linux/x86_64/init-first.c: ...this.  New file.
	* sysdeps/unix/sysv/linux/powerpc/libc-start.c: Move VDSO_SETUP code
	to...
	* sysdeps/unix/sysv/linux/x86_64/init-first.c: ...here.  New file.
This commit is contained in:
Ulrich Drepper 2007-08-20 22:36:43 +00:00
parent b83fb35cd1
commit fb84593c43
8 changed files with 78 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2007-08-20 Ulrich Drepper <drepper@redhat.com>
* csu/libc-start.c: Don't handle VDSO_SETUP here.
* sysdeps/unix/sysv/linux/init-first.c: Handle it here instead.
* sysdeps/unix/sysv/linux/x86_64/libc-start.c: Renamed to...
* sysdeps/unix/sysv/linux/x86_64/init-first.c: ...this. New file.
* sysdeps/unix/sysv/linux/powerpc/libc-start.c: Move VDSO_SETUP code
to...
* sysdeps/unix/sysv/linux/x86_64/init-first.c: ...here. New file.
2007-08-18 Ulrich Drepper <drepper@redhat.com>
* po/nl.po: Update from translation team.

4
csu/libc-start.c
View File

@ -148,10 +148,6 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
# endif
#endif
#ifdef VDSO_SETUP
VDSO_SETUP ();
#endif
/* Register the destructor of the dynamic linker if there is any. */
if (__builtin_expect (rtld_fini != NULL, 1))
__cxa_atexit ((void (*) (void *)) rtld_fini, NULL, NULL);

5
nptl/ChangeLog
View File

@ -1,3 +1,8 @@
2007-08-20 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
(__pthread_cond_timedwait): Use clock_gettime from VDSO if possible.
2007-08-16 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/alpha/lowlevellock.h

9
nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
View File

@ -134,8 +134,15 @@ __pthread_cond_timedwait:
/* Only clocks 0 and 1 are allowed so far. Both are handled in the
kernel. */
leaq 24(%rsp), %rsi
movl $__NR_clock_gettime, %eax
movq __vdso_clock_gettime@GOTPCREL(%rip), %rax
movq (%rax), %rax
PTR_DEMANGLE (%rax)
jz 26f
call *%rax
jmp 27f
26: movl $__NR_clock_gettime, %eax
syscall
27:
# ifndef __ASSUME_POSIX_TIMERS
cmpq $-ENOSYS, %rax
je 19f

6
sysdeps/unix/sysv/linux/init-first.c
View File

@ -1,5 +1,5 @@
/* Initialization code run first thing by the ELF startup code. Linux version.
Copyright (C) 1995-2004, 2005 Free Software Foundation, Inc.
Copyright (C) 1995-2004, 2005, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -82,6 +82,10 @@ _init (int argc, char **argv, char **envp)
_dl_non_dynamic_init ();
#endif
#ifdef VDSO_SETUP
VDSO_SETUP ();
#endif
__init_misc (argc, argv, envp);
#ifdef USE_NONOPTION_FLAGS

49
sysdeps/unix/sysv/linux/powerpc/init-first.c Normal file
View File

@ -0,0 +1,49 @@
/* Copyright (C) 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#ifdef SHARED
# include <dl-vdso.h>
# undef __gettimeofday
# undef __clock_gettime
# undef __clock_getres
# include <bits/libc-vdso.h>
void *__vdso_gettimeofday attribute_hidden;
void *__vdso_clock_gettime;
void *__vdso_clock_getres;
void *__vdso_get_tbfreq;
static inline void
_libc_vdso_platform_setup (void)
{
PREPARE_VERSION (linux2615, "LINUX_2.6.15", 123718565);
__vdso_gettimeofday = _dl_vdso_vsym ("__kernel_gettimeofday", &linux2615);
__vdso_clock_gettime = _dl_vdso_vsym ("__kernel_clock_gettime", &linux2615);
__vdso_clock_getres = _dl_vdso_vsym ("__kernel_clock_getres", &linux2615);
__vdso_get_tbfreq = _dl_vdso_vsym ("__kernel_vdso_get_tbfreq", &linux2615);
}
# define VDSO_SETUP _libc_vdso_platform_setup
#endif
#include "../init-first.c"

31
sysdeps/unix/sysv/linux/powerpc/libc-start.c
View File

@ -25,37 +25,6 @@
#include <bp-sym.h>
#ifdef SHARED
# include <sys/time.h>
# include <dl-vdso.h>
# undef __gettimeofday
# undef __clock_gettime
# undef __clock_getres
# include <bits/libc-vdso.h>
void *__vdso_gettimeofday attribute_hidden;
void *__vdso_clock_gettime;
void *__vdso_clock_getres;
void *__vdso_get_tbfreq;
static inline void
_libc_vdso_platform_setup (void)
{
PREPARE_VERSION (linux2615, "LINUX_2.6.15", 123718565);
__vdso_gettimeofday = _dl_vdso_vsym ("__kernel_gettimeofday", &linux2615);
__vdso_clock_gettime = _dl_vdso_vsym ("__kernel_clock_gettime", &linux2615);
__vdso_clock_getres = _dl_vdso_vsym ("__kernel_clock_getres", &linux2615);
__vdso_get_tbfreq = _dl_vdso_vsym ("__kernel_vdso_get_tbfreq", &linux2615);
}
# define VDSO_SETUP _libc_vdso_platform_setup
#endif
int __cache_line_size attribute_hidden;
/* The main work is done in the generic function. */
#define LIBC_START_MAIN generic_start_main

2
sysdeps/unix/sysv/linux/x86_64/libc-start.c → sysdeps/unix/sysv/linux/x86_64/init-first.c
View File

@ -46,4 +46,4 @@ _libc_vdso_platform_setup (void)
# define VDSO_SETUP _libc_vdso_platform_setup
#endif
#include <csu/libc-start.c>
#include "../init-first.c"