| Message ID | 20230326182120.194541-1-hi@alyssa.is |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1103974vqo;
Sun, 26 Mar 2023 13:04:36 -0700 (PDT)
X-Google-Smtp-Source:
AK7set9ITySefJb0xeWSwub81nJmQugwfU8z7b4hlZEvGxXuzpjZAC6+ZpR5zdzQ20MrUZ84D00w
X-Received: by 2002:a05:6a20:4c12:b0:cb:c276:588d with SMTP id
fm18-20020a056a204c1200b000cbc276588dmr9775247pzb.22.1679861076125;
Sun, 26 Mar 2023 13:04:36 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1679861076; cv=none;
d=google.com; s=arc-20160816;
b=BdrCR2jaJ5U+ECKAZBNgAjWBLFA2QXU223khkcYGkTfZrIuhxxC5cHMJM1GuKQIQ3z
8y5n2Ra3ix3ULy0iEbUMJwiTXQeOeKxMWIQ0XZj0YXB373TDUNNbfGlZmOil0QR3dzLf
imGUoeWPZqcZ3vVQ5p81spCUimwf9Rk0VfUsxQlMl4JM91eytpLIrB9VkECjYTmewiBo
NWvnrS8hL8K4iLeUyAycKn58I7cr+yEgGvDvX7ratEafcsqsl2jFpjz0Y07BexchbHip
fHRM+JA8fzsJm3jU35JljsAgDlznPVTNdM4kNVdvywXITaWMnwj32kA1fjiBlDDIH26l
0rZA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:message-id:date:subject:cc:to:from:feedback-id:dkim-signature
:dkim-signature;
bh=M9VSG9c5T31aOotkBu3C2E0xwoGSkwmuq4Ti2Ve1tEI=;
b=LQkaM1ypVtuF842gHwYY73FJwP3ACGydwlt152lLotZhS9bnaN0qOGPVMbU/BAKUbb
N0kJQ0c4d1f0fpAA9XH3+rNRDZau1c8g/JruAe3KMlbzxeOFfXyqUT9Y8D3DGRYHEGqs
IhiUTvmMK6/l3PKeW1yLj9wrgqVqz/mwjfI2+LXJ3x7CxmX4PncOjlSWqBSlG1oX+Es7
OO6m1cwU24pqDQPbNj2p354sOLaZNSP67SzJoWKKpXscCrCSHeHDnvo00jVqcLL20sQj
JxOcKIQ4A32CxiKLnxs+LI/icOAsBMxlDQNwGuFKwhuJtstiQ/amdlQvRIs6+GobiU0Z
ggLw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@alyssa.is header.s=fm1 header.b=orWuq3xj;
dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=E1ySVSOL;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
y65-20020a638a44000000b0050fab5a8c2fsi14337706pgd.476.2023.03.26.13.04.22;
Sun, 26 Mar 2023 13:04:36 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@alyssa.is header.s=fm1 header.b=orWuq3xj;
dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=E1ySVSOL;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S231821AbjCZSX2 (ORCPT <rfc822;makky5685@gmail.com> + 99 others);
Sun, 26 Mar 2023 14:23:28 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36220 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229531AbjCZSX0 (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Sun, 26 Mar 2023 14:23:26 -0400
Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com
[66.111.4.26])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 136F3210E;
Sun, 26 Mar 2023 11:23:24 -0700 (PDT)
Received: from compute5.internal (compute5.nyi.internal [10.202.2.45])
by mailout.nyi.internal (Postfix) with ESMTP id 126F15C00D5;
Sun, 26 Mar 2023 14:23:20 -0400 (EDT)
Received: from mailfrontend2 ([10.202.2.163])
by compute5.internal (MEProxy); Sun, 26 Mar 2023 14:23:20 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc
:cc:content-transfer-encoding:content-type:date:date:from:from
:in-reply-to:message-id:mime-version:reply-to:sender:subject
:subject:to:to; s=fm1; t=1679855000; x=1679941400; bh=M9VSG9c5T3
1aOotkBu3C2E0xwoGSkwmuq4Ti2Ve1tEI=; b=orWuq3xj1DQJl0roms82XWSlII
t1c1S/Ye9/R+L0SYSrmZs5se42zKmLvIl0BK+jt8RxsvEG5B2vwpvoyq7RHQNwRP
7nR8Quwq1qpKlDpjZXkSWNSwYv6KAiUKPAo9MYnUWvFl6XvwIG3kvlL5ZTj2T6Xq
k4Nq0Q+MOjdaQTXJ1n7qz1HSjZvTqGjqE9bfPy1szFq/i1PmJar7VLmqa/XXBBYb
r2gjHHXCNC3C7VvgHg7yA+1ekXC/gf6Pl+mQMoQSCcWZGqUT42/eOY3bohLxGpLE
L0LCb6rpLborL+uJd6ydVFYA2252LOMLluikix5FsakrlaCb+RGoAAlMgZqg==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:cc:content-transfer-encoding
:content-type:date:date:feedback-id:feedback-id:from:from
:in-reply-to:message-id:mime-version:reply-to:sender:subject
:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender
:x-sasl-enc; s=fm2; t=1679855000; x=1679941400; bh=M9VSG9c5T31aO
otkBu3C2E0xwoGSkwmuq4Ti2Ve1tEI=; b=E1ySVSOLCRpuJZeZSzSlbiX1sACyt
MdkKZGKgEXBxMne9wvX8u1ODpNwGPkkvt/Y4qU2DMe/xndPyVVkqC33rVfhhvI4X
tjUyIyltAyxxhiyHfb4GEW71zYQ2W/mMR8vWlfdGXP8waIoHsEbKCuSNAAVLoNAH
F3PD9XXrxjUXxeK8aGuUUSvGZdCN1J2KRLNSbRVyws0MuRKkAPw/L/WIqLxD+oN9
dIpYqZD090Qbgzx6PrFoS9eYldGGsJECst6cmcp5ksJiZAI7i1AfSUS3/w0Z30Uj
bAruyuOQPVtlUsI2L231A0LbaUEiDe/fgyyiERGtQGFNOQzlbcpVQtNFg==
X-ME-Sender: <xms:l40gZFg7B5UjJR6dNlVCQ6J8nkicnFzZjMX9eTixU38lS74SpxvRYQ>
<xme:l40gZKBwe0BaP1iGsOkX-IPJYpYvsdNuVoctkMObon87KSqFApnGqj4a_aQSjrZVh
1cPDO2UVHdDcp8f4Q>
X-ME-Received:
<xmr:l40gZFEMn-ZKQDX-4XaQUwzxAlwIqkNTigGmJYYffX6B6zd4JMvWnkUi-RcVbenoxFJh81dD_LXCRbUq4RJfOxvMDvmyCY0Kog>
X-ME-Proxy-Cause:
gggruggvucftvghtrhhoucdtuddrgedvhedrvdehtddguddvhecutefuodetggdotefrod
ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh
necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd
enucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpeetlhihshhs
rgcutfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpeehke
fgtdevtedtkeduudeguefgudejheeugfelgeettdfhffduhfehudfhudeuhfenucevlhhu
shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehhihesrghlhihssh
grrdhish
X-ME-Proxy: <xmx:l40gZKRwWPSWbSlLt5dhyr0CaylzZI70BVU9ivslFitOmZetZCBn9g>
<xmx:l40gZCwST8pEHX7K-SiTUacztM63AhI1OyKh63MIJ_2HhIooaQOCLg>
<xmx:l40gZA7hdJdcEQ57udqoCya1Uah6Jh2omM-ZIsFpJHjlYcFNPJMHsA>
<xmx:mI0gZE5TXdcl9GwN5Fi-Mbv9pqrbLjaTlBbnjaB8EeX1wjfsgvaYQQ>
Feedback-ID: i12284293:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun,
26 Mar 2023 14:23:19 -0400 (EDT)
Received: by x220.qyliss.net (Postfix, from userid 1000)
id 494C81FD7; Sun, 26 Mar 2023 18:23:17 +0000 (UTC)
From: Alyssa Ross <hi@alyssa.is>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: Nick Cao <nickcao@nichi.co>, linux-kbuild@vger.kernel.org,
Nick Desaulniers <ndesaulniers@google.com>,
Nathan Chancellor <nathan@kernel.org>,
linux-kernel@vger.kernel.org, llvm@lists.linux.dev,
linux-riscv@lists.infradead.org, Tom Rix <trix@redhat.com>,
Albert Ou <aou@eecs.berkeley.edu>,
Palmer Dabbelt <palmer@dabbelt.com>,
Paul Walmsley <paul.walmsley@sifive.com>,
Alyssa Ross <hi@alyssa.is>, stable@vger.kernel.org
Subject: [PATCH v2] purgatory: fix disabling debug info
Date: Sun, 26 Mar 2023 18:21:21 +0000
Message-Id: <20230326182120.194541-1-hi@alyssa.is>
X-Mailer: git-send-email 2.37.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,
RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=unavailable
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1761462007928052294?=
X-GMAIL-MSGID: =?utf-8?q?1761462007928052294?=
|
| Series |
[v2] purgatory: fix disabling debug info
|
|
Commit Message
Alyssa Ross
March 26, 2023, 6:21 p.m. UTC
Since 32ef9e5054ec, -Wa,-gdwarf-2 is no longer used in KBUILD_AFLAGS.
Instead, it includes -g, the appropriate -gdwarf-* flag, and also the
-Wa versions of both of those if building with Clang and GNU as. As a
result, debug info was being generated for the purgatory objects, even
though the intention was that it not be.
Fixes: 32ef9e5054ec ("Makefile.debug: re-enable debug info for .S files")
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Cc: stable@vger.kernel.org
---
Difference from v2: replace each AFLAGS_REMOVE_* assignment with a
single aflags-remove-y line, and use foreach to add the -Wa versions,
as suggested by Masahiro Yamada.
arch/riscv/purgatory/Makefile | 7 +------
arch/x86/purgatory/Makefile | 3 +--
2 files changed, 2 insertions(+), 8 deletions(-)
base-commit: da8e7da11e4ba758caf4c149cc8d8cd555aefe5f
Comments
On Mon, Mar 27, 2023 at 3:23 AM Alyssa Ross <hi@alyssa.is> wrote: > > Since 32ef9e5054ec, -Wa,-gdwarf-2 is no longer used in KBUILD_AFLAGS. > Instead, it includes -g, the appropriate -gdwarf-* flag, and also the > -Wa versions of both of those if building with Clang and GNU as. As a > result, debug info was being generated for the purgatory objects, even > though the intention was that it not be. > > Fixes: 32ef9e5054ec ("Makefile.debug: re-enable debug info for .S files") > Signed-off-by: Alyssa Ross <hi@alyssa.is> > Cc: stable@vger.kernel.org Thanks, looks good to me. I can offer to pick this up to my tree later, but I will wait for Ack from the arch maintainers and other comments. > --- > > Difference from v2: replace each AFLAGS_REMOVE_* assignment with a > single aflags-remove-y line, and use foreach to add the -Wa versions, > as suggested by Masahiro Yamada. > > arch/riscv/purgatory/Makefile | 7 +------ > arch/x86/purgatory/Makefile | 3 +-- > 2 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile > index d16bf715a586..5730797a6b40 100644 > --- a/arch/riscv/purgatory/Makefile > +++ b/arch/riscv/purgatory/Makefile > @@ -84,12 +84,7 @@ CFLAGS_string.o += $(PURGATORY_CFLAGS) > CFLAGS_REMOVE_ctype.o += $(PURGATORY_CFLAGS_REMOVE) > CFLAGS_ctype.o += $(PURGATORY_CFLAGS) > > -AFLAGS_REMOVE_entry.o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_memcpy.o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_memset.o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_strcmp.o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_strlen.o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_strncmp.o += -Wa,-gdwarf-2 > +asflags-remove-y += $(foreach x, -g -gdwarf-4 -gdwarf-5, $(x) -Wa,$(x)) > > $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE > $(call if_changed,ld) > diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile > index 17f09dc26381..82fec66d46d2 100644 > --- a/arch/x86/purgatory/Makefile > +++ b/arch/x86/purgatory/Makefile > @@ -69,8 +69,7 @@ CFLAGS_sha256.o += $(PURGATORY_CFLAGS) > CFLAGS_REMOVE_string.o += $(PURGATORY_CFLAGS_REMOVE) > CFLAGS_string.o += $(PURGATORY_CFLAGS) > > -AFLAGS_REMOVE_setup-x86_$(BITS).o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_entry64.o += -Wa,-gdwarf-2 > +asflags-remove-y += $(foreach x, -g -gdwarf-4 -gdwarf-5, $(x) -Wa,$(x)) > > $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE > $(call if_changed,ld) > > base-commit: da8e7da11e4ba758caf4c149cc8d8cd555aefe5f > -- > 2.37.1 >
On Sun, Mar 26, 2023 at 11:23 AM Alyssa Ross <hi@alyssa.is> wrote: > > Since 32ef9e5054ec, -Wa,-gdwarf-2 is no longer used in KBUILD_AFLAGS. > Instead, it includes -g, the appropriate -gdwarf-* flag, and also the > -Wa versions of both of those if building with Clang and GNU as. As a > result, debug info was being generated for the purgatory objects, even > though the intention was that it not be. Ah, good catch! > > Fixes: 32ef9e5054ec ("Makefile.debug: re-enable debug info for .S files") > Signed-off-by: Alyssa Ross <hi@alyssa.is> > Cc: stable@vger.kernel.org > --- > > Difference from v2: replace each AFLAGS_REMOVE_* assignment with a > single aflags-remove-y line, and use foreach to add the -Wa versions, > as suggested by Masahiro Yamada. > > arch/riscv/purgatory/Makefile | 7 +------ > arch/x86/purgatory/Makefile | 3 +-- > 2 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile > index d16bf715a586..5730797a6b40 100644 > --- a/arch/riscv/purgatory/Makefile > +++ b/arch/riscv/purgatory/Makefile > @@ -84,12 +84,7 @@ CFLAGS_string.o += $(PURGATORY_CFLAGS) > CFLAGS_REMOVE_ctype.o += $(PURGATORY_CFLAGS_REMOVE) > CFLAGS_ctype.o += $(PURGATORY_CFLAGS) > > -AFLAGS_REMOVE_entry.o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_memcpy.o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_memset.o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_strcmp.o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_strlen.o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_strncmp.o += -Wa,-gdwarf-2 Removing the explicit `-Wa,-gdwarf-2` makes sense; nothing ever sets it. > +asflags-remove-y += $(foreach x, -g -gdwarf-4 -gdwarf-5, $(x) -Wa,$(x)) Is it simpler to just append `-g0` to the running list of asflags; that should also disable the emission of debug info? Or does that not remove debug info from the assembler? Either way: Acked-by: Nick Desaulniers <ndesaulniers@google.com> and thanks for the patch! > > $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE > $(call if_changed,ld) > diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile > index 17f09dc26381..82fec66d46d2 100644 > --- a/arch/x86/purgatory/Makefile > +++ b/arch/x86/purgatory/Makefile > @@ -69,8 +69,7 @@ CFLAGS_sha256.o += $(PURGATORY_CFLAGS) > CFLAGS_REMOVE_string.o += $(PURGATORY_CFLAGS_REMOVE) > CFLAGS_string.o += $(PURGATORY_CFLAGS) > > -AFLAGS_REMOVE_setup-x86_$(BITS).o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_entry64.o += -Wa,-gdwarf-2 > +asflags-remove-y += $(foreach x, -g -gdwarf-4 -gdwarf-5, $(x) -Wa,$(x)) > > $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE > $(call if_changed,ld) > > base-commit: da8e7da11e4ba758caf4c149cc8d8cd555aefe5f > -- > 2.37.1 >
On Mon, Mar 27, 2023 at 3:23 AM Alyssa Ross <hi@alyssa.is> wrote: > > Since 32ef9e5054ec, -Wa,-gdwarf-2 is no longer used in KBUILD_AFLAGS. > Instead, it includes -g, the appropriate -gdwarf-* flag, and also the > -Wa versions of both of those if building with Clang and GNU as. As a > result, debug info was being generated for the purgatory objects, even > though the intention was that it not be. > > Fixes: 32ef9e5054ec ("Makefile.debug: re-enable debug info for .S files") > Signed-off-by: Alyssa Ross <hi@alyssa.is> > Cc: stable@vger.kernel.org > --- > > Difference from v2: replace each AFLAGS_REMOVE_* assignment with a > single aflags-remove-y line, and use foreach to add the -Wa versions, > as suggested by Masahiro Yamada. Applied to linux-kbuild/fixes. Thanks. > arch/riscv/purgatory/Makefile | 7 +------ > arch/x86/purgatory/Makefile | 3 +-- > 2 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile > index d16bf715a586..5730797a6b40 100644 > --- a/arch/riscv/purgatory/Makefile > +++ b/arch/riscv/purgatory/Makefile > @@ -84,12 +84,7 @@ CFLAGS_string.o += $(PURGATORY_CFLAGS) > CFLAGS_REMOVE_ctype.o += $(PURGATORY_CFLAGS_REMOVE) > CFLAGS_ctype.o += $(PURGATORY_CFLAGS) > > -AFLAGS_REMOVE_entry.o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_memcpy.o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_memset.o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_strcmp.o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_strlen.o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_strncmp.o += -Wa,-gdwarf-2 > +asflags-remove-y += $(foreach x, -g -gdwarf-4 -gdwarf-5, $(x) -Wa,$(x)) > > $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE > $(call if_changed,ld) > diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile > index 17f09dc26381..82fec66d46d2 100644 > --- a/arch/x86/purgatory/Makefile > +++ b/arch/x86/purgatory/Makefile > @@ -69,8 +69,7 @@ CFLAGS_sha256.o += $(PURGATORY_CFLAGS) > CFLAGS_REMOVE_string.o += $(PURGATORY_CFLAGS_REMOVE) > CFLAGS_string.o += $(PURGATORY_CFLAGS) > > -AFLAGS_REMOVE_setup-x86_$(BITS).o += -Wa,-gdwarf-2 > -AFLAGS_REMOVE_entry64.o += -Wa,-gdwarf-2 > +asflags-remove-y += $(foreach x, -g -gdwarf-4 -gdwarf-5, $(x) -Wa,$(x)) > > $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE > $(call if_changed,ld) > > base-commit: da8e7da11e4ba758caf4c149cc8d8cd555aefe5f > -- > 2.37.1 >
diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile index d16bf715a586..5730797a6b40 100644 --- a/arch/riscv/purgatory/Makefile +++ b/arch/riscv/purgatory/Makefile @@ -84,12 +84,7 @@ CFLAGS_string.o += $(PURGATORY_CFLAGS) CFLAGS_REMOVE_ctype.o += $(PURGATORY_CFLAGS_REMOVE) CFLAGS_ctype.o += $(PURGATORY_CFLAGS) -AFLAGS_REMOVE_entry.o += -Wa,-gdwarf-2 -AFLAGS_REMOVE_memcpy.o += -Wa,-gdwarf-2 -AFLAGS_REMOVE_memset.o += -Wa,-gdwarf-2 -AFLAGS_REMOVE_strcmp.o += -Wa,-gdwarf-2 -AFLAGS_REMOVE_strlen.o += -Wa,-gdwarf-2 -AFLAGS_REMOVE_strncmp.o += -Wa,-gdwarf-2 +asflags-remove-y += $(foreach x, -g -gdwarf-4 -gdwarf-5, $(x) -Wa,$(x)) $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE $(call if_changed,ld) diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile index 17f09dc26381..82fec66d46d2 100644 --- a/arch/x86/purgatory/Makefile +++ b/arch/x86/purgatory/Makefile @@ -69,8 +69,7 @@ CFLAGS_sha256.o += $(PURGATORY_CFLAGS) CFLAGS_REMOVE_string.o += $(PURGATORY_CFLAGS_REMOVE) CFLAGS_string.o += $(PURGATORY_CFLAGS) -AFLAGS_REMOVE_setup-x86_$(BITS).o += -Wa,-gdwarf-2 -AFLAGS_REMOVE_entry64.o += -Wa,-gdwarf-2 +asflags-remove-y += $(foreach x, -g -gdwarf-4 -gdwarf-5, $(x) -Wa,$(x)) $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE $(call if_changed,ld)