path: root/Makefile
diff options
authorIngo Molnar <>2018-12-19 11:27:05 +0100
committerIngo Molnar <>2018-12-19 12:00:28 +0100
commit6ac389346e6964e1f6a1c675cebf8bd0912526a5 (patch)
tree590ad64bb49225f65beb6827b600255b2b41b277 /Makefile
parent96af6cd02a10b96108fc415a213441e7fb9f4f9b (diff)
Revert "kbuild/Makefile: Prepare for using macros in inline assembly code to work around asm() related GCC inlining bugs"
This reverts commit 77b0bf55bc675233d22cd5df97605d516d64525e. See this commit for details about the revert: e769742d3584 ("Revert "x86/jump-labels: Macrofy inline assembly code to work around GCC inlining bugs"") Conflicts: arch/x86/Makefile Reported-by: Masahiro Yamada <> Reviewed-by: Borislav Petkov <> Reviewed-by: Thomas Gleixner <> Cc: Juergen Gross <> Cc: Richard Biener <> Cc: Kees Cook <> Cc: Segher Boessenkool <> Cc: Ard Biesheuvel <> Cc: Peter Zijlstra <> Cc: Josh Poimboeuf <> Cc: Nadav Amit <> Cc: Linus Torvalds <> Cc: Signed-off-by: Ingo Molnar <>
Diffstat (limited to 'Makefile')
1 files changed, 2 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index e9fd22c8445e..da4bb1e10388 100644
--- a/Makefile
+++ b/Makefile
@@ -1081,7 +1081,7 @@ scripts: scripts_basic scripts_dtc asm-generic gcc-plugins $(autoksyms_h)
# version.h and scripts_basic is processed / created.
# Listed in dependency order
-PHONY += prepare archprepare macroprepare prepare0 prepare1 prepare2 prepare3
+PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3
# prepare3 is used to check if we are building in a separate output directory,
# and if so do:
@@ -1104,9 +1104,7 @@ prepare2: prepare3 outputmakefile asm-generic
prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h
-macroprepare: prepare1 archmacros
-archprepare: archheaders archscripts macroprepare scripts_basic
+archprepare: archheaders archscripts prepare1 scripts_basic
prepare0: archprepare gcc-plugins
$(Q)$(MAKE) $(build)=.
@@ -1174,9 +1172,6 @@ archheaders:
PHONY += archscripts
-PHONY += archmacros
PHONY += __headers
__headers: $(version_h) scripts_basic uapi-asm-generic archheaders archscripts
$(Q)$(MAKE) $(build)=scripts build_unifdef