[Patches] Update bits/predefs.h for stdc-predef.h changes

["Joseph S. Myers" <joseph@xxxxxxxxxxxxxxxx>]

I've applied this patch to update EGLIBC's bits/predefs.h headers to take 
account of the possibility of the compiler preincluding stdc-predef.h 
(which in turn includes bits/predefs.h) directly.  I took the opportunity 
to remove ports/sysdeps/arm/bits/predefs.h, leaving only the EABI version 
for ARM, since old-ABI ARM is no longer supported by glibc.

Index: ports/sysdeps/arm/eabi/bits/predefs.h
===================================================================
--- ports/sysdeps/arm/eabi/bits/predefs.h	(revision 17472)
+++ ports/sysdeps/arm/eabi/bits/predefs.h	(revision 17473)
@@ -16,8 +16,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#ifndef _FEATURES_H
-# error "Never use <bits/predefs.h> directly; include <features.h> instead."
+#ifndef _STDC_PREDEF_H
+# error "Never use <bits/predefs.h> directly; include <stdc-predef.h> instead."
 #endif
 
 #ifndef _PREDEFS_H
Index: ports/sysdeps/arm/bits/predefs.h
===================================================================
--- ports/sysdeps/arm/bits/predefs.h	(revision 17472)
+++ ports/sysdeps/arm/bits/predefs.h	(revision 17473)
@@ -1,30 +0,0 @@
-/* Copyright (C) 2005 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
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _FEATURES_H
-# error "Never use <bits/predefs.h> directly; include <features.h> instead."
-#endif
-
-#ifndef _PREDEFS_H
-#define _PREDEFS_H
-
-/* We do not define __STDC_IEC_559__ or __STDC_IEC_559_COMPLEX__, as
-   the ARM software floating-point emulation routines do not support
-   all rounding modes, etc.  */
-
-#endif /* predefs.h */
Index: ports/ChangeLog.eglibc
===================================================================
--- ports/ChangeLog.eglibc	(revision 17472)
+++ ports/ChangeLog.eglibc	(revision 17473)
@@ -1,3 +1,9 @@
+2012-03-08  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/arm/eabi/bits/predefs.h: Test _STDC_PREDEF_H, not
+	_FEATURES_H.
+	* sysdeps/arm/bits/predefs.h: Remove.
+
 2012-01-04  Tom de Vries  <tom@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/mips/Makefile: Compile tst-backtrace{2,3,4,5,6} with
Index: libc/bits/predefs.h
===================================================================
--- libc/bits/predefs.h	(revision 17472)
+++ libc/bits/predefs.h	(revision 17473)
@@ -16,8 +16,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#ifndef _FEATURES_H
-# error "Never use <bits/predefs.h> directly; include <features.h> instead."
+#ifndef _STDC_PREDEF_H
+# error "Never use <bits/predefs.h> directly; include <stdc-predef.h> instead."
 #endif
 
 #ifndef _PREDEFS_H
Index: libc/ChangeLog.eglibc
===================================================================
--- libc/ChangeLog.eglibc	(revision 17472)
+++ libc/ChangeLog.eglibc	(revision 17473)
@@ -1,3 +1,7 @@
+2012-03-08  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* bits/predefs.h: Test _STDC_PREDEF_H, not _FEATURES_H.
+
 2012-02-10  Paul Pluzhnikov  <ppluzhnikov@xxxxxxxxxx>
 
 	* timezone/Makefile: Use BUILD_CC instead of 'gcc'.

-- 
Joseph S. Myers
joseph@xxxxxxxxxxxxxxxx
_______________________________________________
Patches mailing list
Patches@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/patches