This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED] tilegx: fix sysdep.h to avoid a redefinition warning
- From: Chris Metcalf <cmetcalf at ezchip dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Fri, 26 Dec 2014 16:22:28 -0500
- Subject: [COMMITTED] tilegx: fix sysdep.h to avoid a redefinition warning
- Authentication-results: sourceware.org; auth=none
- Authentication-results: spf=fail (sender IP is 12.216.194.146) smtp dot mailfrom=cmetcalf at ezchip dot com;
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.
---
ChangeLog | 4 ++++
sysdeps/unix/sysv/linux/tile/sysdep.h | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3b01ed88d4da..1dc4798eb034 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 d3b98bd359a0..143a0c4cb600 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
--
2.1.2