2003-02-10 Nick Clifton <nickc@redhat.com>

            Aldy Hernandez  <aldyh@redhat.com>

        * config/rs6000/eabispe.h (SUBSUBTARGET_OVERRIDE_OPTIONS): Do not
        override options which have been specified on the command line.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@62662 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ab101b8..c711b38 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-10  Nick Clifton  <nickc@redhat.com>
+            Aldy Hernandez  <aldyh@redhat.com>
+
+        * config/rs6000/eabispe.h (SUBSUBTARGET_OVERRIDE_OPTIONS): Do not
+        override options which have been specified on the command line.
+
 2003-02-10  Kazu Hirata  <kazu@cs.umass.edu>
 
        * config/h8300/h8300.md (abssf2): New.

diff --git a/gcc/config/rs6000/eabispe.h b/gcc/config/rs6000/eabispe.h
index b0047cd..bfec030 100644 (file)
--- a/gcc/config/rs6000/eabispe.h
+++ b/gcc/config/rs6000/eabispe.h
@@ -28,12 +28,16 @@ Boston, MA 02111-1307, USA.  */
 
 #undef SUBSUBTARGET_OVERRIDE_OPTIONS
 #define SUBSUBTARGET_OVERRIDE_OPTIONS \
-  rs6000_cpu = PROCESSOR_PPC8540; \
-  rs6000_spe_abi = 1; \
+  if (rs6000_select[1].string == NULL) \
+    rs6000_cpu = PROCESSOR_PPC8540; \
+  if (rs6000_abi_string == NULL || strstr (rs6000_abi_string, "spe") == NULL) \
+    rs6000_spe_abi = 1; \
   rs6000_fprs = 0; \
   /* See note below.  */ \
-  /*rs6000_long_double_type_size = 128;*/ \
-  rs6000_isel = 1
+  /*if (rs6000_long_double_size_string == NULL)*/ \
+  /*  rs6000_long_double_type_size = 128;*/ \
+  if (rs6000_isel_string == NULL) \
+    rs6000_isel = 1
 
 /*
   The e500 ABI says that either long doubles are 128 bits, or if