* sysdeps/unix/sysv/linux/Makefile (syscall-%.h): Add -D for each

32bit-predefine when creating .new32 list and -U for each
32bit-predefine when creating .new64 list.
* sysdeps/unix/sysv/linux/x86_64/Makefile (32bit-predefine): New.

diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 17d9238909b5b8e64dc8994ecb91bb2d29d64143..3154e180af530cf7983cdee4983033da717cc99d 100644 (file)
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -25,7 +25,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
 install-others += $(inst_includedir)/bits/syscall.h
 
 # Generate the list of SYS_* macros for the system calls (__NR_* macros).
-# For bi-arch platforms, the CPU/Makefile defines 64bit-predefine and
+# For bi-arch platforms, the CPU/Makefile defines {32,64}bit-predefine and
 # we generate a file that uses <bits/wordsize.h>.
 $(objpfx)syscall-%.h $(objpfx)syscall-%.d: ../sysdeps/unix/sysv/linux/sys/syscall.h
        rm -f $(@:.h=.d)-t
@@ -37,11 +37,13 @@ $(objpfx)syscall-%.h $(objpfx)syscall-%.d: ../sysdeps/unix/sysv/linux/sys/syscal
         echo '#endif'; \
         echo ''; \
         SUNPRO_DEPENDENCIES='$(@:.h=.d)-t $@' \
-        $(CC) -E -x c $(sysincludes) $< $(addprefix -U,$(64bit-predefine)) -D_LIBC -dM | \
+        $(CC) -E -x c $(sysincludes) $< $(addprefix -U,$(64bit-predefine)) \
+          $(addprefix -D,$(32bit-predefine)) -D_LIBC -dM | \
         sed -n 's@^#define __NR_\([^ ]*\) .*$$@#define SYS_\1 __NR_\1@p' | \
         LC_ALL=C sort > $(@:.d=.h).new32; \
         SUNPRO_DEPENDENCIES='$(@:.h=.d)-t $@' \
-        $(CC) -E -x c $(sysincludes) $< $(addprefix -D,$(64bit-predefine)) -D_LIBC -dM | \
+        $(CC) -E -x c $(sysincludes) $< $(addprefix -U,$(64bit-predefine)) \
+          $(addprefix -D,$(64bit-predefine)) -D_LIBC -dM | \
         sed -n 's@^#define __NR_\([^ ]*\) .*$$@#define SYS_\1 __NR_\1@p' | \
         LC_ALL=C sort > $(@:.d=.h).new64; \
         if cmp -s $(@:.d=.h).new32 $(@:.d=.h).new64; then \

diff --git a/sysdeps/unix/sysv/linux/x86_64/Makefile b/sysdeps/unix/sysv/linux/x86_64/Makefile
index 86cfd69ad11a710b514f640647f395b3c747da10..627275db09a5c3b19962db59619e5ac79983f0ba 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/Makefile
+++ b/sysdeps/unix/sysv/linux/x86_64/Makefile
@@ -1,3 +1,4 @@
+32bit-predefine = __i386__
 64bit-predefine = __x86_64__
 
 ifeq ($(subdir),misc)