diff options
| author | Will Deacon <will@kernel.org> | 2019-08-20 10:11:54 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2019-08-20 10:11:54 +0100 |
| commit | 2d122942484c20bde308bdf694459800b63211d1 (patch) | |
| tree | ca9b0e703ee6c15586c792f9108ea8a4a68951d8 /init | |
| parent | 117acf5c29dd89e4c86761c365b9724dba0d9763 (diff) | |
| download | linux-stable-2d122942484c20bde308bdf694459800b63211d1.tar.gz linux-stable-2d122942484c20bde308bdf694459800b63211d1.tar.bz2 linux-stable-2d122942484c20bde308bdf694459800b63211d1.zip | |
Revert "init/Kconfig: Fix infinite Kconfig recursion on PPC"
This reverts commit 71c67a31f09fa8fdd1495dffd96a5f0d4cef2ede.
Commit 117acf5c29dd ("powerpc/Makefile: Always pass --synthetic to nm if
supported") removed the only conditional definition of $(NM), so we can
revert our temporary bodge to avoid Kconfig recursion and go back to
passing $(NM) through to the 'tools-support-relr.sh' when detecting
support for RELR relocations.
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 8b4596edda4e..d96127ebc44e 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -31,7 +31,7 @@ config CC_HAS_ASM_GOTO def_bool $(success,$(srctree)/scripts/gcc-goto.sh $(CC)) config TOOLS_SUPPORT_RELR - def_bool $(success,env "CC=$(CC)" "LD=$(LD)" "OBJCOPY=$(OBJCOPY)" $(srctree)/scripts/tools-support-relr.sh) + def_bool $(success,env "CC=$(CC)" "LD=$(LD)" "NM=$(NM)" "OBJCOPY=$(OBJCOPY)" $(srctree)/scripts/tools-support-relr.sh) config CC_HAS_WARN_MAYBE_UNINITIALIZED def_bool $(cc-option,-Wmaybe-uninitialized) |