From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Wed, 12 Sep 2012 12:34:21 +0000 (+0000)
Subject: Fix Solaris 9/x86 bootstrap
X-Git-Tag: misc/gccgo-go1_1_2~921
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9081064aee40a33c99629176d54d1c7653b18faa;p=thirdparty%2Fgcc.git

Fix Solaris 9/x86 bootstrap

	* rtl.h (FFS, FLOAT, ABS, PC): Don't undef.
	* system.h (FFS, FLOAT, ABS, PC): Undef.

From-SVN: r191217
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 032987dcb3fa..ce9a3067e769 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* rtl.h (FFS, FLOAT, ABS, PC): Don't undef.
+	* system.h (FFS, FLOAT, ABS, PC): Undef.
+
 2012-09-12  Richard Guenther  <rguenther@suse.de>
 
 	PR middle-end/54553
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 42378b9f69ff..a29f2611fb16 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -33,11 +33,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "hashtab.h"
 #include "flags.h"
 
-#undef FFS  /* Some systems predefine this symbol; don't let it interfere.  */
-#undef FLOAT /* Likewise.  */
-#undef ABS /* Likewise.  */
-#undef PC /* Likewise.  */
-
 /* Value used by some passes to "recognize" noop moves as valid
  instructions.  */
 #define NOOP_MOVE_INSN_CODE	INT_MAX
diff --git a/gcc/system.h b/gcc/system.h
index 48c9c894e349..ed36bae3e3be 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -638,6 +638,11 @@ extern int vsnprintf(char *, size_t, const char *, va_list);
 /* Get libiberty declarations.  */
 #include "libiberty.h"
 
+#undef FFS  /* Some systems predefine this symbol; don't let it interfere.  */
+#undef FLOAT /* Likewise.  */
+#undef ABS /* Likewise.  */
+#undef PC /* Likewise.  */
+
 /* Provide a default for the HOST_BIT_BUCKET.
    This suffices for POSIX-like hosts.  */