From patchwork Thu Sep 2 01:12:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Mansfield X-Patchwork-Id: 63436 Return-Path: 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 E0B6FB7170 for ; Thu, 2 Sep 2010 11:12:12 +1000 (EST) Received: (qmail 17466 invoked by alias); 2 Sep 2010 01:12:11 -0000 Received: (qmail 17454 invoked by uid 22791); 2 Sep 2010 01:12:10 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from hub3.qnx.com (HELO hub3.qnx.com) (209.226.137.86) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 02 Sep 2010 01:12:04 +0000 Received: by hub3.qnx.com (Postfix, from userid 32767) id 910FE6C51B9; Wed, 1 Sep 2010 21:12:02 -0400 (EDT) Received: from nebula.ott.qnx.com (nebula.ott.qnx.com [10.42.3.30]) by hub3.qnx.com (Postfix) with ESMTP id 0AE0A6C51AE for ; Wed, 1 Sep 2010 21:12:00 -0400 (EDT) Received: from neptune.ott.qnx.com ([10.42.3.70]) by nebula.ott.qnx.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 1 Sep 2010 21:12:01 -0400 Received: from [192.168.20.78] ([192.168.20.78]) by neptune.ott.qnx.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 1 Sep 2010 21:12:00 -0400 Message-ID: <4C7EF9E0.3030907@qnx.com> Date: Wed, 01 Sep 2010 21:12:00 -0400 From: Ryan Mansfield User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.11) Gecko/20100713 Lightning/1.0b1 Thunderbird/3.0.6 MIME-Version: 1.0 To: gcc-patches@gcc.gnu.org Subject: [Patch, ARM] Fix override of SUBTARGET_CPU_DEFAULT X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org In the case where the user does not select a cpu and one is not configured, the cpu defined by SUBTARGET_CPU_DEFAULT is being overridden by the default of arm6. 2010-09-01 Ryan Mansfield * arm.c (arm_override_options): Use SUBTARGET_CPU_DEFAULT if defined. OK? Regards, Ryan Mansfield Index: config/arm/arm.c =================================================================== --- config/arm/arm.c (revision 163753) +++ config/arm/arm.c (working copy) @@ -1411,7 +1411,7 @@ arm_selected_cpu = &all_cores[SUBTARGET_CPU_DEFAULT]; #endif /* Default to ARM6. */ - if (arm_selected_cpu->name) + if (!arm_selected_cpu->name) arm_selected_cpu = &all_cores[arm6]; }