From: Chris Metcalf <cmetcalf@tilera.com>
Date: Tue, 30 Oct 2012 18:11:54 +0000 (-0400)
Subject: tile: improve ABI and #include use in gettimeofday vdso support
X-Git-Tag: glibc-2.17~322
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d44a6f8b9995932b20a2ebbf4ca2fb1be673e49d;p=thirdparty%2Fglibc.git

tile: improve ABI and #include use in gettimeofday vdso support
---

diff --git a/ports/ChangeLog.tile b/ports/ChangeLog.tile
index 8a6cb68d472..63ca021a5cb 100644
--- a/ports/ChangeLog.tile
+++ b/ports/ChangeLog.tile
@@ -1,5 +1,9 @@
 2012-10-30  Chris Metcalf  <cmetcalf@tilera.com>
 
+	* sysdeps/unix/sysv/linux/tile/init-first.c: Use better #include.
+	* sysdeps/unix/sysv/linux/tile/gettimeofday.c: Use gettimeofday
+	aliases that match existing tile ABI.
+
 	* sysdeps/tile/libm-test-ulps: Account for new tests.
 
 2012-10-26  Chris Metcalf  <cmetcalf@tilera.com>
diff --git a/ports/sysdeps/unix/sysv/linux/tile/gettimeofday.c b/ports/sysdeps/unix/sysv/linux/tile/gettimeofday.c
index e2bcc450186..92136d54b6c 100644
--- a/ports/sysdeps/unix/sysv/linux/tile/gettimeofday.c
+++ b/ports/sysdeps/unix/sysv/linux/tile/gettimeofday.c
@@ -19,8 +19,6 @@
 #include <stddef.h>
 #include <sys/time.h>
 #include <time.h>
-
-#undef __gettimeofday
 #include <bits/libc-vdso.h>
 
 int
@@ -34,5 +32,6 @@ __gettimeofday (struct timeval *tv, struct timezone *tz)
   return INLINE_SYSCALL (gettimeofday, 2, tv, tz);
 }
 
-strong_alias (__gettimeofday, __gettimeofday_internal)
+libc_hidden_def (__gettimeofday)
 weak_alias (__gettimeofday, gettimeofday)
+libc_hidden_weak (gettimeofday)
diff --git a/ports/sysdeps/unix/sysv/linux/tile/init-first.c b/ports/sysdeps/unix/sysv/linux/tile/init-first.c
index 58b6533c0f5..9ff63c1d182 100644
--- a/ports/sysdeps/unix/sysv/linux/tile/init-first.c
+++ b/ports/sysdeps/unix/sysv/linux/tile/init-first.c
@@ -31,4 +31,4 @@ _libc_vdso_platform_setup (void)
 #define VDSO_SETUP _libc_vdso_platform_setup
 #endif
 
-#include "../init-first.c"
+#include <csu/init-first.c>