Skip to contentSkip to conversation

x86: Allow generating user-space headers without a compiler

PATCH New Ben Hutchings 2 participants 3 messages Aug 29, 2018 – Aug 31, 2018 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: Allow generating user-space headers without a compiler

When bootstrapping an architecture, it's usual to generate the kernel's user-space headers (make headers_install) before building a compiler. Move the compiler check (for asm goto support) to the archprepare target so that it is only done when building code for the target.

Fixes e501ce957a78 ("x86: Force asm-goto")
---
 arch/x86/Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
arch/x86/Makefile +7 -4
index 94859241bc3e..7df47ff45f68 100644
@@ -175,10 +175,6 @@ ifdef CONFIG_FUNCTION_GRAPH_TRACER
   endif
 endif
 
-ifndef CC_HAVE_ASM_GOTO
-  $(error Compiler lacks asm-goto support.)
-endif
-
 #
 # Jump labels need '-maccumulate-outgoing-args' for gcc < 4.5.2 to prevent a
 # GCC bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=46226).  There's no way
@@ -312,6 +308,13 @@ 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
#1 lore raw
x86: Allow generating user-space headers without a compiler
Commit-ID:  3c76014d27e97bd641202007744fb37c18743adf
Gitweb:     https://git.kernel.org/tip/3c76014d27e97bd641202007744fb37c18743adf
Author:     Ben Hutchings <[email protected]>
AuthorDate: Wed, 29 Aug 2018 20:43:17 +0100
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Thu, 30 Aug 2018 14:28:19 +0200

x86: Allow generating user-space headers without a compiler

When bootstrapping an architecture, it's usual to generate the kernel's user-space headers (make headers_install) before building a compiler. Move the compiler check (for asm goto support) to the archprepare target so that it is only done when building code for the target.

---
 arch/x86/Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
arch/x86/Makefile +7 -4
index 8fc8f94ef5f5..8f6e7eb8ae9f 100644
@@ -175,10 +175,6 @@ 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,)
@@ -300,6 +296,13 @@ 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
#2 lore raw
In reply to Ben Hutchings
x86: Allow generating user-space headers without a compiler
Commit-ID:  829fe4aa9ac16417a904ad1de1307de906854bcf
Gitweb:     https://git.kernel.org/tip/829fe4aa9ac16417a904ad1de1307de906854bcf
Author:     Ben Hutchings <[email protected]>
AuthorDate: Wed, 29 Aug 2018 20:43:17 +0100
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Fri, 31 Aug 2018 17:08:22 +0200

x86: Allow generating user-space headers without a compiler

When bootstrapping an architecture, it's usual to generate the kernel's user-space headers (make headers_install) before building a compiler. Move the compiler check (for asm goto support) to the archprepare target so that it is only done when building code for the target.

---
 arch/x86/Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
arch/x86/Makefile +7 -4
index 8fc8f94ef5f5..8f6e7eb8ae9f 100644
@@ -175,10 +175,6 @@ 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,)
@@ -300,6 +296,13 @@ 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