about summary refs log tree commit diff
path: root/sysdeps/s390
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@redhat.com>2013-04-06 10:53:54 -0400
committerCarlos O'Donell <carlos@redhat.com>2013-04-06 10:53:54 -0400
commit24116fcdbe55d58aa35fc77444ae71a9dec9fff6 (patch)
tree31aa316218722584eb64f806295d768677055f4f /sysdeps/s390
parentee091edf1a16312fff0cc3c6ae0116aded7f1dbf (diff)
downloadglibc-24116fcdbe55d58aa35fc77444ae71a9dec9fff6.tar.gz
glibc-24116fcdbe55d58aa35fc77444ae71a9dec9fff6.tar.xz
glibc-24116fcdbe55d58aa35fc77444ae71a9dec9fff6.zip
s390/s390x: Undef PSEUDO before redef.
The s390 and s390x sysdep.h files include the more generic sysdep.h.
The more generic sysdep.h defines PSEUDO. This causes an annoying
CPP warning saying the PSEUDO was redefined. This patch removes the
warning by undefining PSEUDO before the redefinition. This is in line
with what all the other machines do.

---

2013-04-06  Carlos O'Donell  <carlos@redhat.com>

	* sysdeps/s390/s390-32/sysdep.h: Undefine PSEUDO before redefinition.
	* sysdeps/s390/s390-64/sysdep.h: Likewise.
Notes
Added ChangeLog with this commit: b7a329a5614d9001abcc3300a3da548a0865a3ac
Diffstat (limited to 'sysdeps/s390')
-rw-r--r--sysdeps/s390/s390-32/sysdep.h1
-rw-r--r--sysdeps/s390/s390-64/sysdep.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/sysdeps/s390/s390-32/sysdep.h b/sysdeps/s390/s390-32/sysdep.h
index d6296c13bd..aa438bd9d3 100644
--- a/sysdeps/s390/s390-32/sysdep.h
+++ b/sysdeps/s390/s390-32/sysdep.h
@@ -65,6 +65,7 @@
 #define	syscall_error	__syscall_error
 #define mcount		_mcount
 
+#undef PSEUDO
 #define	PSEUDO(name, syscall_name, args) \
 lose: SYSCALL_PIC_SETUP				\
     basr %r1,0;					\
diff --git a/sysdeps/s390/s390-64/sysdep.h b/sysdeps/s390/s390-64/sysdep.h
index 46ad85ab1a..57827f39e2 100644
--- a/sysdeps/s390/s390-64/sysdep.h
+++ b/sysdeps/s390/s390-64/sysdep.h
@@ -63,6 +63,7 @@
 #define	syscall_error	__syscall_error
 #define mcount		_mcount
 
+#undef PSEUDO
 #define	PSEUDO(name, syscall_name, args) \
 lose: SYSCALL_PIC_SETUP			\
   jg JUMPTARGET(syscall_error);		\