From: Chris Metcalf <cmetcalf@ezchip.com>
Date: Fri, 26 Dec 2014 21:22:28 +0000 (-0500)
Subject: tilegx: fix sysdep.h to avoid a redefinition warning
X-Git-Tag: glibc-2.21~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d24aa6056c7e70dc96948c6c6c84ed4a523ec65;p=thirdparty%2Fglibc.git

tilegx: fix sysdep.h to avoid a redefinition warning

The symbol for HAVE_CLOCK_GETTIME_VSYSCALL was being
only conditionally defined under [SHARED].  However, it turns
out this causes a preprocessor symbol redefinition warning
when building clock_gettime.o.  Move the symbol definition
down to make it unconditional, like other platforms do.
---

diff --git a/ChangeLog b/ChangeLog
index 3b01ed88d4d..1dc4798eb03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-12-26  Chris Metcalf  <cmetcalf@ezchip.com>
 
+	* sysdeps/unix/sysv/linux/tile/sysdep.h
+	(HAVE_CLOCK_GETTIME_VSYSCALL): Move definition out of
+	assembly-specific section to avoid a redefinition warning.
+
 	* sysdeps/tile/jmpbuf-unwind.h (_JMPBUF_CFA_UNWINDS_ADJ): Cast to
 	long before casting to pointer to avoid a cast warning.
 
diff --git a/sysdeps/unix/sysv/linux/tile/sysdep.h b/sysdeps/unix/sysv/linux/tile/sysdep.h
index d3b98bd359a..143a0c4cb60 100644
--- a/sysdeps/unix/sysv/linux/tile/sysdep.h
+++ b/sysdeps/unix/sysv/linux/tile/sysdep.h
@@ -252,9 +252,6 @@
     v_ret;								      \
   })
 
-/* List of system calls which are supported as vsyscalls.  */
-#  define HAVE_CLOCK_GETTIME_VSYSCALL	1
-
 # else
 #  define INLINE_VSYSCALL(name, nr, args...) \
   INLINE_SYSCALL (name, nr, ##args)
@@ -263,6 +260,9 @@
 # endif
 #endif /* not __ASSEMBLER__ */
 
+/* List of system calls which are supported as vsyscalls.  */
+#define HAVE_CLOCK_GETTIME_VSYSCALL	1
+
 /* Pointer mangling support.  */
 #if IS_IN (rtld)
 /* We cannot use the thread descriptor because in ld.so we use setjmp