From: Ryan Sullivan <rysulliv@xxxxxxxxxx> redhat: make ENABLE_WERROR also enable OBJTOOL_WERROR JIRA: https://issues.redhat.com/browse/RHEL-85301 Upstream status: RHEL only Make sure OBJTOOL_WERROR is not enabled by default for OOT / third-party module builds by default by tying it being enabled to ENABLE_WERROR Makefile variable Signed-off-by: Ryan Sullivan <rysulliv@xxxxxxxxxx> diff --git a/redhat/configs/build_configs.sh b/redhat/configs/build_configs.sh index blahblah..blahblah 100755 --- a/redhat/configs/build_configs.sh +++ b/redhat/configs/build_configs.sh @@ -116,6 +116,7 @@ function merge_configs() if [ -n "$ENABLE_WERROR" ]; then sed -i "s|# CONFIG_WERROR is not set|CONFIG_WERROR=y|g" "$name" sed -i "s|# CONFIG_KVM_WERROR is not set|CONFIG_KVM_WERROR=y|g" "$name" + sed -i "s|# CONFIG_OBJTOOL_WERROR is not set|CONFIG_OBJTOOL_WERROR=y|g" "$name" fi rm -f config-merged."$count" config-merging."$count" diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index blahblah..blahblah 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -272,7 +272,10 @@ objtool-args-$(CONFIG_HAVE_STATIC_CALL_INLINE) += --static-call objtool-args-$(CONFIG_HAVE_UACCESS_VALIDATION) += --uaccess objtool-args-$(or $(CONFIG_GCOV_KERNEL),$(CONFIG_KCOV)) += --no-unreachable objtool-args-$(CONFIG_PREFIX_SYMBOLS) += --prefix=$(CONFIG_FUNCTION_PADDING_BYTES) +# RHEL-only: don't enforce OBJTOOL_WERROR for out of tree modules +ifeq ($(KBUILD_EXTMOD),) objtool-args-$(CONFIG_OBJTOOL_WERROR) += --Werror +endif objtool-args = $(objtool-args-y) \ $(if $(delay-objtool), --link) \ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3853 -- _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
