From: Carlos O'Donell Date: Sat, 6 Apr 2013 14:53:54 +0000 (-0400) Subject: s390/s390x: Undef PSEUDO before redef. X-Git-Tag: glibc-2.18~426 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24116fcdbe55d58aa35fc77444ae71a9dec9fff6;p=thirdparty%2Fglibc.git 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 * 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 d6296c13bd2..aa438bd9d3b 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 46ad85ab1a1..57827f39e2d 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); \