linux-kernel - Re: linux-next: Tree for Oct 18 ('make' error on ARCH=um)

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20211019085811.362b4304@canb.auug.org.au>
Date:   Tue, 19 Oct 2021 08:58:11 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Randy Dunlap <rdunlap@...radead.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Kbuild mailing list <linux-kbuild@...r.kernel.org>,
        "linux-um@...ts.infradead.org" <linux-um@...ts.infradead.org>,
        Miguel Ojeda <miguel.ojeda.sandonis@...il.com>,
        Alex Gaynor <alex.gaynor@...il.com>,
        Geoffrey Thomas <geofft@...reload.com>,
        Finn Behrens <me@...enk.de>,
        Adam Bratschi-Kaye <ark.email@...il.com>,
        Wedson Almeida Filho <wedsonaf@...gle.com>,
        Boqun Feng <boqun.feng@...il.com>,
        Sumera Priyadarsini <sylphrenadin@...il.com>,
        Michael Ellerman <mpe@...erman.id.au>,
        Sven Van Asbroeck <thesven73@...il.com>,
        Gary Guo <gary@...yguo.net>,
        Boris-Chengbiao Zhou <bobo1239@....de>,
        Fox Chen <foxhlchen@...il.com>,
        Ayaan Zaidi <zaidi.ayaan@...il.com>,
        Douglas Su <d0u9.su@...look.com>, Yuki Okushi <jtitor@...6.org>
Subject: Re: linux-next: Tree for Oct 18 ('make' error on ARCH=um)

Hi all,

On Mon, 18 Oct 2021 14:14:59 -0700 Randy Dunlap <rdunlap@...radead.org> wrote:
>
> On 10/18/21 2:30 AM, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Changes since 20211015:
> >   
> 
> UML (arch=um) with SUBARCH of i386 or x86_64,
> using gcc, not clang:
> 
> make[1]: Entering directory '/work/lnx/next/linux-next-20211018/UM64'
> ../scripts/Makefile.clang:19: *** Specify CROSS_COMPILE or add '--target=' option to scripts/Makefile.clang.  Stop.
> make[1]: Leaving directory '/work/lnx/next/linux-next-20211018/UM64'
> make: *** [Makefile:226: __sub-make] Error 2
> 
> 
> Just use a make target of defconfig:
> 
> make ARCH=um SUBARCH=x86_64 O=UM64 defconfig

OK, I missed that.

In commit

  c862c7fee526 ("Kbuild: add Rust support")

from the rust tree, these bits should probably not be there:

Makefile:
@@ -586,13 +628,11 @@ endif
 # Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.
 # CC_VERSION_TEXT is referenced from Kconfig (so it needs export),
 # and from include/config/auto.conf.cmd to detect the compiler upgrade.
 CC_VERSION_TEXT = $(subst $(pound),,$(shell LC_ALL=C $(CC) --version 2>/dev/null | head -n 1))
 
-ifneq ($(findstring clang,$(CC_VERSION_TEXT)),)
 include $(srctree)/scripts/Makefile.clang
-endif
 
 # Include this also for config targets because some architectures need
 # cc-cross-prefix to determine CROSS_COMPILE.
 ifdef need-compiler
 include $(srctree)/scripts/Makefile.compiler

in scripts/Makefile.clang the

ifneq ($(findstring clang,$(CC_VERSION_TEXT)),)
endif

pair near the end become unnecessary.

So I will apply the following to the merge of the rust tree today:

diff --git a/Makefile b/Makefile
index b4482fd3a0cc..3d7c777d831f 100644
--- a/Makefile
+++ b/Makefile
@@ -630,7 +630,9 @@ endif
 # and from include/config/auto.conf.cmd to detect the compiler upgrade.
 CC_VERSION_TEXT = $(subst $(pound),,$(shell LC_ALL=C $(CC) --version 2>/dev/null | head -n 1))
 
+ifneq ($(findstring clang,$(CC_VERSION_TEXT)),)
 include $(srctree)/scripts/Makefile.clang
+endif
 
 # Include this also for config targets because some architectures need
 # cc-cross-prefix to determine CROSS_COMPILE.
diff --git a/scripts/Makefile.clang b/scripts/Makefile.clang
index 38f555d0cb0d..b8e331f98471 100644
--- a/scripts/Makefile.clang
+++ b/scripts/Makefile.clang
@@ -40,9 +40,7 @@ TENTATIVE_CLANG_FLAGS	+= -Werror=ignored-optimization-argument
 
 export TENTATIVE_CLANG_FLAGS
 
-ifneq ($(findstring clang,$(CC_VERSION_TEXT)),)
 CLANG_FLAGS	+= $(TENTATIVE_CLANG_FLAGS)
 KBUILD_CFLAGS	+= $(CLANG_FLAGS)
 KBUILD_AFLAGS	+= $(CLANG_FLAGS)
 export CLANG_FLAGS
-endif


Miguel, does that seem reasonable?

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped