From patchwork Mon Dec 5 09:46:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Andre Vieira (lists)" X-Patchwork-Id: 702654 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tXKg94zyjz9srZ for ; Mon, 5 Dec 2016 20:47:33 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="H3iSW3zK"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:references:cc:to:from:message-id:date:mime-version :in-reply-to:content-type; q=dns; s=default; b=MtueNB5JsNmzggmCA D1r2RiKgNAQYobInXRnvNh5uzIAWGW5V7AicCoVAF+cl6w+CQVQTy+NPvZ7qRi6p fbXMjs392niZhcza3aAbPPBQAZfiihQfpwI5QtK4BWGRGsQPGRJO5TQOL6bi2n07 CLbLinjvsYomPHirxcNlJwgC7k= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:references:cc:to:from:message-id:date:mime-version :in-reply-to:content-type; s=default; bh=GY0cg9Hgoo+fqIA6aXUKSpa kbjc=; b=H3iSW3zKzgyfwphEdo46VuSWSwKowiuod1dp35GzwVP6bXBM7RKgRvx g83LlPgk1t/bdjaNxkiwmSGVl51YrfskGvAXsCWIgz/EbHf6MAkpp9pH24KUEsVY 2bhdr8B7tBYjF1jYWx/GE80iu2GYbFVdSQxwzanwJEF+/uZhzk3E= Received: (qmail 53839 invoked by alias); 5 Dec 2016 09:46:44 -0000 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 Received: (qmail 53811 invoked by uid 89); 5 Dec 2016 09:46:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=5959, H*f:sk:8454f79, H*UA:38.2.0, H*u:38.2.0 X-Spam-User: qpsmtpd, 2 recipients X-HELO: foss.arm.com Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 05 Dec 2016 09:46:42 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8FCE3707; Mon, 5 Dec 2016 01:46:40 -0800 (PST) Received: from [10.2.206.251] (e107157-lin.cambridge.arm.com [10.2.206.251]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id F27353F483; Mon, 5 Dec 2016 01:46:39 -0800 (PST) Subject: [committed][ARM]Fix arm-netbsdelf bootstrap References: <8454f790-523e-4de9-2573-414528ed59eb@redhat.com> Cc: gcc@gcc.gnu.org, law@redhat.com To: GCC Patches From: "Andre Vieira (lists)" Message-ID: <5845377E.8040201@arm.com> Date: Mon, 5 Dec 2016 09:46:38 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <8454f790-523e-4de9-2573-414528ed59eb@redhat.com> X-IsSubscribed: yes On 02/12/16 21:16, Jeff Law wrote: > > Trying to build arm-netbsdelf: > > g++ -fno-PIE -c -g -O2 -DIN_GCC -DCROSS_DIRECTORY_STRUCTURE > -fno-exceptions -fno-rtti -fasynchronous-unwind-tables -W -Wall > -Wno-narrowing -Wwrite-strings -Wcast-qual -Wmissing-format-attribute > -Woverloaded-virtual -pedantic -Wno-long-long -Wno-variadic-macros > -Wno-overlength-strings -Werror -fno-common -DHAVE_CONFIG_H -I. -I. > -I/home/cygnus/law/gcc-testing/gcc/gcc > -I/home/cygnus/law/gcc-testing/gcc/gcc/. > -I/home/cygnus/law/gcc-testing/gcc/gcc/../include > -I/home/cygnus/law/gcc-testing/gcc/gcc/../libcpp/include > -I/opt/cfarm/mpc/include > -I/home/cygnus/law/gcc-testing/gcc/gcc/../libdecnumber > -I/home/cygnus/law/gcc-testing/gcc/gcc/../libdecnumber/dpd > -I../libdecnumber -I/home/cygnus/law/gcc-testing/gcc/gcc/../libbacktrace > -o arm.o -MT arm.o -MMD -MP -MF ./.deps/arm.TPo > /home/cygnus/law/gcc-testing/gcc/gcc/config/arm/arm.c > /home/cygnus/law/gcc-testing/gcc/gcc/config/arm/arm.c:600:0: error: > "TARGET_ASM_INIT_SECTIONS" redefined [-Werror] > #define TARGET_ASM_INIT_SECTIONS arm_asm_init_sections > > In file included from > /home/cygnus/law/gcc-testing/gcc/gcc/target-def.h:106:0, > from > /home/cygnus/law/gcc-testing/gcc/gcc/config/arm/arm.c:69: > ./target-hooks-def.h:86:0: note: this is the location of the previous > definition > #define TARGET_ASM_INIT_SECTIONS hook_void_void > > > It's referring to this section of code. Note the placement of the > #endif. Looks weird, not sure if it's in the right place, should be a > line earlier or a line later: > > #if ARM_UNWIND_INFO > #undef TARGET_ASM_UNWIND_EMIT > #define TARGET_ASM_UNWIND_EMIT arm_unwind_emit > > /* EABI unwinding tables use a different format for the typeinfo > tables. */ > #undef TARGET_ASM_TTYPE > #define TARGET_ASM_TTYPE arm_output_ttype > > #undef TARGET_ARM_EABI_UNWINDER > #define TARGET_ARM_EABI_UNWINDER true > > #undef TARGET_ASM_EMIT_EXCEPT_PERSONALITY > #define TARGET_ASM_EMIT_EXCEPT_PERSONALITY arm_asm_emit_except_personality > > #undef TARGET_ASM_INIT_SECTIONS > #endif /* ARM_UNWIND_INFO */ > #define TARGET_ASM_INIT_SECTIONS arm_asm_init_sections Hi Jeff, Sorry about that, I meant to copy the whole thing out of the #if. Committed this as obvious in revision r243240. gcc/ChangeLog: * config/arm/arm.c (TARGET_ASM_INIT_SECTIONS): Fix wrong undef location. diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index ec1f5fc5e0d9ff8ba41778ff5bb698bc50eefc5b..437da6fe3d34978e7a3a72f7ec39dc76a54d6408 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -595,8 +595,9 @@ static const struct attribute_spec arm_attribute_table[] = #undef TARGET_ASM_EMIT_EXCEPT_PERSONALITY #define TARGET_ASM_EMIT_EXCEPT_PERSONALITY arm_asm_emit_except_personality -#undef TARGET_ASM_INIT_SECTIONS #endif /* ARM_UNWIND_INFO */ + +#undef TARGET_ASM_INIT_SECTIONS #define TARGET_ASM_INIT_SECTIONS arm_asm_init_sections #undef TARGET_DWARF_REGISTER_SPAN