Merge tag 'notifications-20200601' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-starfive.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index c95a2a5..b561ecf 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -8,8 +8,25 @@ config DEFCONFIG_LIST
        default "/boot/config-$(shell,uname -r)"
        default "arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)"
 
+config CC_VERSION_TEXT
+       string
+       default "$(CC_VERSION_TEXT)"
+       help
+         This is used in unclear ways:
+
+         - Re-run Kconfig when the compiler is updated
+           The 'default' property references the environment variable,
+           CC_VERSION_TEXT so it is recorded in include/config/auto.conf.cmd.
+           When the compiler is updated, Kconfig will be invoked.
+
+         - Ensure full rebuild when the compier is updated
+           include/linux/kconfig.h contains this option in the comment line so
+           fixdep adds include/config/cc/version/text.h into the auto-generated
+           dependency. When the compiler is updated, syncconfig will touch it
+           and then every file will be rebuilt.
+
 config CC_IS_GCC
-       def_bool $(success,$(CC) --version | head -n 1 | grep -q gcc)
+       def_bool $(success,echo "$(CC_VERSION_TEXT)" | grep -q gcc)
 
 config GCC_VERSION
        int
@@ -21,18 +38,32 @@ config LD_VERSION
        default $(shell,$(LD) --version | $(srctree)/scripts/ld-version.sh)
 
 config CC_IS_CLANG
-       def_bool $(success,$(CC) --version | head -n 1 | grep -q clang)
+       def_bool $(success,echo "$(CC_VERSION_TEXT)" | grep -q clang)
+
+config LD_IS_LLD
+       def_bool $(success,$(LD) -v | head -n 1 | grep -q LLD)
 
 config CLANG_VERSION
        int
        default $(shell,$(srctree)/scripts/clang-version.sh $(CC))
 
 config CC_CAN_LINK
-       def_bool $(success,$(srctree)/scripts/cc-can-link.sh $(CC))
+       bool
+       default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(m64-flag)) if 64BIT
+       default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(m32-flag))
+
+config CC_CAN_LINK_STATIC
+       bool
+       default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) -static $(m64-flag)) if 64BIT
+       default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) -static $(m32-flag))
 
 config CC_HAS_ASM_GOTO
        def_bool $(success,$(srctree)/scripts/gcc-goto.sh $(CC))
 
+config CC_HAS_ASM_GOTO_OUTPUT
+       depends on CC_HAS_ASM_GOTO
+       def_bool $(success,echo 'int foo(int x) { asm goto ("": "=r"(x) ::: bar); return x; bar: return 0; }' | $(CC) -x c - -c -o /dev/null)
+
 config TOOLS_SUPPORT_RELR
        def_bool $(success,env "CC=$(CC)" "LD=$(LD)" "NM=$(NM)" "OBJCOPY=$(OBJCOPY)" $(srctree)/scripts/tools-support-relr.sh)
 
@@ -257,6 +288,16 @@ config KERNEL_UNCOMPRESSED
 
 endchoice
 
+config DEFAULT_INIT
+       string "Default init path"
+       default ""
+       help
+         This option determines the default init for the system if no init=
+         option is passed on the kernel command line. If the requested path is
+         not present, we will still then move on to attempting further
+         locations (e.g. /sbin/init, etc). If this is empty, we will just use
+         the fallback list when init= is not passed.
+
 config DEFAULT_HOSTNAME
        string "Default hostname"
        default "(none)"
@@ -831,24 +872,9 @@ config MEMCG
          Provides control over the memory footprint of tasks in a cgroup.
 
 config MEMCG_SWAP
-       bool "Swap controller"
+       bool
        depends on MEMCG && SWAP
-       help
-         Provides control over the swap space consumed by tasks in a cgroup.
-
-config MEMCG_SWAP_ENABLED
-       bool "Swap controller enabled by default"
-       depends on MEMCG_SWAP
        default y
-       help
-         Memory Resource Controller Swap Extension comes with its price in
-         a bigger memory consumption. General purpose distribution kernels
-         which want to enable the feature but keep it disabled by default
-         and let the user enable it by swapaccount=1 boot command line
-         parameter should have this option unselected.
-         For those who want to have the feature enabled by default should
-         select this option (if, for some reason, they need to disable it
-         then swapaccount=0 does the trick).
 
 config MEMCG_KMEM
        bool
@@ -1279,7 +1305,6 @@ config LD_DEAD_CODE_DATA_ELIMINATION
        bool "Dead code and data elimination (EXPERIMENTAL)"
        depends on HAVE_LD_DEAD_CODE_DATA_ELIMINATION
        depends on EXPERT
-       depends on !(FUNCTION_TRACER && CC_IS_GCC && GCC_VERSION < 40800)
        depends on $(cc-option,-ffunction-sections -fdata-sections)
        depends on $(ld-option,--gc-sections)
        help