forked from pool/glibc
b95761bac7
incorporate some fixes. OBS-URL: https://build.opensuse.org/request/show/83462 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=106
480 lines
15 KiB
Diff
480 lines
15 KiB
Diff
commit 91b392a4bab0c2dc90e7e3ff914dec20b97adca8
|
|
Author: Ulrich Drepper <drepper@gmail.com>
|
|
Date: Sun Aug 21 13:52:28 2011 -0400
|
|
|
|
Use ifuncs for time and gettimeofday on x86-64
|
|
|
|
2011-08-21 Ulrich Drepper <drepper@gmail.com>
|
|
|
|
* sysdeps/unix/sysv/linux/x86_64/gettimeofday.S: Removed.
|
|
* sysdeps/unix/sysv/linux/x86_64/time.S: Removed.
|
|
* sysdeps/unix/sysv/linux/x86_64/gettimeofday.c: New file.
|
|
* sysdeps/unix/sysv/linux/x86_64/time.c: New file.
|
|
* sysdeps/unix/sysv/linux/x86_64/bits/libc-vdso.h: Remove declaration
|
|
of __vdso_gettimeofday.
|
|
* sysdeps/unix/sysv/linux/x86_64/init-first.c: Remove definition of
|
|
__vdso_gettimeofday and __vdso_time. Define __vdso_getcpu with
|
|
attribute_hidden.
|
|
(_libc_vdso_platform_setup): Remove initialization of
|
|
__vdso_gettimeofday and __vdso_time.
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/libc-vdso.h b/sysdeps/unix/sysv/linux/x86_64/bits/libc-vdso.h
|
|
index d7123c9..f9bf84e 100644
|
|
--- a/sysdeps/unix/sysv/linux/x86_64/bits/libc-vdso.h
|
|
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/libc-vdso.h
|
|
@@ -1,5 +1,5 @@
|
|
/* Resolve function pointers to VDSO functions.
|
|
- Copyright (C) 2005, 2007 Free Software Foundation, Inc.
|
|
+ Copyright (C) 2005, 2007, 2011 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
|
|
@@ -25,9 +25,6 @@
|
|
|
|
#ifdef SHARED
|
|
|
|
-extern long int (*__vdso_gettimeofday) (struct timeval *, void *)
|
|
- attribute_hidden;
|
|
-
|
|
extern long int (*__vdso_clock_gettime) (clockid_t, struct timespec *);
|
|
|
|
#endif
|
|
diff --git a/sysdeps/unix/sysv/linux/x86_64/gettimeofday.S b/sysdeps/unix/sysv/linux/x86_64/gettimeofday.S
|
|
deleted file mode 100644
|
|
index f618e73..0000000
|
|
--- a/sysdeps/unix/sysv/linux/x86_64/gettimeofday.S
|
|
+++ /dev/null
|
|
@@ -1,49 +0,0 @@
|
|
-/* Copyright (C) 2002, 2003, 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. */
|
|
-
|
|
-#include <sysdep.h>
|
|
-#define _ERRNO_H 1
|
|
-#include <bits/errno.h>
|
|
-
|
|
-/* For the calculation see asm/vsyscall.h. */
|
|
-#define VSYSCALL_ADDR_vgettimeofday 0xffffffffff600000
|
|
-
|
|
-
|
|
-ENTRY (__gettimeofday)
|
|
- /* Align stack. */
|
|
- sub $0x8, %rsp
|
|
- cfi_adjust_cfa_offset(8)
|
|
-#ifdef SHARED
|
|
- movq __vdso_gettimeofday(%rip), %rax
|
|
- PTR_DEMANGLE (%rax)
|
|
-#else
|
|
- movq $VSYSCALL_ADDR_vgettimeofday, %rax
|
|
-#endif
|
|
- callq *%rax
|
|
- /* Check error return. */
|
|
- cmpl $-4095, %eax
|
|
- jae SYSCALL_ERROR_LABEL
|
|
-
|
|
-L(pseudo_end):
|
|
- add $0x8, %rsp
|
|
- cfi_adjust_cfa_offset(-8)
|
|
- ret
|
|
-PSEUDO_END(__gettimeofday)
|
|
-
|
|
-strong_alias (__gettimeofday, __gettimeofday_internal)
|
|
-weak_alias (__gettimeofday, gettimeofday)
|
|
diff --git a/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c b/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
|
|
new file mode 100644
|
|
index 0000000..1a773d6
|
|
--- /dev/null
|
|
+++ b/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
|
|
@@ -0,0 +1,49 @@
|
|
+/* Copyright (C) 2002, 2003, 2007, 2011 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. */
|
|
+
|
|
+#include <dl-vdso.h>
|
|
+
|
|
+
|
|
+#define VSYSCALL_ADDR_vgettimeofday 0xffffffffff600000ul
|
|
+
|
|
+
|
|
+#ifdef SHARED
|
|
+void *gettimeofday_ifunc (void) __asm__ ("__gettimeofday");
|
|
+
|
|
+void *
|
|
+gettimeofday_ifunc (void)
|
|
+{
|
|
+ PREPARE_VERSION (linux26, "LINUX_2.6", 61765110);
|
|
+
|
|
+ /* If the vDSO is not available we fall back on the old vsyscall. */
|
|
+ return (_dl_vdso_vsym ("gettimeofday", &linux26)
|
|
+ ?: (void *) VSYSCALL_ADDR_vgettimeofday);
|
|
+}
|
|
+__asm (".type __gettimeofday, %gnu_indirect_function");
|
|
+#else
|
|
+# include <sys/time.h>
|
|
+
|
|
+int
|
|
+__gettimeofday (struct timeval *tv, struct timezone *tz)
|
|
+{
|
|
+ return ((int (*) (struct timeval *, struct timezone *)) VSYSCALL_ADDR_vgettimeofday) (tv, tz);
|
|
+}
|
|
+#endif
|
|
+
|
|
+weak_alias (__gettimeofday, gettimeofday)
|
|
+strong_alias (__gettimeofday, __gettimeofday_internal)
|
|
diff --git a/sysdeps/unix/sysv/linux/x86_64/init-first.c b/sysdeps/unix/sysv/linux/x86_64/init-first.c
|
|
index e676f62..25cf08b 100644
|
|
--- a/sysdeps/unix/sysv/linux/x86_64/init-first.c
|
|
+++ b/sysdeps/unix/sysv/linux/x86_64/init-first.c
|
|
@@ -20,15 +20,11 @@
|
|
# include <dl-vdso.h>
|
|
# include <bits/libc-vdso.h>
|
|
|
|
-long int (*__vdso_gettimeofday) (struct timeval *, void *) attribute_hidden;
|
|
-
|
|
long int (*__vdso_clock_gettime) (clockid_t, struct timespec *)
|
|
__attribute__ ((nocommon));
|
|
strong_alias (__vdso_clock_gettime, __GI___vdso_clock_gettime attribute_hidden)
|
|
|
|
-long int (*__vdso_getcpu) (unsigned *, unsigned *, void *);
|
|
-
|
|
-long int (*__vdso_time) (time_t *) attribute_hidden;
|
|
+long int (*__vdso_getcpu) (unsigned *, unsigned *, void *) attribute_hidden;
|
|
|
|
|
|
static inline void
|
|
@@ -36,15 +32,7 @@ _libc_vdso_platform_setup (void)
|
|
{
|
|
PREPARE_VERSION (linux26, "LINUX_2.6", 61765110);
|
|
|
|
- void *p = _dl_vdso_vsym ("gettimeofday", &linux26);
|
|
- /* If the vDSO is not available we fall back on the old vsyscall. */
|
|
-#define VSYSCALL_ADDR_vgettimeofday 0xffffffffff600000ul
|
|
- if (p == NULL)
|
|
- p = (void *) VSYSCALL_ADDR_vgettimeofday;
|
|
- PTR_MANGLE (p);
|
|
- __vdso_gettimeofday = p;
|
|
-
|
|
- p = _dl_vdso_vsym ("clock_gettime", &linux26);
|
|
+ void *p = _dl_vdso_vsym ("clock_gettime", &linux26);
|
|
PTR_MANGLE (p);
|
|
__GI___vdso_clock_gettime = p;
|
|
|
|
@@ -55,14 +43,6 @@ _libc_vdso_platform_setup (void)
|
|
p = (void *) VSYSCALL_ADDR_vgetcpu;
|
|
PTR_MANGLE (p);
|
|
__vdso_getcpu = p;
|
|
-
|
|
- p = _dl_vdso_vsym ("time", &linux26);
|
|
- /* If the vDSO is not available we fall back on the old vsyscall. */
|
|
-#define VSYSCALL_ADDR_vtime 0xffffffffff600400
|
|
- if (p == NULL)
|
|
- p = (void *) VSYSCALL_ADDR_vtime;
|
|
- PTR_MANGLE (p);
|
|
- __vdso_time = p;
|
|
}
|
|
|
|
# define VDSO_SETUP _libc_vdso_platform_setup
|
|
diff --git a/sysdeps/unix/sysv/linux/x86_64/time.S b/sysdeps/unix/sysv/linux/x86_64/time.S
|
|
deleted file mode 100644
|
|
index 66d7498..0000000
|
|
--- a/sysdeps/unix/sysv/linux/x86_64/time.S
|
|
+++ /dev/null
|
|
@@ -1,47 +0,0 @@
|
|
-/* Copyright (C) 2001,02, 2003, 2011 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. */
|
|
-
|
|
-#include <sysdep.h>
|
|
-#define _ERRNO_H 1
|
|
-#include <bits/errno.h>
|
|
-
|
|
-/* For the calculation see asm/vsyscall.h. */
|
|
-#define VSYSCALL_ADDR_vtime 0xffffffffff600400
|
|
-
|
|
-
|
|
-/* Return the current time as a `time_t' and also put it in *T if T is
|
|
- not NULL. Time is represented as seconds from Jan 1 00:00:00 1970. */
|
|
-
|
|
-ENTRY (time)
|
|
- /* Align stack. */
|
|
- sub $0x8, %rsp
|
|
- cfi_adjust_cfa_offset(8)
|
|
-
|
|
-#ifdef SHARED
|
|
- movq __vdso_time(%rip), %rax
|
|
- PTR_DEMANGLE (%rax)
|
|
-#else
|
|
- movq $VSYSCALL_ADDR_vtime, %rax
|
|
-#endif
|
|
- callq *%rax
|
|
-
|
|
- add $0x8, %rsp
|
|
- cfi_adjust_cfa_offset(-8)
|
|
- ret
|
|
-PSEUDO_END_NOERRNO(time)
|
|
-libc_hidden_def (time)
|
|
diff --git a/sysdeps/unix/sysv/linux/x86_64/time.c b/sysdeps/unix/sysv/linux/x86_64/time.c
|
|
new file mode 100644
|
|
index 0000000..698d561
|
|
--- /dev/null
|
|
+++ b/sysdeps/unix/sysv/linux/x86_64/time.c
|
|
@@ -0,0 +1,47 @@
|
|
+/* Copyright (C) 2001,02, 2003, 2011 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. */
|
|
+
|
|
+#include <dl-vdso.h>
|
|
+
|
|
+
|
|
+#define VSYSCALL_ADDR_vtime 0xffffffffff600400
|
|
+
|
|
+
|
|
+#ifdef SHARED
|
|
+void *time_ifunc (void) __asm__ ("time");
|
|
+
|
|
+void *
|
|
+time_ifunc (void)
|
|
+{
|
|
+ PREPARE_VERSION (linux26, "LINUX_2.6", 61765110);
|
|
+
|
|
+ /* If the vDSO is not available we fall back on the old vsyscall. */
|
|
+ return _dl_vdso_vsym ("time", &linux26) ?: (void *) VSYSCALL_ADDR_vtime;
|
|
+}
|
|
+__asm (".type time, %gnu_indirect_function");
|
|
+#else
|
|
+# include <time.h>
|
|
+
|
|
+time_t
|
|
+time (time_t *t)
|
|
+{
|
|
+ return ((time_t (*) (time_t *)) VSYSCALL_ADDR_vtime) (t);
|
|
+}
|
|
+#endif
|
|
+
|
|
+strong_alias (time, __GI_time)
|
|
|
|
commit 2bc174332ba6ddbd1b855dced33889bef56e8ba3
|
|
Author: Andreas Schwab <schwab@redhat.com>
|
|
Date: Tue Aug 30 15:37:54 2011 +0200
|
|
|
|
Relocate objects in dependency order
|
|
|
|
2011-08-30 Andreas Schwab <schwab@redhat.com>
|
|
|
|
* elf/rtld.c (dl_main): Relocate objects in dependency order.
|
|
|
|
diff --git a/elf/rtld.c b/elf/rtld.c
|
|
index 87bb5f0..4f6bbfd 100644
|
|
--- a/elf/rtld.c
|
|
+++ b/elf/rtld.c
|
|
@@ -2255,13 +2255,12 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
|
|
/* If we are profiling we also must do lazy reloaction. */
|
|
GLRO(dl_lazy) |= consider_profiling;
|
|
|
|
- struct link_map *l = main_map;
|
|
- while (l->l_next)
|
|
- l = l->l_next;
|
|
-
|
|
HP_TIMING_NOW (start);
|
|
- do
|
|
+ unsigned i = main_map->l_searchlist.r_nlist;
|
|
+ while (i-- > 0)
|
|
{
|
|
+ struct link_map *l = main_map->l_initfini[i];
|
|
+
|
|
/* While we are at it, help the memory handling a bit. We have to
|
|
mark some data structures as allocated with the fake malloc()
|
|
implementation in ld.so. */
|
|
@@ -2280,10 +2279,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
|
|
/* Add object to slot information data if necessasy. */
|
|
if (l->l_tls_blocksize != 0 && tls_init_tp_called)
|
|
_dl_add_to_slotinfo (l);
|
|
-
|
|
- l = l->l_prev;
|
|
}
|
|
- while (l);
|
|
HP_TIMING_NOW (stop);
|
|
|
|
HP_TIMING_DIFF (relocate_time, start, stop);
|
|
|
|
commit ef60624956e93df1da329a48570776ed963b1916
|
|
Author: Ulrich Drepper <drepper@gmail.com>
|
|
Date: Tue Sep 6 00:12:18 2011 -0400
|
|
|
|
Prefer real syscalls instead of vsyscalls on x86-64 outside libc.so
|
|
|
|
2011-09-06 Ulrich Drepper <drepper@gmail.com>
|
|
|
|
* sysdeps/unix/sysv/linux/kernel-features.h: Add entry for getcpu
|
|
syscall on x86-64.
|
|
* sysdeps/unix/sysv/linux/x86_64/gettimeofday.c [!SHARED]: Use real
|
|
syscall.
|
|
* sysdeps/unix/sysv/linux/x86_64/time.c: Likewise.
|
|
* sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S [!SHARED]: Use real
|
|
syscall if possible.
|
|
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
|
|
index d91f581..58f833e 100644
|
|
--- a/sysdeps/unix/sysv/linux/kernel-features.h
|
|
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
|
|
@@ -546,3 +546,8 @@
|
|
#if __LINUX_KERNEL_VERSION >= 0x020627
|
|
# define __ASSUME_SENDMMSG 1
|
|
#endif
|
|
+
|
|
+/* getcpu is a syscall for x86-64 since 3.1. */
|
|
+#if defined __x86_64__ && __LINUX_KERNEL_VERSION >= 0x030100
|
|
+# define __ASSUME_GETCPU_SYSCALL 1
|
|
+#endif
|
|
diff --git a/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c b/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
|
|
index 1a773d6..56171bc 100644
|
|
--- a/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
|
|
+++ b/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
|
|
@@ -37,11 +37,12 @@ gettimeofday_ifunc (void)
|
|
__asm (".type __gettimeofday, %gnu_indirect_function");
|
|
#else
|
|
# include <sys/time.h>
|
|
+# include <sysdep.h>
|
|
|
|
int
|
|
__gettimeofday (struct timeval *tv, struct timezone *tz)
|
|
{
|
|
- return ((int (*) (struct timeval *, struct timezone *)) VSYSCALL_ADDR_vgettimeofday) (tv, tz);
|
|
+ return INLINE_SYSCALL (gettimeofday, 2, tv, tz);
|
|
}
|
|
#endif
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S b/sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S
|
|
index 8ec7d3f..246c955 100644
|
|
--- a/sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S
|
|
+++ b/sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S
|
|
@@ -20,6 +20,7 @@
|
|
#include <tls.h>
|
|
#define _ERRNO_H 1
|
|
#include <bits/errno.h>
|
|
+#include <kernel-features.h>
|
|
|
|
/* For the calculation see asm/vsyscall.h. */
|
|
#define VSYSCALL_ADDR_vgetcpu 0xffffffffff600800
|
|
@@ -38,10 +39,26 @@ ENTRY (sched_getcpu)
|
|
#ifdef SHARED
|
|
movq __vdso_getcpu(%rip), %rax
|
|
PTR_DEMANGLE (%rax)
|
|
+ callq *%rax
|
|
#else
|
|
+# ifdef __NR_getcpu
|
|
+ movl $__NR_getcpu, %eax
|
|
+ syscall
|
|
+# ifndef __ASSUME_GETCPU_SYSCALL
|
|
+ cmpq $-ENOSYS, %rax
|
|
+ jne 1f
|
|
+# endif
|
|
+# endif
|
|
+# ifndef __ASSUME_GETCPU_SYSCALL
|
|
movq $VSYSCALL_ADDR_vgetcpu, %rax
|
|
-#endif
|
|
callq *%rax
|
|
+1:
|
|
+# else
|
|
+# ifndef __NR_getcpu
|
|
+# error "cannot happen"
|
|
+# endif
|
|
+# endif
|
|
+#endif
|
|
|
|
cmpq $-4095, %rax
|
|
jae SYSCALL_ERROR_LABEL
|
|
diff --git a/sysdeps/unix/sysv/linux/x86_64/time.c b/sysdeps/unix/sysv/linux/x86_64/time.c
|
|
index 698d561..c1c1a75 100644
|
|
--- a/sysdeps/unix/sysv/linux/x86_64/time.c
|
|
+++ b/sysdeps/unix/sysv/linux/x86_64/time.c
|
|
@@ -36,11 +36,13 @@ time_ifunc (void)
|
|
__asm (".type time, %gnu_indirect_function");
|
|
#else
|
|
# include <time.h>
|
|
+# include <sysdep.h>
|
|
|
|
time_t
|
|
time (time_t *t)
|
|
{
|
|
- return ((time_t (*) (time_t *)) VSYSCALL_ADDR_vtime) (t);
|
|
+ INTERNAL_SYSCALL_DECL (err);
|
|
+ return INTERNAL_SYSCALL (time, err, 1, t);
|
|
}
|
|
#endif
|
|
|
|
2011-09-06 Andreas Jaeger <aj@suse.de>
|
|
|
|
* sysdeps/unix/sysv/linux/x86_64/gettimeofday.c: Include <errno.h>
|
|
to fix build.
|
|
|
|
Index: glibc-2.14/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
|
|
===================================================================
|
|
--- glibc-2.14.orig/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
|
|
+++ glibc-2.14/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
|
|
@@ -36,6 +36,7 @@ gettimeofday_ifunc (void)
|
|
}
|
|
__asm (".type __gettimeofday, %gnu_indirect_function");
|
|
#else
|
|
+# include <errno.h>
|
|
# include <sys/time.h>
|
|
# include <sysdep.h>
|
|
|