From patchwork Sat Nov 12 01:12:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 125315 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 3F9241007D8 for ; Sat, 12 Nov 2011 12:13:35 +1100 (EST) Received: (qmail 650 invoked by alias); 12 Nov 2011 01:13:32 -0000 Received: (qmail 639 invoked by uid 22791); 12 Nov 2011 01:13:31 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,TW_SV X-Spam-Check-By: sourceware.org Received: from shards.monkeyblade.net (HELO shards.monkeyblade.net) (198.137.202.13) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 12 Nov 2011 01:13:18 +0000 Received: from localhost (cpe-66-65-61-233.nyc.res.rr.com [66.65.61.233]) (authenticated bits=0) by shards.monkeyblade.net (8.14.4/8.14.4) with ESMTP id pAC1Cm8s010903 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 11 Nov 2011 17:12:52 -0800 Date: Fri, 11 Nov 2011 20:12:47 -0500 (EST) Message-Id: <20111111.201247.1111776951527330696.davem@davemloft.net> To: gcc-patches@gcc.gnu.org CC: jason@redhat.com, jimis@gmx.net, ebotcazou@adacore.com Subject: [PATCH] Fix Linux/sparc build after generic asm output optimizations. From: David Miller 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 Any ELF target that overrides ASM_GENERATE_INTERNAL_LABEL is at risk of not building any more due to the recent elfos.h changes. Those changes require that the label format generated by ASM_GENERATE_INTERNAL_LABEL and TARGET_ASM_INTERNAL_LABEL are in sync, but that is only being ensured for targets that use elfos.h as-is. It turns out that Linux/sparc's override is unnecessary, so just getting rid of it is the best thing to do. Eric, it seems that most if not all of the other ELF sparc targets will need something like this as well but I was only able to validate Linux at the moment. Committed to trunk. gcc/ * config/sparc/linux.h (ASM_GENERATE_INTERNAL_LABEL): Delete. * config/sparc/linux64.h (ASM_GENERATE_INTERNAL_LABEL): Delete. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181307 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/config/sparc/linux.h | 9 --------- gcc/config/sparc/linux64.h | 9 --------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 73bec22..62ae4a1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-11-11 David S. Miller + + * config/sparc/linux.h (ASM_GENERATE_INTERNAL_LABEL): Delete. + * config/sparc/linux64.h (ASM_GENERATE_INTERNAL_LABEL): Delete. + 2011-11-11 Jakub Jelinek * config/i386/i386-protos.h (ix86_maybe_emit_epilogue_vzeroupper): diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h index 443c796..60dc869 100644 --- a/gcc/config/sparc/linux.h +++ b/gcc/config/sparc/linux.h @@ -118,15 +118,6 @@ do { \ #undef LOCAL_LABEL_PREFIX #define LOCAL_LABEL_PREFIX "." -/* This is how to store into the string LABEL - the symbol_ref name of an internal numbered label where - PREFIX is the class of label and NUM is the number within the class. - This is suitable for output with `assemble_name'. */ - -#undef ASM_GENERATE_INTERNAL_LABEL -#define ASM_GENERATE_INTERNAL_LABEL(LABEL,PREFIX,NUM) \ - sprintf (LABEL, "*.L%s%ld", PREFIX, (long)(NUM)) - /* Define for support of TFmode long double. SPARC ABI says that long double is 4 words. */ diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h index bec279d..14966b9 100644 --- a/gcc/config/sparc/linux64.h +++ b/gcc/config/sparc/linux64.h @@ -236,15 +236,6 @@ do { \ #undef LOCAL_LABEL_PREFIX #define LOCAL_LABEL_PREFIX "." -/* This is how to store into the string LABEL - the symbol_ref name of an internal numbered label where - PREFIX is the class of label and NUM is the number within the class. - This is suitable for output with `assemble_name'. */ - -#undef ASM_GENERATE_INTERNAL_LABEL -#define ASM_GENERATE_INTERNAL_LABEL(LABEL,PREFIX,NUM) \ - sprintf (LABEL, "*.L%s%ld", PREFIX, (long)(NUM)) - /* DWARF bits. */ /* Follow Irix 6 and not the Dwarf2 draft in using 64-bit offsets.