This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: Fix Solaris 9/x86 bootstrap
Richard Guenther <richard.guenther@gmail.com> writes:
> Doesn't that belong in system.h instead? And removed from rtl.h?
Fine with me. The following patch does just that, moving the #undefs
as far down in system.h as seemed reasonable.
Bootstrapped without regressions on i386-pc-solaris2.10 and
x86_64-unknown-linux-gnu; i386-pc-solaris2.9 build just started running
the testsuite.
Ok for mainline?
Rainer
2012-08-22 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* rtl.h (FFS, FLOAT, ABS, PC): Don't undef.
* system.h (FFS, FLOAT, ABS, PC): Undef.
# HG changeset patch
# Parent 4cd1f4bc7b3c2901830dde3d7ace137718eae0e4
Fix Solaris 9/x86 bootstrap
* rtl.h (FFS, FLOAT, ABS, PC): Don't undef.
* system.h (FFS, FLOAT, ABS, PC): Undef.
diff --git a/gcc/rtl.h b/gcc/rtl.h
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -33,11 +33,6 @@ along with GCC; see the file COPYING3.
#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
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -638,6 +638,11 @@ extern int vsnprintf(char *, size_t, con
/* 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. */
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University