diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 38b360d2d2f2..01d8036a1d1f 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -66,7 +66,7 @@
  * RODATA_MAIN is not used because existing code already defines .rodata.x
  * sections to be brought in with rodata.
  */
-#if defined(CONFIG_LD_DEAD_CODE_DATA_ELIMINATION) || defined(CONFIG_LTO_CLANG)
+#if defined(CONFIG_LD_DEAD_CODE_DATA_ELIMINATION) || defined(CONFIG_LTO)
 #define TEXT_MAIN .text .text.[0-9a-zA-Z_]*
 #define TEXT_CFI_MAIN .text.[0-9a-zA-Z_]*.cfi
 #define DATA_MAIN .data .data.[0-9a-zA-Z_]* .data..L* .data..compoundliteral*
diff --git a/include/linux/init.h b/include/linux/init.h
index e37e07d78269..5efab7d61384 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -191,7 +191,7 @@ extern bool initcall_debug;
 	    ".long	" #fn " - .			\n"	\
 	    ".previous					\n");
 #else
-#ifdef CONFIG_LTO_CLANG
+#ifdef CONFIG_LTO
   /*
    * With LTO, the compiler doesn't necessarily obey link order for
    * initcalls, and the initcall variable needs to be globally unique
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 8adb2da55ad9..d8a4098b4fa8 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -69,12 +69,12 @@ archive_builtin()
 	fi
 }
 
-# If CONFIG_LTO_CLANG is selected, generate a linker script to ensure correct
+# If CONFIG_LTO is selected, generate a linker script to ensure correct
 # ordering of initcalls, and with CONFIG_MODVERSIONS also enabled, collect the
 # previously generated symbol versions into the same script.
 lto_lds()
 {
-	if [ -z "${CONFIG_LTO_CLANG}" ]; then
+	if [ -z "${CONFIG_LTO}" ]; then
 		return
 	fi
 
@@ -107,7 +107,7 @@ modpost_link()
 		${KBUILD_VMLINUX_LIBS}				\
 		--end-group"
 
-	if [ -n "${CONFIG_LTO_CLANG}" ]; then
+	if [ -n "${CONFIG_LTO}" ]; then
 		# This might take a while, so indicate that we're doing
 		# an LTO link
 		info LTO vmlinux.o