[Commits] r16854 - in /fsf/trunk/ports: ./ sysdeps/mips/sys/ sysdeps/unix/sysv/linux/mips/mips32/ sysdeps/unix/sysv/linux/mips/mips64/...

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Jan 27 00:04:03 2012
New Revision: 16854

Log:
Import glibc-ports-mainline for 2012-01-27

Modified:
    fsf/trunk/ports/ChangeLog.mips
    fsf/trunk/ports/sysdeps/mips/sys/asm.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h

Modified: fsf/trunk/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/ports/ChangeLog.mips (original)
+++ fsf/trunk/ports/ChangeLog.mips Fri Jan 27 00:04:03 2012
@@ -1,3 +1,10 @@
+2012-01-26  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* 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@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/mips/bits/fenv.h: Use const instead of __const.

Modified: fsf/trunk/ports/sysdeps/mips/sys/asm.h
==============================================================================
--- fsf/trunk/ports/sysdeps/mips/sys/asm.h (original)
+++ fsf/trunk/ports/sysdeps/mips/sys/asm.h Fri Jan 27 00:04:03 2012
@@ -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@xxxxxxx>.
@@ -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
 

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h Fri Jan 27 00:04:03 2012
@@ -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__
 

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h Fri Jan 27 00:04:03 2012
@@ -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__
 

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h Fri Jan 27 00:04:03 2012
@@ -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__
 

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits