From patchwork Fri Dec  2 16:22:55 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Joel Sherrill <joel.sherrill@oarcorp.com>
X-Patchwork-Id: 128901
Return-Path: 
 <gcc-patches-return-308974-incoming=patchwork.ozlabs.org@gcc.gnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
	by ozlabs.org (Postfix) with SMTP id C20251007D6
	for <incoming@patchwork.ozlabs.org>;
	Sat,  3 Dec 2011 03:23:29 +1100 (EST)
Received: (qmail 26298 invoked by alias); 2 Dec 2011 16:23:24 -0000
Received: (qmail 26289 invoked by uid 22791); 2 Dec 2011 16:23:23 -0000
X-SWARE-Spam-Status: No, hits=-2.5 required=5.0	tests=AWL, BAYES_00,
	RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
Received: from oarmail.oarcorp.com (HELO OARmail.OARCORP.com)
	(67.63.146.244) by sourceware.org (qpsmtpd/0.43rc1) with
	ESMTP; Fri, 02 Dec 2011 16:22:56 +0000
Received: from iceland.oarcorp.com (192.168.1.171) by OARmail.OARCORP.com
	(192.168.2.2) with Microsoft SMTP Server (TLS) id 8.1.436.0;
	Fri, 2 Dec 2011 10:22:55 -0600
Message-ID: <4ED8FB5F.7070909@oarcorp.com>
Date: Fri, 2 Dec 2011 10:22:55 -0600
From: Joel Sherrill <joel.sherrill@oarcorp.com>
User-Agent: Mozilla/5.0 (X11; Linux i686;
	rv:7.0) Gecko/20110927 Thunderbird/7.0
MIME-Version: 1.0
To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>,
	Joseph Myers	<joseph@codesourcery.com>
Subject: rs6000 options change for rtems.h
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

Hi,

I have been testing with this for almost a month.  It is
my attempt to follow the changes I think Joseph made
to other rs6000 targets. If this change looks right,
I would like to commit it.

Test results have been posted for it.

Thanks.

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

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

Index: gcc/config/rs6000/rtems.h
===================================================================
--- gcc/config/rs6000/rtems.h	(revision 181924)
+++ gcc/config/rs6000/rtems.h	(working copy)
@@ -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 (!global_options_set.x_rs6000_float_gprs) \
+          rs6000_float_gprs = 1;                     \
+        if (!global_options_set.x_rs6000_spe)        \
+          rs6000_spe = 1;                            \
+        if (!global_options_set.x_rs6000_spe_abi)    \
+          rs6000_spe_abi = 1;                        \
+      }                                              \
   } while(0)