From f921eba36bcdae7ff255964ea667c95635a47fd3 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Thu, 14 Dec 2023 12:09:50 +0000 Subject: [PATCH] UBUNTU: SAUCE: scripts: remove generating .o-ur objects BugLink: https://bugs.launchpad.net/bugs/2046440 Remove patch to upstream build system to generate Ubuntu retpoline data files, as used to be used for a defunct retpoline build time check. Signed-off-by: Dimitri John Ledkov Signed-off-by: Andrea Righi --- scripts/Makefile.build | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 0488828c6e54..dae447a1ad30 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -221,19 +221,12 @@ ifneq ($(findstring 1, $(KBUILD_EXTRA_WARN)),) cmd_warn_shared_object = $(if $(word 2, $(modname-multi)),$(warning $(kbuild-file): $*.o is added to multiple modules: $(modname-multi))) endif -ifdef CONFIG_RETPOLINE -cmd_ubuntu_retpoline = $(CONFIG_SHELL) $(srctree)/scripts/ubuntu-retpoline-extract-one $(@) $(<) "$(filter -m16 %code16gcc.h,$(a_flags))"; -else -cmd_ubuntu_retpoline = -endif - define rule_cc_o_c $(call cmd_and_fixdep,cc_o_c) $(call cmd,checksrc) $(call cmd,checkdoc) $(call cmd,gen_objtooldep) $(call cmd,gen_symversions_c) - $(call cmd,ubuntu-retpoline) $(call cmd,record_mcount) $(call cmd,warn_shared_object) endef @@ -242,7 +235,6 @@ define rule_as_o_S $(call cmd_and_fixdep,as_o_S) $(call cmd,gen_objtooldep) $(call cmd,gen_symversions_S) - $(call cmd,ubuntu-retpoline) $(call cmd,warn_shared_object) endef