MIPS: Remove __STDC__ conditionals.

diff --git a/ChangeLog.mips b/ChangeLog.mips
index 81ea2a315beb26014ba2ae180520865e34542fbe..f92ae72e04e5607c61822286d8299854817f8b1a 100644 (file)
--- 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 b590802fd917fc31bcd43218227735231ac8188d..a3e7a0077b2d8bb63d28c82e7866cec220a2b164 100644 (file)
--- 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 20a345d536c844a346dc6c8918d82f781b4d3872..061e32244821bcf9155255a7d80f9d8527c13ec6 100644 (file)
--- 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 665f88b0680c039a59ccdf069e1e6969e3c29219..6222785505ada7c5bc389fac1a1492d9a2d8135d 100644 (file)
--- 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 b998a633ff15f45f2892811471f6fcdc8e06c2f4..6b18f2731ad5e153eadeb3bb42d7bb792562c8d9 100644 (file)
--- 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__