From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>,
Masahiro Yamada <masahiroy@kernel.org>
Cc: Adam Bratschi-Kaye <ark.email@gmail.com>,
Alex Gaynor <alex.gaynor@gmail.com>,
Ayaan Zaidi <zaidi.ayaan@gmail.com>,
Boqun Feng <boqun.feng@gmail.com>,
Boris-Chengbiao Zhou <bobo1239@web.de>,
Douglas Su <d0u9.su@outlook.com>, Finn Behrens <me@kloenk.de>,
Fox Chen <foxhlchen@gmail.com>, Gary Guo <gary@garyguo.net>,
Geoffrey Thomas <geofft@ldpreload.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Miguel Ojeda <ojeda@kernel.org>,
Sumera Priyadarsini <sylphrenadin@gmail.com>,
Sven Van Asbroeck <thesven73@gmail.com>,
Wedson Almeida Filho <wedsonaf@google.com>,
Yuki Okushi <jtitor@2k36.org>
Subject: Re: linux-next: manual merge of the rust tree with the kbuild tree
Date: Thu, 28 Oct 2021 20:09:25 +1100 [thread overview]
Message-ID: <20211028200925.64f16df2@canb.auug.org.au> (raw)
In-Reply-To: <20211015182404.0355bef6@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2079 bytes --]
Hi all,
On Fri, 15 Oct 2021 18:24:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
> Makefile
>
> between commit:
>
> 09708df61f2b ("kbuild: split DEBUG_CFLAGS out to scripts/Makefile.debug")
>
> from the kbuild tree and commit:
>
> dc08d49444e9 ("Kbuild: add Rust support")
>
> from the rust tree.
>
> I fixed it up (I used the Makefile conflicting part from the former and
> applied the patch below) and can carry the fix as necessary. This is
> now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your
> tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
The fixup patch now looks like this:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 15 Oct 2021 18:16:09 +1100
Subject: [PATCH] Kbuild: fix for "kbuild: split DEBUG_CFLAGS out to
scripts/Makefile.debug"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
scripts/Makefile.debug | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/scripts/Makefile.debug b/scripts/Makefile.debug
index 9f39b0130551..c664af3ccc6b 100644
--- a/scripts/Makefile.debug
+++ b/scripts/Makefile.debug
@@ -1,4 +1,5 @@
DEBUG_CFLAGS :=
+DEBUG_RUSTFLAGS :=
ifdef CONFIG_DEBUG_INFO_SPLIT
DEBUG_CFLAGS += -gsplit-dwarf
@@ -10,6 +11,12 @@ ifndef CONFIG_AS_IS_LLVM
KBUILD_AFLAGS += -Wa,-gdwarf-2
endif
+ifdef CONFIG_DEBUG_INFO_REDUCED
+DEBUG_RUSTFLAGS += -Cdebuginfo=1
+else
+DEBUG_RUSTFLAGS += -Cdebuginfo=2
+endif
+
ifndef CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT
dwarf-version-$(CONFIG_DEBUG_INFO_DWARF4) := 4
dwarf-version-$(CONFIG_DEBUG_INFO_DWARF5) := 5
@@ -31,3 +38,6 @@ endif
KBUILD_CFLAGS += $(DEBUG_CFLAGS)
export DEBUG_CFLAGS
+
+KBUILD_RUSTFLAGS += $(DEBUG_RUSTFLAGS)
+export DEBUG_RUSTFLAGS
--
2.33.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-10-28 9:09 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-15 7:24 linux-next: manual merge of the rust tree with the kbuild tree Stephen Rothwell
2021-10-15 12:24 ` Miguel Ojeda
2021-10-28 9:09 ` Stephen Rothwell [this message]
2021-10-28 11:06 ` Miguel Ojeda
-- strict thread matches above, loose matches on Subject: below --
2025-03-17 9:38 Stephen Rothwell
2025-03-17 19:36 ` Miguel Ojeda
2025-03-31 23:58 ` Stephen Rothwell
2024-05-06 5:33 Stephen Rothwell
2024-05-06 10:19 ` Miguel Ojeda
2024-05-14 0:20 ` Stephen Rothwell
2022-09-27 18:16 broonie
2022-09-28 17:16 ` Miguel Ojeda
2022-10-04 22:23 ` Stephen Rothwell
2022-09-26 23:12 broonie
2022-09-27 12:47 ` Miguel Ojeda
2022-09-12 7:41 Stephen Rothwell
2022-08-02 23:38 broonie
2022-08-03 9:28 ` Miguel Ojeda
2022-08-14 23:08 ` Stephen Rothwell
2022-04-05 3:14 Stephen Rothwell
2022-04-05 8:33 ` Miguel Ojeda
2022-03-17 6:02 Stephen Rothwell
2022-03-17 7:11 ` Miguel Ojeda
2022-01-17 23:51 Stephen Rothwell
2021-12-07 5:13 Stephen Rothwell
2021-12-03 5:20 Stephen Rothwell
2021-12-03 9:05 ` Miguel Ojeda
2021-10-06 5:46 Stephen Rothwell
2021-08-11 7:26 Stephen Rothwell
2021-08-11 17:04 ` Nick Desaulniers
2021-08-12 6:34 ` Stephen Rothwell
2021-03-29 7:32 Stephen Rothwell
2021-03-18 4:37 Stephen Rothwell
2021-03-18 5:04 ` Miguel Ojeda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211028200925.64f16df2@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alex.gaynor@gmail.com \
--cc=ark.email@gmail.com \
--cc=bobo1239@web.de \
--cc=boqun.feng@gmail.com \
--cc=d0u9.su@outlook.com \
--cc=foxhlchen@gmail.com \
--cc=gary@garyguo.net \
--cc=geofft@ldpreload.com \
--cc=jtitor@2k36.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=me@kloenk.de \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=mpe@ellerman.id.au \
--cc=ojeda@kernel.org \
--cc=sylphrenadin@gmail.com \
--cc=thesven73@gmail.com \
--cc=wedsonaf@google.com \
--cc=zaidi.ayaan@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox