projects / pve-kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| 55628330 FG |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com> | |
| 3 | Date: Mon, 9 Apr 2018 09:33:25 +0200 | |
| 4 | Subject: [PATCH] Revert Ubuntu RETPOLINE checks in kernel Makefile | |
| 5 | MIME-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ||
| 9 | these break builds outside of Ubuntu's packaging. | |
| 10 | ||
| 11 | Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> | |
| 12 | --- | |
| 13 | scripts/Makefile.build | 8 -------- | |
| 14 | 1 file changed, 8 deletions(-) | |
| 15 | ||
| 16 | diff --git a/scripts/Makefile.build b/scripts/Makefile.build | |
| 17 | index d74c3f9f1fa8..436005392047 100644 | |
| 18 | --- a/scripts/Makefile.build | |
| 19 | +++ b/scripts/Makefile.build | |
| 20 | @@ -282,18 +282,11 @@ objtool_dep = $(objtool_obj) \ | |
| 21 | $(wildcard include/config/orc/unwinder.h \ | |
| 22 | include/config/stack/validation.h) | |
| 23 | ||
| 24 | -ifdef CONFIG_RETPOLINE | |
| 25 | -cmd_ubuntu_retpoline = $(CONFIG_SHELL) $(srctree)/scripts/ubuntu-retpoline-extract-one $(@) $(<) "$(filter -m16 %code16gcc.h,$(a_flags))"; | |
| 26 | -else | |
| 27 | -cmd_ubuntu_retpoline = | |
| 28 | -endif | |
| 29 | - | |
| 30 | define rule_cc_o_c | |
| 31 | $(call echo-cmd,checksrc) $(cmd_checksrc) \ | |
| 32 | $(call cmd_and_fixdep,cc_o_c) \ | |
| 33 | $(cmd_modversions_c) \ | |
| 34 | $(call echo-cmd,objtool) $(cmd_objtool) \ | |
| 35 | - $(call echo-cmd,ubuntu-retpoline) $(cmd_ubuntu_retpoline) \ | |
| 36 | $(call echo-cmd,record_mcount) $(cmd_record_mcount) | |
| 37 | endef | |
| 38 | ||
| 39 | @@ -301,7 +294,6 @@ define rule_as_o_S | |
| 40 | $(call cmd_and_fixdep,as_o_S) \ | |
| 41 | $(cmd_modversions_S) \ | |
| 42 | $(call echo-cmd,objtool) $(cmd_objtool) | |
| 43 | - $(call echo-cmd,ubuntu-retpoline) $(cmd_ubuntu_retpoline) | |
| 44 | endef | |
| 45 | ||
| 46 | # List module undefined symbols (or empty line if not enabled) | |
| 47 | -- | |
| 48 | 2.14.2 | |
| 49 |