about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@ezchip.com>2015-10-21 12:13:14 -0400
committerChris Metcalf <cmetcalf@ezchip.com>2015-10-21 12:18:08 -0400
commit1245e51596059a9844cff0938b10009c3b156115 (patch)
treea19337b437074cea585185b13092af892ba4b146
parent23c4baa21484191be48a3335c8ab5e2f534a3799 (diff)
downloadglibc-1245e51596059a9844cff0938b10009c3b156115.tar.gz
glibc-1245e51596059a9844cff0938b10009c3b156115.tar.xz
glibc-1245e51596059a9844cff0938b10009c3b156115.zip
tile: avoid preprocessor redefinition warnings
PSEUDO_END and PSEUDO_END_NOERRNO are being defined in
sysdeps/unix/sysdep.h and then redefined for tile.  Add an
undef before each define to silence the warnings.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/tile/sysdep.h3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index deab22fa82..f2422edc07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-21  Chris Metcalf  <cmetcalf@ezchip.com>
+
+	* sysdeps/unix/sysv/linux/tile/sysdep.h (PSEUDO_END)
+	(PSEUDO_NOERRNO, PSEUDO_END_NOERRNO): Undef before defining.
+
 2015-10-21  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/unix/sysv/linux/i386/sysdep.h (OPTIMIZE_FOR_GCC_5):
diff --git a/sysdeps/unix/sysv/linux/tile/sysdep.h b/sysdeps/unix/sysv/linux/tile/sysdep.h
index 6b30b2f2dd..d1268de24b 100644
--- a/sysdeps/unix/sysv/linux/tile/sysdep.h
+++ b/sysdeps/unix/sysv/linux/tile/sysdep.h
@@ -53,17 +53,20 @@
 # define SYSCALL_ERROR_NAME plt(__syscall_error)
 #endif
 
+#undef PSEUDO_END
 #define	PSEUDO_END(name)				\
 0:							\
   j SYSCALL_ERROR_NAME;					\
   END (name)
 
+#undef PSEUDO_NOERRNO
 #define	PSEUDO_NOERRNO(name, syscall_name, args)	\
   ENTRY	(name);						\
   DO_CALL(syscall_name, args)
 
 #define ret_NOERRNO  jrp lr
 
+#undef PSEUDO_END_NOERRNO
 #define	PSEUDO_END_NOERRNO(name) \
   END (name)