From: Will Deacon Date: Tue, 20 Aug 2019 09:11:54 +0000 (+0100) Subject: Revert "init/Kconfig: Fix infinite Kconfig recursion on PPC" X-Git-Tag: v5.4-rc1~192^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d122942484c20bde308bdf694459800b63211d1;p=thirdparty%2Flinux.git 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 --- diff --git a/init/Kconfig b/init/Kconfig index 8b4596edda4e2..d96127ebc44e0 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)