From patchwork Wed Jun 22 17:03:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 101516 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 45FA2B6FC5 for ; Thu, 23 Jun 2011 03:03:44 +1000 (EST) Received: (qmail 1132 invoked by alias); 22 Jun 2011 17:03:41 -0000 Received: (qmail 1115 invoked by uid 22791); 22 Jun 2011 17:03:40 -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 mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 22 Jun 2011 17:03:19 +0000 Received: (qmail 11406 invoked from network); 22 Jun 2011 17:03:18 -0000 Received: from unknown (HELO ?192.168.44.101?) (nathan@127.0.0.2) by mail.codesourcery.com with ESMTPA; 22 Jun 2011 17:03:18 -0000 Message-ID: <4E022052.7020901@codesourcery.com> Date: Wed, 22 Jun 2011 18:03:14 +0100 From: Nathan Sidwell User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110424 Lightning/1.0b2 Thunderbird/3.1.10 MIME-Version: 1.0 To: Ramana Radhakrishnan CC: gcc-patches@gcc.gnu.org, "Joseph S. Myers" , Richard Earnshaw Subject: Re: [ARM] TLS Descriptor support References: <4DC8DFF6.4000600@codesourcery.com> <4E0050F5.8030408@codesourcery.com> In-Reply-To: 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 On 06/21/11 18:24, Ramana Radhakrishnan wrote: >> revalidated with defaults to both gnu and gnu2 style. ok? > > This is OK . sigh, in backporting the relevant bits, I noticed a problem with the OPTION_DEFAULT_SPECS string, fixed thusly, committed as obvious. And then I noticed I'd failed to commit the config.gcc fragment. Back of the class for me today :( nathan Index: config.gcc =================================================================== --- config.gcc (revision 175297) +++ config.gcc (working copy) @@ -863,6 +863,7 @@ tmake_file="$tmake_file arm/t-linux" ;; esac + with_tls=${with_tls:-gnu} tm_file="$tm_file arm/aout.h arm/arm.h" tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp" ;; @@ -3039,7 +3040,7 @@ ;; arm*-*-*) - supported_defaults="arch cpu float tune fpu abi mode" + supported_defaults="arch cpu float tune fpu abi mode tls" for which in cpu tune; do # See if it matches any of the entries in arm-cores.def eval "val=\$with_$which" @@ -3122,6 +3123,17 @@ ;; esac + case "$with_tls" in + "" \ + | gnu | gnu2) + # OK + ;; + *) + echo "Unknown TLS method used in --with-tls=$with_tls" 1>&2 + exit 1 + ;; + esac + if test "x$with_arch" != x && test "x$with_cpu" != x; then echo "Warning: --with-arch overrides --with-cpu=$with_cpu" 1>&2 fi @@ -3601,7 +3613,7 @@ esac t= -all_defaults="abi cpu cpu_32 cpu_64 arch arch_32 arch_64 tune tune_32 tune_64 schedule float mode fpu divide llsc mips-plt synci" +all_defaults="abi cpu cpu_32 cpu_64 arch arch_32 arch_64 tune tune_32 tune_64 schedule float mode fpu divide llsc mips-plt synci tls" for option in $all_defaults do eval "val=\$with_"`echo $option | sed s/-/_/g` Index: config/arm/arm.h =================================================================== --- config/arm/arm.h (revision 175297) +++ config/arm/arm.h (working copy) @@ -324,7 +324,7 @@ {"fpu", "%{!mfpu=*:-mfpu=%(VALUE)}"}, \ {"abi", "%{!mabi=*:-mabi=%(VALUE)}"}, \ {"mode", "%{!marm:%{!mthumb:-m%(VALUE)}}"}, \ - {"tls", "%{!mtls-dialect:-mtls-dialect=%(VALUE)}"}, + {"tls", "%{!mtls-dialect=*:-mtls-dialect=%(VALUE)}"}, /* Which floating point model to use. */ enum arm_fp_model