From 008711407162802a822145a3ea440da56543124f Mon Sep 17 00:00:00 2001 From: Jenna Date: Wed, 21 Aug 2024 20:05:33 +0200 Subject: [PATCH] Reapply "sm7125: Fix kernel compile" This reverts commit 4c1e44a9ebaf8ba2532ebfc72ef0620f3db585b7. --- Makefile | 4 ++-- arch/arm64/configs/vendor/lineage-a52q_defconfig | 2 +- arch/arm64/configs/vendor/pixel_experience-a72q_defconfig | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9ad2d0b23383..3bb509fa6fc6 100755 --- a/Makefile +++ b/Makefile @@ -789,13 +789,13 @@ KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare) # See modpost pattern 2 KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,) KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior) -else +endif KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,) # These warnings generated too much noise in a regular build. # Use make W=1 to enable them (see scripts/Makefile.extrawarn) KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable) -endif + ifeq ($(ld-name),lld) LDFLAGS += -O2 diff --git a/arch/arm64/configs/vendor/lineage-a52q_defconfig b/arch/arm64/configs/vendor/lineage-a52q_defconfig index 09aa16f9271d..b700f2e271bb 100644 --- a/arch/arm64/configs/vendor/lineage-a52q_defconfig +++ b/arch/arm64/configs/vendor/lineage-a52q_defconfig @@ -6158,7 +6158,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # # Compile-time checks and compiler options # -CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set # CONFIG_DEBUG_INFO_DWARF4 is not set diff --git a/arch/arm64/configs/vendor/pixel_experience-a72q_defconfig b/arch/arm64/configs/vendor/pixel_experience-a72q_defconfig index cc671c98ca73..9321207ed2c3 100644 --- a/arch/arm64/configs/vendor/pixel_experience-a72q_defconfig +++ b/arch/arm64/configs/vendor/pixel_experience-a72q_defconfig @@ -6122,7 +6122,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # # Compile-time checks and compiler options # -CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set # CONFIG_DEBUG_INFO_DWARF4 is not set