diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-01-26 20:53:57 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-01-26 20:53:57 +0000 |
| commit | 2aee89493501536e597725caf45b428fa6567b68 (patch) | |
| tree | d6c3f6d49c76d710b9b8fbdee435e30c2d76c8d8 | |
| parent | ad8ae7daffc0231884874888d8a7aeeac34c8ebe (diff) | |
| download | glibc-2aee89493501536e597725caf45b428fa6567b68.tar.xz glibc-2aee89493501536e597725caf45b428fa6567b68.zip | |
MIPS: Remove __STDC__ conditionals.
| -rw-r--r-- | ChangeLog.mips | 7 | ||||
| -rw-r--r-- | sysdeps/mips/sys/asm.h | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips32/sysdep.h | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h | 8 |
5 files changed, 15 insertions, 24 deletions
diff --git a/ChangeLog.mips b/ChangeLog.mips index 81ea2a315b..f92ae72e04 100644 --- a/ChangeLog.mips +++ b/ChangeLog.mips @@ -1,3 +1,10 @@ +2012-01-26 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/mips/sys/asm.h: Remove __STDC__ conditionals. + * sysdeps/unix/sysv/linux/mips/mips32/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h: Likewise. + 2012-01-08 Joseph Myers <joseph@codesourcery.com> * sysdeps/mips/bits/fenv.h: Use const instead of __const. diff --git a/sysdeps/mips/sys/asm.h b/sysdeps/mips/sys/asm.h index b590802fd9..a3e7a0077b 100644 --- a/sysdeps/mips/sys/asm.h +++ b/sysdeps/mips/sys/asm.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 2002, 2003, 2004, 2005 +/* Copyright (C) 1997, 1998, 2002, 2003, 2004, 2005, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ralf Baechle <ralf@gnu.org>. @@ -24,11 +24,7 @@ #include <sgidefs.h> #ifndef CAT -# ifdef __STDC__ -# define __CAT(str1,str2) str1##str2 -# else -# define __CAT(str1,str2) str1/**/str2 -# endif +# define __CAT(str1,str2) str1##str2 # define CAT(str1,str2) __CAT(str1,str2) #endif diff --git a/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h index 20a345d536..061e322448 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h +++ b/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h @@ -1,5 +1,5 @@ /* Copyright (C) 2000, 2002, 2003, 2004, 2005, - 2009 Free Software Foundation, Inc. + 2009, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -35,11 +35,7 @@ of the kernel. But these symbols do not follow the SYS_* syntax so we have to redefine the `SYS_ify' macro here. */ #undef SYS_ify -#ifdef __STDC__ -# define SYS_ify(syscall_name) __NR_##syscall_name -#else -# define SYS_ify(syscall_name) __NR_/**/syscall_name -#endif +#define SYS_ify(syscall_name) __NR_##syscall_name #ifndef __ASSEMBLER__ diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h index 665f88b068..6222785505 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, 2009 +/* Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, 2009, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -35,11 +35,7 @@ of the kernel. But these symbols do not follow the SYS_* syntax so we have to redefine the `SYS_ify' macro here. */ #undef SYS_ify -#ifdef __STDC__ -# define SYS_ify(syscall_name) __NR_##syscall_name -#else -# define SYS_ify(syscall_name) __NR_/**/syscall_name -#endif +#define SYS_ify(syscall_name) __NR_##syscall_name #ifdef __ASSEMBLER__ diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h index b998a633ff..6b18f2731a 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, 2009 +/* Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, 2009, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -35,11 +35,7 @@ of the kernel. But these symbols do not follow the SYS_* syntax so we have to redefine the `SYS_ify' macro here. */ #undef SYS_ify -#ifdef __STDC__ -# define SYS_ify(syscall_name) __NR_##syscall_name -#else -# define SYS_ify(syscall_name) __NR_/**/syscall_name -#endif +#define SYS_ify(syscall_name) __NR_##syscall_name #ifdef __ASSEMBLER__ |