From patchwork Fri Jun 29 10:04:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramana Radhakrishnan X-Patchwork-Id: 168031 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 D2CC71007D5 for ; Fri, 29 Jun 2012 20:04:40 +1000 (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=1341569082; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:Date:Message-ID:Subject:From:To: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=BZ0Ol3r FI9sTxhtl+mdm8+ciDZA=; b=hiuK4H40dDZbEEJpS3Cq9HAgYHQWbKz8p3X9S+0 TSe6Bedsuw4dpAZ5+SmSYr+PaCqRO3rceAp68LyGmkjZqAj8xZVLQZk+kynDkz1D AIYb3TBH5mZ1OeFVgvnnVQVJy1AjIwHljbzwrQOBp5upldlGTQnMeVUqdy+tCovK +Q+4= 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:X-Google-DKIM-Signature:MIME-Version:Received:Received:Date:Message-ID:Subject:From:To:Content-Type:X-Gm-Message-State:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=YsyhMEo+RnT5HIXU5qAPP1w0oWJc486w5imQLreil9WZRcI5z28YQFonPvT6Q1 0aCRkTzBBkzcXCAEB9luawM2qEQhSl+VebxdqDlG1BMqTc+4XtZQkm7xv10rjw4V 7rADW0VOdmIG5a2q+bDCq8yyEb8KSkxtKL6bYRI1UuKdY=; Received: (qmail 27610 invoked by alias); 29 Jun 2012 10:04:36 -0000 Received: (qmail 27595 invoked by uid 22791); 29 Jun 2012 10:04:35 -0000 X-SWARE-Spam-Status: No, hits=-0.1 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, URIBL_BLACK X-Spam-Check-By: sourceware.org Received: from mail-vb0-f47.google.com (HELO mail-vb0-f47.google.com) (209.85.212.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 29 Jun 2012 10:04:22 +0000 Received: by vbbfr13 with SMTP id fr13so2458309vbb.20 for ; Fri, 29 Jun 2012 03:04:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type :x-gm-message-state; bh=gJ3CVXiqKJkUiAQcSp/UFGI59naJZxEjC/ryzmMQrEs=; b=C2UFN5iu9kI+0zVxjqJ1Swo0/tmCROCenXQnwhBfaQErr8y77AUGyXTMTT6ter6K3i cVORAQplzvHCVi/qm9lgNSaKu3uQWsEfiaPGZlTn7QDf1aIEKxBb06WupbOdOO+Qhgb9 1zL+rTggEt9i+fM0uLsQGuaWbnjhNjg9tvXhmxc1q+CXI98bwHTfolj9NKpux3xobLM3 yeC7mBu/SE6FOgm4JNi3jeLvFFBQOlyLe2yBtlL22fypNFxWqY13nLxP7bdzMlesePYJ +tGDAJchBv6+nTK6q0CShvTT2S2/LYJEOGHP7/cFfmw4VdFzxzvWt5ssnKEfFBo0WZfd RyIw== MIME-Version: 1.0 Received: by 10.52.174.226 with SMTP id bv2mr505777vdc.32.1340964261314; Fri, 29 Jun 2012 03:04:21 -0700 (PDT) Received: by 10.52.185.201 with HTTP; Fri, 29 Jun 2012 03:04:21 -0700 (PDT) Date: Fri, 29 Jun 2012 11:04:21 +0100 Message-ID: Subject: [Patch ARM] Backport fix for gnu_unique_object to 4.7 branch From: Ramana Radhakrishnan To: gcc-patches X-Gm-Message-State: ALoCoQnpKzUooLvlMvN49p124yR/6htpy5P8teHz9VTanwRte9WQg+FBNtFVWi3s+pS7Xjap/SzV 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, Taking Richi's statement here http://gcc.gnu.org/ml/gcc-patches/2012-06/msg01399.html as an approval - I've backported the comment character fix for gnu_unique_object on ARM to the FSF 4.7 branch. regards, Ramana 2012-06-29 Ramana Radhakrishnan * configure: Regenerate. Backport from mainline. 2012-03-15 Ramana Radhakrishnan * config.gcc (target_type_format_char): New. Document it. Set it for arm*-*-* . * configure.ac (gnu_unique_option): Use target_type_format_char in test. Comment rationale. Property changes on: . Index: gcc/configure =================================================================== --- gcc/configure (revision 189069) +++ gcc/configure (revision 189071) @@ -26179,7 +26179,7 @@ then gcc_cv_as_gnu_unique_object=yes fi elif test x$gcc_cv_as != x; then - $as_echo '.type foo, @gnu_unique_object' > conftest.s + $as_echo '.type foo, '$target_type_format_char'gnu_unique_object' > conftest.s if { ac_try='$gcc_cv_as $gcc_cv_as_flags -o conftest.o conftest.s >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 @@ -26198,7 +26198,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_gnu_unique_object" >&5 $as_echo "$gcc_cv_as_gnu_unique_object" >&6; } if test $gcc_cv_as_gnu_unique_object = yes; then - # Also check for ld.so support, i.e. glibc 2.11 or higher. + # We need to unquote above to to use the definition from config.gcc. +# Also check for ld.so support, i.e. glibc 2.11 or higher. if test x$host = x$build -a x$host = x$target && ldd --version 2>/dev/null && glibcver=`ldd --version 2>/dev/null | sed 's/.* //;q'`; then Index: gcc/configure.ac =================================================================== --- gcc/configure.ac (revision 189069) +++ gcc/configure.ac (revision 189071) @@ -4188,7 +4188,8 @@ esac], [gcc_GAS_CHECK_FEATURE([gnu_unique_object], gcc_cv_as_gnu_unique_object, [elf,2,19,52],, - [.type foo, @gnu_unique_object],, + [.type foo, '$target_type_format_char'gnu_unique_object],, +# We need to unquote above to to use the definition from config.gcc. # Also check for ld.so support, i.e. glibc 2.11 or higher. [[if test x$host = x$build -a x$host = x$target && ldd --version 2>/dev/null && Index: gcc/config.gcc =================================================================== --- gcc/config.gcc (revision 189069) +++ gcc/config.gcc (revision 189071) @@ -184,6 +184,11 @@ # the --with-sysroot configure option or the # --sysroot command line option is used this # will be relative to the sysroot. +# target_type_format_char +# The default character to be used for formatting +# the attribute in a +# .type symbol_name, ${t_t_f_c} +# directive. # The following variables are used in each case-construct to build up the # outgoing variables: @@ -235,6 +240,7 @@ need_64bit_hwint= need_64bit_isa= native_system_header_dir=/usr/include +target_type_format_char='@' # Don't carry these over build->host->target. Please. xm_file= @@ -321,6 +327,7 @@ arm*-*-*) cpu_type=arm extra_headers="mmintrin.h arm_neon.h" + target_type_format_char='%' c_target_objs="arm-c.o" cxx_target_objs="arm-c.o" extra_options="${extra_options} arm/arm-tables.opt"