This is the mail archive of the
libc-ports@sources.redhat.com
mailing list for the libc-ports project.
Remove __STDC__ conditionals for MIPS
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: libc-ports at sourceware dot org
- Date: Thu, 26 Jan 2012 20:57:00 +0000 (UTC)
- Subject: Remove __STDC__ conditionals for MIPS
In line with recent libc cleanups, and the lack of actual support for
pre-standard C in glibc for many years, I've applied this patch to remove
__STDC__ conditionals from the MIPS port. There are some references in
some other ports that could be cleaned up as well.
diff --git a/ChangeLog.mips b/ChangeLog.mips
index 81ea2a3..f92ae72 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 b590802..a3e7a00 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 20a345d..061e322 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 665f88b..6222785 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 b998a63..6b18f27 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__
--
Joseph S. Myers
joseph@codesourcery.com