From patchwork Thu Dec 2 07:22:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 48386 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E8D55385AC20 for ; Thu, 2 Dec 2021 07:22:48 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by sourceware.org (Postfix) with ESMTPS id 737603857C76 for ; Thu, 2 Dec 2021 07:22:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 737603857C76 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rasmusvillemoes.dk Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rasmusvillemoes.dk Received: by mail-lj1-x22e.google.com with SMTP id d11so53039610ljg.8 for ; Wed, 01 Dec 2021 23:22:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Qzu7JzGtLZhsh062I6u2rocjthO2/i+tAl2Ir5C/RD4=; b=ZSvKMmQ0QJ11w2VdlW8HLlBtWhj1MxzDApJxQjN6TUtwECtTmfPjfMdp6qarbFMKZI BnIqxaWHKI+6zj2Epo3th0i9ClWwKnPswE/+B6P1I7frHgp+fwLkkKz6fpCDWnQAPjwt pG2GifOBbzZ6x40x3aY6LQ2/E8Gzb2E9/5xZQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Qzu7JzGtLZhsh062I6u2rocjthO2/i+tAl2Ir5C/RD4=; b=rzmQiwbJS5VzexkUKTdCdEEXy2RUPdAMAPwHQx5VY/lVNL1Uh4quXSmP6MdF9dop48 X721a0AVm3MAH5kfO4B4JYYB7WXNmh5QojfmeoI2Cn5mUhN7ATa/N2v5Wij6Inix90BK EVJycUaaWPJrfDDCAF5ASK37MufarW0n+gj+t1a+PBYBksp6mpIWtJqiSzUlGtMYsofB tI5L6o5uPypuMgnl3DRUXN/pp6XC9/G9JV3/NZa8Erw2jFxjrlAbzeRmj8N3DW20i0VH 7jeAkVurr5PsFlN/XiFbWxqf6FKVemqQtp7eCJgPZea8vGY+4VAWK0VV6Wvh2uYVF8fM KL/A== X-Gm-Message-State: AOAM533eyyUPaIJog44FCAUUuy3OZaLQqVHBziQt7Xp2ypidiapZuCcg wWRR2RdpddHWyAR/8G5Fb07f5eeiMWXwTZU4 X-Google-Smtp-Source: ABdhPJxMey3BgcD9j+VYfIw9qGrA9sOUnFWg5mz+EQgh6WmTc+jyxzLXNGkAy8zSaOZQmxpD/RZrdg== X-Received: by 2002:a2e:8554:: with SMTP id u20mr10231833ljj.70.1638429750742; Wed, 01 Dec 2021 23:22:30 -0800 (PST) Received: from prevas-ravi.prevas.se ([81.216.59.226]) by smtp.gmail.com with ESMTPSA id c12sm218153lji.29.2021.12.01.23.22.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 23:22:19 -0800 (PST) From: Rasmus Villemoes X-Google-Original-From: Rasmus Villemoes To: gcc-patches@gcc.gnu.org Subject: [PATCH v2] fix spelling of -linker-output-auto-nolto-rel Date: Thu, 2 Dec 2021 08:22:10 +0100 Message-Id: <20211202072210.609575-1-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: , Cc: Eric Botcazou , Rasmus Villemoes Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The transposition nolto -> notlo is confusing and it makes the long name even harder to read than it already is - I kept reading it as "not lo" until I realized it was a simple typo. Fixes: 5269b24605b1 (Silence warning in LTO mode on VxWorks) lto-plugin/ * lto-plugin.c: Fix -linker-output-auto-notlo-rel -> -linker-output-auto-nolto-rel typo. (process_option): Adjust accordingly, accepting both old and new spelling. gcc/ * config/vxworks.h (LTO_PLUGIN_SPEC): Adapt to corrected spelling of -linker-output-auto-nolto-rel. --- v2: still accept -linker-output-auto-notlo-rel in the plugin. Like this? gcc/config/vxworks.h | 2 +- lto-plugin/lto-plugin.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gcc/config/vxworks.h b/gcc/config/vxworks.h index e41f16a51e8..bddf2c37f42 100644 --- a/gcc/config/vxworks.h +++ b/gcc/config/vxworks.h @@ -306,4 +306,4 @@ extern void vxworks_emit_call_builtin___clear_cache (rtx begin, rtx end); further incremental LTO linking. We do not do repeated incremental linking so silence the warning (instead of passing -flinker-output=nolto-rel). */ #undef LTO_PLUGIN_SPEC -#define LTO_PLUGIN_SPEC "%{!mrtp:-plugin-opt=-linker-output-auto-notlo-rel}" +#define LTO_PLUGIN_SPEC "%{!mrtp:-plugin-opt=-linker-output-auto-nolto-rel}" diff --git a/lto-plugin/lto-plugin.c b/lto-plugin/lto-plugin.c index 6ab9822f369..b73483de994 100644 --- a/lto-plugin/lto-plugin.c +++ b/lto-plugin/lto-plugin.c @@ -32,7 +32,7 @@ along with this program; see the file COPYING3. If not see -nop: Instead of running lto-wrapper, pass the original to the plugin. This only works if the input files are hybrid. -linker-output-known: Do not determine linker output - -linker-output-auto-notlo-rel: Switch from rel to nolto-rel mode without + -linker-output-auto-nolto-rel: Switch from rel to nolto-rel mode without warning. This is used on systems like VxWorks (kernel) where the link is always partial and repeated incremental linking is generally not used. -sym-style={none,win32,underscore|uscore} @@ -1321,7 +1321,9 @@ process_option (const char *option) { if (strcmp (option, "-linker-output-known") == 0) linker_output_known = true; - else if (strcmp (option, "-linker-output-auto-notlo-rel") == 0) + /* Also accept "notlo" for backwards compatibility. */ + else if ((strcmp (option, "-linker-output-auto-nolto-rel") == 0) + || (strcmp (option, "-linker-output-auto-notlo-rel") == 0)) linker_output_auto_nolto_rel = true; else if (strcmp (option, "-debug") == 0) debug = true;