From patchwork Wed Oct 28 14:22:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Olivier Hainque X-Patchwork-Id: 1389305 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=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=adacore-com.20150623.gappssmtp.com header.i=@adacore-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=qi9sZDUo; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CLrPJ3gthz9sVh for ; Thu, 29 Oct 2020 01:22:12 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8983C3972430; Wed, 28 Oct 2020 14:22:10 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by sourceware.org (Postfix) with ESMTPS id 0DAA13850432 for ; Wed, 28 Oct 2020 14:22:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0DAA13850432 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=hainque@adacore.com Received: by mail-wm1-x336.google.com with SMTP id l20so3393557wme.0 for ; Wed, 28 Oct 2020 07:22:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore-com.20150623.gappssmtp.com; s=20150623; h=from:mime-version:subject:message-id:date:cc:to; bh=U/7Pmhsj2MlFDBYyhVWy/Dti4r21KDmOQF7TWNgDoRk=; b=qi9sZDUoSe7CO6LJhrP3/jFbOu1B3bghbwSeX59ZpHAmLSC39G37N0dNCM3kewoK/I 1O7yu+B1rRgFEcH9DV8YHPcOIBVfQc+vh0NpL9haNrcdfPFvZKeYtNWWnTHpYe+sog4+ YyEuR565TrKkfGfP8l/xxwcWnlWav2KcvxXLfrGj/kcaqaI5BkvXMrA3LRV2r5u59we+ G84FCn31I2YT5Lgn0pZncbJktz42b+QxJ8gGqgRcs1k7kc/KB/RkCh6ozBuJ1uAugYnX 92Y9nl4o5qYxWP24SkhABLn5/ZPtNYsHaubWHc40/7x05JTyrAaYV3w09b+q80dJZfjj WTtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:mime-version:subject:message-id:date:cc:to; bh=U/7Pmhsj2MlFDBYyhVWy/Dti4r21KDmOQF7TWNgDoRk=; b=X8pTH3SCbfcxar9TUeg2Slsa+H/v2uSQtIfMbFcNaQJeL//Ur+gueX2IkAYTP5cA9H 6LxbXYlRlQt1Sp42dCvKtuA5/1sa2rIIHzglyNWnNwzGet3172EImPhE4M2L8U8WSxxz jZZ7Q6AfEVtpI8os/nn2hJOXdDJ6nKzL1CiqyYoXFLIDy3E0AiysYs6n/40DzDdI/MG3 mV8jFQZUnt+lbe9KenQ5qER1KutzOmtOsv5lWoD3GFxef2FRVlK9BEbI/h1P1rh/Zbu1 lj6n7s6CXDbc0Cn7Yj7aDwBydDDVoYjFwQeUKiIRHi4n62ijfS1V3D/Idw+ycNnNoMqo r1Kg== X-Gm-Message-State: AOAM532uyjV6Fkl5E/TMYw7X5+bRrqtgktC2Xu4WQRNfmNli+5JvNjzs vcXBGXIzEW2OEM2ZmqdMDIkCJbZORc7CsBHe X-Google-Smtp-Source: ABdhPJxHI5hWbf6x22eqLxl91lMCk/1B+l3AdTpfsFkgoojoUlltsAZ0kHX89gQ0xSMPQxIjXd158w== X-Received: by 2002:a1c:e283:: with SMTP id z125mr8841573wmg.137.1603894926937; Wed, 28 Oct 2020 07:22:06 -0700 (PDT) Received: from 2a01cb0002912700f90954e26bd34c83.ipv6.abo.wanadoo.fr (2a01cb0002912700f90954e26bd34c83.ipv6.abo.wanadoo.fr. [2a01:cb00:291:2700:f909:54e2:6bd3:4c83]) by smtp.gmail.com with ESMTPSA id w6sm6886655wmb.28.2020.10.28.07.22.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Oct 2020 07:22:06 -0700 (PDT) From: Olivier Hainque Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: [patch] vxworks: Fix the logic conditioning VX_ENTER/LEAVE_TLS_DTOR Message-Id: <02F4FDC1-0960-4EC4-A1BD-9FDBAC70D661@adacore.com> Date: Wed, 28 Oct 2020 15:22:05 +0100 To: GCC Patches X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" This change fixes a basic #if/#ifdef confusion exposed by the wider range of testing we’re running for the forthcoming introduction of additional support for VxWorks 7r2, which comes together with a few organizational changes to keep supporting older versions. Committing as obvious after checking that it does fix unexpected undefined references on powerpc for vx7r2. Olivier 2020-10-28 Olivier Hainque libgcc/ * config/gthr-vxworks-tls.c: Fix preprocessor logic controlling the definition of VX_ENTER_TLS_DTOR and VX_LEAVE_TLS_DTOR based on a version major check. diff --git a/libgcc/config/gthr-vxworks-tls.c b/libgcc/config/gthr-vxworks-tls.c index 8987e55c35ac..1d5c4fbb34de 100644 --- a/libgcc/config/gthr-vxworks-tls.c +++ b/libgcc/config/gthr-vxworks-tls.c @@ -115,7 +115,7 @@ extern void __gthread_set_tls_data (void *data); #endif -#ifdef _VXWORKS_MAJOR_EQ(6) +#if _VXWORKS_MAJOR_EQ(6) extern void __gthread_enter_tls_dtor_context (void); extern void __gthread_leave_tls_dtor_context (void);