From 084a9b8fa3c67436a2691b1a33d157ddbda80baf Mon Sep 17 00:00:00 2001 From: Alistair Strachan Date: Wed, 24 Oct 2018 13:55:31 -0700 Subject: [PATCH] Revert "x86: Allow generating user-space headers without a compiler" This reverts commit 829fe4aa9ac16417a904ad1de1307de906854bcf. This change builds on top of another change which we are reverting. Revert it too, to avoid a conflict. Bug: 120440614 Change-Id: I23fd0ebda98eb2646efdcfdfa06bb6ab627ba471 Signed-off-by: Alistair Strachan --- arch/x86/Makefile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 8f6e7eb8ae9f..8fc8f94ef5f5 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -175,6 +175,10 @@ ifdef CONFIG_FUNCTION_GRAPH_TRACER endif endif +ifndef CC_HAVE_ASM_GOTO + $(error Compiler lacks asm-goto support.) +endif + ifeq ($(ACCUMULATE_OUTGOING_ARGS), 1) # This compiler flag is not supported by Clang: KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args,) @@ -296,13 +300,6 @@ PHONY += vdso_install vdso_install: $(Q)$(MAKE) $(build)=arch/x86/entry/vdso $@ -archprepare: checkbin -checkbin: -ifndef CC_HAVE_ASM_GOTO - @echo Compiler lacks asm-goto support. - @exit 1 -endif - archclean: $(Q)rm -rf $(objtree)/arch/i386 $(Q)rm -rf $(objtree)/arch/x86_64