This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[COMMITTED] s390/s390x: undef PSEUDO before define.


PSEUDO is defined in the more generic sysdep.h
It should be undefined before redefining it.
All other architectures do this already.
This patch fixes s390/s390x.

Committed as obvious, no regressions, and 
removes the annoying cpp warning during build.

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.

diff --git a/sysdeps/s390/s390-32/sysdep.h b/sysdeps/s390/s390-32/sysdep.h
index d6296c1..aa438bd 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 46ad85a..57827f3 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);                \
---

Cheers,
Carlos.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]