From patchwork Wed Mar 7 22:07:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaz Kojima X-Patchwork-Id: 145347 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 46D4DB6F98 for ; Thu, 8 Mar 2012 09:07:52 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1331762873; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Date:Message-Id:To:Subject:From:Mime-Version:Content-Type: Content-Transfer-Encoding:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=7ToM+2EUQOzCDO9L/Mr+LigiyG0=; b=Pxu3/Cm5cwfS8Hf +/DfWUlSeXBS21ZP26i8ltWv7rLm5kDBaziuxcFzvvuDiUDborLPxTbCuGMu41Xn cAb5XctaiD1It3+nLpBXKgRUKvqnJjX6wEjIRJQJDz8L+mB5C0QOfi/1/HnQp8ZA 9x2a4xDQ1ka8E5gsHwZeJ6H5dCPI= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Date:Message-Id:To:Subject:From:Mime-Version:Content-Type:Content-Transfer-Encoding:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=P4fbX6EaUNOMOb0RU00yEVy8UzNQeMW2KwEMyKENZBWyjJEZKLgr+CaFfQGnsk WFdg13ZbzZy6ddEuCmw5hlN/Vh9x+qn025mw0VtnZrgrowMJlKFpHAxChdyYS60Y 0TSIIIPbrMMfqzqx1CW61fhPOFU4RnC3XlO0oOYVevWGM=; Received: (qmail 25578 invoked by alias); 7 Mar 2012 22:07:49 -0000 Received: (qmail 25566 invoked by uid 22791); 7 Mar 2012 22:07:49 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, SPF_HELO_PASS, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mo11.iij4u.or.jp (HELO mo.iij4u.or.jp) (210.138.174.79) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 07 Mar 2012 22:07:33 +0000 Received: by mo.iij4u.or.jp (mo11) id q27M7V5g019328; Thu, 8 Mar 2012 07:07:31 +0900 Received: from localhost (238.152.138.210.bn.2iij.net [210.138.152.238]) by mbox.iij4u.or.jp (mbox10) id q27M7Uik029947; Thu, 8 Mar 2012 07:07:31 +0900 Date: Thu, 08 Mar 2012 07:07:31 +0900 (JST) Message-Id: <20120308.070731.385460837.kkojima@rr.iij4u.or.jp> To: gcc-patches@gcc.gnu.org Subject: [patch committed SH] Fix target/52503 From: Kaz Kojima Mime-Version: 1.0 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 Hi, The attached patch is to fix PR target/52503 which is a build failure for sh-wrs-vxworks. We've defined too many target option masks. Tested with usual tests on sh4-unknown-linux-gnu and with a cc1-only build on sh-wrs-vxworks. Applied on trunk. Regards, kaz --- 2012-03-07 Oleg Endo Kaz Kojima PR target/52503 * config/sh/sh.opt (msoft-atomic): Use Var instead of Mask. * config/sh/linux.h (TARGET_DEFAULT): Remove MASK_SOFT_ATOMIC. (SUBTARGET_OVERRIDE_OPTIONS): Define. diff -upr ORIG/trunk/gcc/config/sh/linux.h trunk/gcc/config/sh/linux.h --- ORIG/trunk/gcc/config/sh/linux.h 2011-12-05 10:04:44.000000000 +0900 +++ trunk/gcc/config/sh/linux.h 2012-03-07 13:54:42.000000000 +0900 @@ -1,5 +1,6 @@ /* Definitions for SH running Linux-based GNU systems using ELF - Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2010, 2011 + Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2010, 2011, + 2012 Free Software Foundation, Inc. Contributed by Kazumoto Kojima @@ -41,7 +42,7 @@ along with GCC; see the file COPYING3. #undef TARGET_DEFAULT #define TARGET_DEFAULT \ (TARGET_CPU_DEFAULT | MASK_USERMODE | TARGET_ENDIAN_DEFAULT \ - | TARGET_OPT_DEFAULT | MASK_SOFT_ATOMIC) + | TARGET_OPT_DEFAULT) #define TARGET_ASM_FILE_END file_end_indicate_exec_stack @@ -135,3 +136,13 @@ along with GCC; see the file COPYING3. /* Install the __sync libcalls. */ #undef TARGET_INIT_LIBFUNCS #define TARGET_INIT_LIBFUNCS sh_init_sync_libfuncs + +#undef SUBTARGET_OVERRIDE_OPTIONS +#define SUBTARGET_OVERRIDE_OPTIONS \ + do \ + { \ + /* Defaulting to -msoft-atomic. */ \ + if (global_options_set.x_TARGET_SOFT_ATOMIC == 0) \ + TARGET_SOFT_ATOMIC = 1; \ + } \ + while (0) diff -upr ORIG/trunk/gcc/config/sh/sh.opt trunk/gcc/config/sh/sh.opt --- ORIG/trunk/gcc/config/sh/sh.opt 2012-03-06 10:28:32.000000000 +0900 +++ trunk/gcc/config/sh/sh.opt 2012-03-07 07:13:58.000000000 +0900 @@ -320,7 +320,7 @@ Target Mask(HITACHI) MaskExists Follow Renesas (formerly Hitachi) / SuperH calling conventions msoft-atomic -Target Report Mask(SOFT_ATOMIC) +Target Report Var(TARGET_SOFT_ATOMIC) Use software atomic sequences supported by kernel menable-tas