2011-12-06 Joel Sherrill <joel.sherrill@oarcorp.com>

	* config/rs6000/rtems.h: Switch to using global_options_set
	in SUBSUBTARGET_OVERRIDE_OPTIONS.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2ccfa61..487c45a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-06  Joel Sherrill <joel.sherrill@oarcorp.com>
+
+       * config/rs6000/rtems.h: Switch to using global_options_set
+       in SUBSUBTARGET_OVERRIDE_OPTIONS.
+
 2011-12-06  David S. Miller  <davem@davemloft.net>
 
        * config/sparc/visintrin.h: Add appropriate __VIS__ cpp protection.

diff --git a/gcc/config/rs6000/rtems.h b/gcc/config/rs6000/rtems.h
index 7ffdd3e..5641162 100644 (file)
--- a/gcc/config/rs6000/rtems.h
+++ b/gcc/config/rs6000/rtems.h
@@ -57,15 +57,15 @@
   { "cpp_os_rtems",            CPP_OS_RTEMS_SPEC }
 
 #undef SUBSUBTARGET_OVERRIDE_OPTIONS
-#define SUBSUBTARGET_OVERRIDE_OPTIONS                                  \
-  do {                                                                 \
-    if (TARGET_E500)                                                   \
-      {                                                                        \
-        if (TARGET_HARD_FLOAT && !rs6000_explicit_options.float_gprs)  \
-          rs6000_float_gprs = 1;                                       \
-        if (rs6000_float_gprs != 0 && !rs6000_explicit_options.spe)    \
-          rs6000_spe = 1;                                              \
-        if (rs6000_spe && !rs6000_explicit_options.spe_abi)            \
-          rs6000_spe_abi = 1;                                          \
-      }                                                                        \
+#define SUBSUBTARGET_OVERRIDE_OPTIONS                                     \
+  do {                                                                    \
+   if (TARGET_E500)                                                       \
+      {                                                                   \
+        if (TARGET_HARD_FLOAT && !global_options_set.x_rs6000_float_gprs) \
+          rs6000_float_gprs = 1;                                          \
+        if (rs6000_float_gprs != 0 && !global_options_set.x_rs6000_spe)   \
+          rs6000_spe = 1;                                                 \
+        if (rs6000_spe && !global_options_set.x_rs6000_spe_abi)           \
+          rs6000_spe_abi = 1;                                             \
+      }                                                                   \
   } while(0)