From 6b64a77cd46f52b3b8ab9cdce9dabc658b6a6401 Mon Sep 17 00:00:00 2001
From: Andrew Pinski <pinskia@gcc.gnu.org>
Date: Mon, 22 Mar 2004 21:35:03 -0800
Subject: [PATCH] Fix previous committ, committed too much.

From-SVN: r79851
---
 gcc/config/darwin.c        |  4 ----
 gcc/config/rs6000/darwin.h | 21 ++++++++++-----------
 gcc/cp/cp-tree.h           |  2 +-
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index 09b4aada4256..8efd8cd26122 100644
--- 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 579c775b40b0..b3468f2b66b6 100644
--- 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 f7fefdf93d6d..b97520baecac 100644
--- 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"
-- 
2.47.2