Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>

        * sparc/sparc.c (sparc_override_options): Clear MASK_FPU_SET.
        * sparc/sparc.h (TARGET_SWITCHES): Add "fpu" entry for reverse
        mapping from MASK_FPU.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9847a85..51981eb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Wed Oct 27 01:49:17 1999  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * sparc/sparc.c (sparc_override_options): Clear MASK_FPU_SET.
+       * sparc/sparc.h (TARGET_SWITCHES): Add "fpu" entry for reverse
+       mapping from MASK_FPU.
+
 Wed Oct 27 01:42:26 1999  Scott Christley  <scottc@net-community.com>
 
        * sparc.md (call): Don't bound structure return size to 0xfff.
@@ -614,9 +620,9 @@ Tue Oct 19 15:26:11 1999  Richard Earnshaw  (rearnsha@arm.com)
 
 1999-10-19  Bruce Korb  <autogen@linuxbox.com>
 
-        * fixinc/Makefile.in: Change the generation rules to run `genfixes'
-        in the source tree when the generated targets are out of date
-        * fixinc/genfixes: Alter it to run individual fixes for make.
+       * fixinc/Makefile.in: Change the generation rules to run `genfixes'
+       in the source tree when the generated targets are out of date
+       * fixinc/genfixes: Alter it to run individual fixes for make.
        * fixinc/README: rewrite
        * fixinc/inclhack.def: moved initial comments to README
 

diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 5c95702..34f5e4e 100644 (file)
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -303,9 +303,13 @@ sparc_override_options ()
     }
 
   /* If -mfpu or -mno-fpu was explicitly used, don't override with
-     the processor default.  */
+     the processor default.  Clear MASK_FPU_SET to avoid confusing
+     the reverse mapping from switch values to names.  */
   if (TARGET_FPU_SET)
-    target_flags = (target_flags & ~MASK_FPU) | fpu;
+    {
+      target_flags = (target_flags & ~MASK_FPU) | fpu;
+      target_flags &= ~MASK_FPU_SET;
+    }
 
   /* Use the deprecated v8 insns for sparc64 in 32 bit mode.  */
   if (TARGET_V9 && TARGET_ARCH32)

diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h
index 0f7f086..7134b27 100644 (file)
--- a/gcc/config/sparc/sparc.h
+++ b/gcc/config/sparc/sparc.h
@@ -569,10 +569,10 @@ extern int target_flags;
 #define TARGET_SWITCHES  \
   { {"fpu", MASK_FPU | MASK_FPU_SET,                   "Use hardware fp" },            \
     {"no-fpu", -MASK_FPU,                              "Do not use hardware fp" },     \
-    {"no-fpu", MASK_FPU_SET,                           "Do not use hardware fp" },     \
+    {"no-fpu", MASK_FPU_SET,                           NULL, },        \
     {"hard-float", MASK_FPU | MASK_FPU_SET,            "Use hardware fp" },            \
     {"soft-float", -MASK_FPU,                          "Do not use hardware fp" },     \
-    {"soft-float", MASK_FPU_SET,                       "Do not use hardware fp" },     \
+    {"soft-float", MASK_FPU_SET,                       NULL }, \
     {"epilogue", MASK_EPILOGUE,                                "Use FUNCTION_EPILOGUE" },      \
     {"no-epilogue", -MASK_EPILOGUE,                    "Do not use FUNCTION_EPILOGUE" },       \
     {"unaligned-doubles", MASK_UNALIGNED_DOUBLES,      "Assume possible double misalignment" },\