Fix previous committ, committed too much.

From-SVN: r79851

diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 09b4aada4256a18bfa514037e904cc130703e988..8efd8cd26122f3135861fb6706acf8115d70426e 100644 (file)
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -1209,10 +1209,6 @@ machopic_select_rtx_section (mode, x, align)
           && (GET_CODE (x) == CONST_INT
               || GET_CODE (x) == CONST_DOUBLE))
     literal4_section ();
-  else if (GET_CODE (x) == SYMBOL_REF
-             || GET_CODE (x) == CONST
-             || GET_CODE (x) == LABEL_REF)
-    const_data_section ();
   else
     const_section ();
 }

diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h
index 579c775b40b040fda3c74209efd18f5ecabe615f..b3468f2b66b69176a738befa6f3c71e92dd46435 100644 (file)
--- a/gcc/config/rs6000/darwin.h
+++ b/gcc/config/rs6000/darwin.h
@@ -196,17 +196,16 @@ Boston, MA 02111-1307, USA.  */
    a SYMBOL_REF.  */
 
 #undef PREFERRED_RELOAD_CLASS
-#define PREFERRED_RELOAD_CLASS(X,CLASS)                        \
-  ((GET_CODE (X) == CONST_DOUBLE                               \
-    && GET_MODE_CLASS (GET_MODE (X)) == MODE_FLOAT)            \
-   ? NO_REGS                                                   \
-   : ((GET_CODE (X) == SYMBOL_REF || GET_CODE (X) == HIGH)     \
-      && reg_class_subset_p (BASE_REGS, (CLASS)))              \
-   ? BASE_REGS                                                 \
-   : (GET_MODE_CLASS (GET_MODE (X)) == MODE_INT                \
-      && (CLASS) == NON_SPECIAL_REGS)                          \
-   ? GENERAL_REGS                                              \
-   : (CLASS))
+#define PREFERRED_RELOAD_CLASS(X,CLASS)                        \
+  (((GET_CODE (X) == CONST_DOUBLE                      \
+    && GET_MODE_CLASS (GET_MODE (X)) == MODE_FLOAT)    \
+   ? NO_REGS                                           \
+   : (GET_MODE_CLASS (GET_MODE (X)) == MODE_INT        \
+      && (CLASS) == NON_SPECIAL_REGS)                  \
+   ? GENERAL_REGS                                      \
+   : (GET_CODE (X) == SYMBOL_REF || GET_CODE (X) == HIGH)      \
+   ? BASE_REGS                                         \
+   : (CLASS)))
 
 /* Fix for emit_group_load (): force large constants to be pushed via regs.  */
 #define ALWAYS_PUSH_CONSTS_USING_REGS_P                1

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index f7fefdf93d6dd9c84845b701a1902ef38951f951..b97520baecac2b6ed586d0e50fb68e55a17dbe5b 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -29,7 +29,7 @@ Boston, MA 02111-1307, USA.  */
 #include "varray.h"
 
 #ifndef __GNUC__
-  #error "You should be using 'make bootstrap' -- see installation instructions"
+#error "You should be using 'make bootstrap' -- see installation instructions"
 #endif
 
 #include "c-common.h"