Re: Building syscall.h on mips

[Steve Ellcey <sellcey@mips.com>]

On Tue, 2012-05-22 at 21:10 +0000, Joseph S. Myers wrote:
> On Tue, 22 May 2012, Steve Ellcey  wrote:
> 
> > So, does this second patch look OK for glibc-ports for MIPS?
> 
> No, it's definitely wrong.  The header needs to have three sections, each 
> one with the syscalls relevant to that particular ABI.  Those sets are 
> similar, but not the same.  The MIPS build of this header was broken for a 
> long time (see 
> <http://sourceware.org/ml/libc-alpha/2011-12/msg00046.html>).
> 
> If you can't get -m options working there, maybe it's necessary to use 
> entirely -U and -D options in the -options variables - those options being 
> such as to make the MIPS asm/unistd.h define the correct set of syscalls 
> for each ABI.

Ok, I think I have it now.  With these -D flags, I get similar but not
identical sets for the three ifdef's.  I would have liked to use
_MIPS_SIM_ABI32, etc in the -D instead of 1,2,3 but that did not seem to
work.

How does this patch look?

Steve Ellcey
sellcey@mips.com


diff --git a/sysdeps/unix/sysv/linux/mips/Makefile
b/sysdeps/unix/sysv/linux/mip
index 41e9258..2aaf63c 100644
--- a/sysdeps/unix/sysv/linux/mips/Makefile
+++ b/sysdeps/unix/sysv/linux/mips/Makefile
@@ -7,13 +7,14 @@ sysdep_routines += cachectl cacheflush sysmips
_test_and_set
 
 sysdep_headers += sys/cachectl.h sys/sysmips.h sys/tas.h
 
+# _MIPS_SIM_ABI32 == 1, _MIPS_SIM_ABIN32 == 2, _MIPS_SIM_ABI64 == 3
 syscall-list-variants := o32 n32 n64
 syscall-list-includes := sgidefs.h
-syscall-list-o32-options := -mabi=32
+syscall-list-o32-options := -D_MIPS_SIM=1
 syscall-list-o32-condition := _MIPS_SIM == _MIPS_SIM_ABI32
-syscall-list-n32-options := -mabi=n32
+syscall-list-n32-options := -D_MIPS_SIM=2
 syscall-list-n32-condition := _MIPS_SIM == _MIPS_SIM_ABIN32
-syscall-list-n64-options := -mabi=64
+syscall-list-n64-options := -D_MIPS_SIM=3
 syscall-list-n64-condition := _MIPS_SIM == _MIPS_SIM_ABI64
 endif