hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8JVJ3 CVE: NA ------------------------------------------------------------------------- The following configs depends on GCC environment, so ignore them when update openeuler_defconfig: CONFIG_GCC_PLUGINS CONFIG_PAHOLE_HAS_LANG_EXCLUDE CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> --- scripts/kconfig/makeconfig.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/kconfig/makeconfig.sh b/scripts/kconfig/makeconfig.sh index c54f4d84ae9b..5b53f1c6cc78 100644 --- a/scripts/kconfig/makeconfig.sh +++ b/scripts/kconfig/makeconfig.sh @@ -9,6 +9,7 @@ fi sed -e '/CONFIG_CC_VERSION_TEXT/d' \ -e '/CONFIG_CC_IS_GCC/d' \ -e '/CONFIG_GCC_VERSION/d' \ + -e '/CONFIG_GCC_PLUGINS/d' \ -e '/CONFIG_LD_VERSION/d' \ -e '/CONFIG_LD_IS/d' \ -e '/CONFIG_CLANG_VERSION/d' \ @@ -19,6 +20,8 @@ sed -e '/CONFIG_CC_VERSION_TEXT/d' \ -e '/CONFIG_AS_HAS/d' \ -e '/CONFIG_AS_IS/d' \ -e '/CONFIG_PAHOLE_VERSION/d' \ + -e '/CONFIG_PAHOLE_HAS_LANG_EXCLUDE/d' \ + -e '/CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC/d' \ -i .config cp .config arch/$1/configs/openeuler_defconfig -- 2.34.1