From patchwork Fri Dec 13 13:36:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Hainque X-Patchwork-Id: 1209145 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-515882-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="xATqwp2H"; dkim-atps=neutral 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 47ZBXq11lpz9sPT for ; Sat, 14 Dec 2019 00:36:57 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :content-type:subject:date:message-id:cc:to:mime-version; q=dns; s=default; b=ynZA+3zsy2ZkiSNZbPrnoKoh9bVauLohy4zrNoW6JjA0xX6CU2 5MQMtw2yOZ5a02iqkCxHgfE0smZFyRgPQ/EfyaYKlBTlHCRh6jhFBTkEvXO7TKBs Pu7wFD/roNabLd15nD0kPcnLGqR0ZUM254WwHl6SPFVuM2j7NXegRfsoA= 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:from :content-type:subject:date:message-id:cc:to:mime-version; s= default; bh=bRF3yKzhzJE88HlQOSR4DTU8yh0=; b=xATqwp2HBPIMQ7tG759P Iwe3HuZberoBIpIYyWjoEbq1tlNBBbPl4ZbhnTLtrIgMPYb2h6SUNg++dcfbPpMt 0rSfAo+5geLFV1PyFAY6bj8JLypqZWuus3KFwzFdjxmCnpcEseqPLO2RAWP1M7zp 2uh+phzUHS2ogNa2udgF2Ok= Received: (qmail 91804 invoked by alias); 13 Dec 2019 13:36:50 -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 91794 invoked by uid 89); 13 Dec 2019 13:36:50 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=spelling, H*c:HHHH, H*c:HHHHHHHH X-HELO: smtp.eu.adacore.com Received: from mel.act-europe.fr (HELO smtp.eu.adacore.com) (194.98.77.210) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 13 Dec 2019 13:36:48 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id D3C3881393; Fri, 13 Dec 2019 14:36:45 +0100 (CET) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kv1IEBoVhLQw; Fri, 13 Dec 2019 14:36:45 +0100 (CET) Received: from [IPv6:2a02:2ab8:224:100::1002] (unknown [IPv6:2a02:2ab8:224:100::1002]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.eu.adacore.com (Postfix) with ESMTPSA id A4D778137C; Fri, 13 Dec 2019 14:36:44 +0100 (CET) From: Olivier Hainque Subject: [patch] Fix typo in macro name guarding conditional in vxcrtstuff.c Date: Fri, 13 Dec 2019 14:36:40 +0100 Message-Id: <95558C55-A797-4AF0-94CF-15F6DBDB398C@adacore.com> Cc: Olivier Hainque , =?utf-8?b?SsOpcsO0bWUgTGFtYm91?= =?utf-8?q?rg?= To: GCC Patches Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) Hello, This patch fixes an obvious typo in a macro name used to guard some definitions used later on in vxcrtstuff.c, leading to an unexpected mix of symbols in a vxcrtbegin variant and incorrect behavior for the corresponding mode at run time. Tested in accordance with the description in https://gcc.gnu.org/ml/gcc-patches/2019-12/msg00911.html Committing to mainline. Olivier 2019-12-13 Olivier Hainque libgcc/ * config/vxcrtstuff.c: Fix incorrect spelling of USE_INITFINI_ARRAY in guard. libgcc/config/vxcrtstuff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libgcc/config/vxcrtstuff.c b/libgcc/config/vxcrtstuff.c index 616ad072cba..87fadda9ac5 100644 --- a/libgcc/config/vxcrtstuff.c +++ b/libgcc/config/vxcrtstuff.c @@ -38,7 +38,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see Otherwise, we may rely on ctors/dtors sections for RTPs or expect munch to be involved for kernel modules. */ -#if !defined(USE_INIT_FINI_ARRAY) && defined(__RTP__) +#if !defined(USE_INITFINI_ARRAY) && defined(__RTP__) #define USE_CDTORS_SECTIONS #endif @@ -77,7 +77,7 @@ __attribute__((section(__LIBGCC_EH_FRAME_SECTION_NAME__), aligned(4))) #define EH_CTOR_ATTRIBUTE __attribute__((constructor (101))) #define EH_DTOR_ATTRIBUTE __attribute__((destructor (101))) -#else /* USE_INITFINI_ARRAY */ +#else /* !USE_INITFINI_ARRAY */ /* Note: Even in case of .ctors/.dtors sections, we can't use the attribute (constructor (15)) here as gcc may have been configured with constructors