diff mbox series

[UNSTABLE,4/5] UBUNTU: SAUCE: scripts: remove generating .o-ur objects

Message ID 20231214124940.3281278-5-dimitri.ledkov@canonical.com
State New
Headers show
Series Enforce RETPOLINE and SLS mitigrations | expand

Commit Message

Dimitri John Ledkov Dec. 14, 2023, 12:49 p.m. UTC 
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 <dimitri.ledkov@canonical.com>
---
 scripts/Makefile.build | 8 --------
 1 file changed, 8 deletions(-)
diff mbox series

Patch

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 381bdc8001..9a3063735e 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