00db10
commit 736c304a1ab4cee36a2f3343f1698bc0abae4608
00db10
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
00db10
Date:   Thu Jan 16 06:53:18 2014 -0600
00db10
00db10
    PowerPC: Fix ftime gettimeofday internal call returning bogus data
00db10
    
00db10
    This patches fixes BZ#16430 by setting a different symbol for internal
00db10
    GLIBC calls that points to ifunc resolvers. For PPC32, if the symbol
00db10
    is defined as hidden (which is the case for gettimeofday and time) the
00db10
    compiler will create local branches (symbol@local) and linker will not
00db10
    create PLT calls (required for IFUNC). This will leads to internal symbol
00db10
    calling the IFUNC resolver instead of the resolved symbol.
00db10
    For PPC64 this behavior does not occur because a call to a function in
00db10
    another translation unit might use a different toc pointer thus requiring
00db10
    a PLT call.
00db10
00db10
diff --git glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c
00db10
index 29a5e08..2085b68 100644
00db10
--- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c
00db10
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c
00db10
@@ -44,8 +44,24 @@ asm (".type __gettimeofday, %gnu_indirect_function");
00db10
 /* This is doing "libc_hidden_def (__gettimeofday)" but the compiler won't
00db10
    let us do it in C because it doesn't know we're defining __gettimeofday
00db10
    here in this file.  */
00db10
-asm (".globl __GI___gettimeofday\n"
00db10
-     "__GI___gettimeofday = __gettimeofday");
00db10
+asm (".globl __GI___gettimeofday");
00db10
+
00db10
+/* __GI___gettimeofday is defined as hidden and for ppc32 it enables the
00db10
+   compiler make a local call (symbol@local) for internal GLIBC usage. It
00db10
+   means the PLT won't be used and the ifunc resolver will be called directly.
00db10
+   For ppc64 a call to a function in another translation unit might use a
00db10
+   different toc pointer thus disallowing direct branchess and making internal
00db10
+   ifuncs calls safe.  */
00db10
+#ifdef __powerpc64__
00db10
+asm ("__GI___gettimeofday = __gettimeofday");
00db10
+#else
00db10
+int
00db10
+__gettimeofday_vsyscall (struct timeval *tv, struct timezone *tz)
00db10
+{
00db10
+  return INLINE_VSYSCALL (gettimeofday, 2, tv, tz);
00db10
+}
00db10
+asm ("__GI___gettimeofday = __gettimeofday_vsyscall");
00db10
+#endif
00db10
 
00db10
 #else
00db10
 
00db10
diff --git glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/time.c glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/time.c
00db10
index 089d0b6..023bc02 100644
00db10
--- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/time.c
00db10
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/time.c
00db10
@@ -54,8 +54,24 @@ asm (".type time, %gnu_indirect_function");
00db10
 /* This is doing "libc_hidden_def (time)" but the compiler won't
00db10
  * let us do it in C because it doesn't know we're defining time
00db10
  * here in this file.  */
00db10
-asm (".globl __GI_time\n"
00db10
-     "__GI_time = time");
00db10
+asm (".globl __GI_time");
00db10
+
00db10
+/* __GI_time is defined as hidden and for ppc32 it enables the
00db10
+   compiler make a local call (symbol@local) for internal GLIBC usage. It
00db10
+   means the PLT won't be used and the ifunc resolver will be called directly.
00db10
+   For ppc64 a call to a function in another translation unit might use a
00db10
+   different toc pointer thus disallowing direct branchess and making internal
00db10
+   ifuncs calls safe.  */
00db10
+#ifdef __powerpc64__
00db10
+asm ("__GI_time = time");
00db10
+#else
00db10
+time_t
00db10
+__time_vsyscall (time_t *t)
00db10
+{
00db10
+  return INLINE_VSYSCALL (time, 1, t);
00db10
+}
00db10
+asm ("__GI_time = __time_vsyscall");
00db10
+#endif
00db10
 
00db10
 #else
00db10