x86/clang: allow integrated assembler usage
PATCH v6 1/1 x86/clang: allow integrated assembler usage
If the required features are present.
Modify as-option-add to add an option in case the test fails, and use it to detect whether the required clang integrated assembler features are present.
This patch has been tested with clang 3.5, clang 6, gcc 6.4.0 without retpoline support and gcc 7.3.1 with retpoline support.
---
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Wei Liu <[email protected]>
---
Changes since v5:
- Use as-option-add.
- Add a test to check if as supports .skip with labels.
- Use as-option-add to check for .macro persistence.
Changes since v4:
- Do not use else ifeq on the same line to be compatible with make 3.8.
- Modify as-insn-check to allow adding flags if the test case fails.
Changes since v3:
- Do not modify how the thunk is included, clang upstream (and 6) has been fixed to propagate .macro-s between asm()-s.
Changes since v1:
- Use as-insn to check if the assembler supports .include.
- Open code a check for whether the assembler forgets .macro-s between asm()-s.
--- Config.mk | 9 +++++---- xen/Rules.mk | 8 ++++++-- xen/arch/x86/Rules.mk | 15 +++++++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-)
Config.mk +5 -4
@@ -163,13 +163,14 @@ as-insn = $(if $(shell echo 'void _(void) { asm volatile ( $(2) ); }' \ | $(filter-out -M% %.d -include %/include/xen/config.h,$(1)) \ -c -x c -o /dev/null - 2>&1),$(4),$(3)) -# as-option-add: Add an option to compilation flags, but only if insn is -# supported by assembler. -# Usage: $(call as-option-add,CFLAGS,CC,"insn",option-yes) -as-option-add = $(eval $(call as-option-add-closure,$(1),$(2),$(3),$(4))) +# as-option-add: Conditionally add options to flags +# Usage: $(call as-option-add,CFLAGS,CC,"insn",option-yes,option-no) +as-option-add = $(eval $(call as-option-add-closure,$(1),$(2),$(3),$(4),$(5))) define as-option-add-closure ifeq ($$(call as-insn,$$($(2)) $$($(1)),$(3),y,n),y) $(1) += $(4) + else + $(1) += $(5) endif endef
xen/Rules.mk +6 -2
@@ -70,8 +70,12 @@ endif AFLAGS-y += -D__ASSEMBLY__ -# Clang's built-in assembler can't handle embedded .include's -CFLAGS-$(clang) += -no-integrated-as +# Older clang's built-in assembler doesn't understand .skip with labels: +# https://bugs.llvm.org/show_bug.cgi?id=27369 +ifeq ($(clang),y) +$(call as-option-add,CFLAGS,CC,".L0:\n.L1:\n.skip (.L1 - .L0)",,\ + -no-integrated-as) +endif ALL_OBJS := $(ALL_OBJS-y)
xen/arch/x86/Rules.mk +15 -0
@@ -44,3 +44,18 @@ endif # Set up the assembler include path properly for older toolchains. CFLAGS += -Wa,-I$(BASEDIR)/include + +ifeq ($(clang),y) +# Note: Any test which adds -no-integrated-as will cause subsequent tests to +# succeed, and not trigger further additions. + +# Check whether clang asm()-s support .include. +$(call as-option-add,CFLAGS,CC,".include \"asm/indirect_thunk_asm.h\"",,\ + -no-integrated-as) + +# Check whether clang keeps .macro-s between asm()-s: +# https://bugs.llvm.org/show_bug.cgi?id=36110 +$(call as-option-add,CFLAGS,CC,\ + ".macro FOO\n.endm\"); asm volatile (\".macro FOO\n.endm",\ + -no-integrated-as) +endif
Signature · 7 lines
2.16.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 11 lines · Roger Pau Monne
If the required features are present.
Modify as-option-add to add an option in case the test fails, and use it to detect whether the required clang integrated assembler features are present.
This patch has been tested with clang 3.5, clang 6, gcc 6.4.0 without retpoline support and gcc 7.3.1 with retpoline support.
Signed-off-by Andrew Cooper <[email protected]>Signed-off-by Roger Pau Monné <[email protected]>
FWIW, I've just tested this in combination with my alternatives series and everything is working as expected. Strictly speaking, it does need an ack from someone else as it is now SoB myself and Roger.
~Andrew
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 7 lines
Quoted 1 line
Quoted 1 line · On 23.02.18 at 15:11, <[email protected]> wrote:
If the required features are present.
Modify as-option-add to add an option in case the test fails, and use it to detect whether the required clang integrated assembler features are present.
Quoted 5 lines
This patch has been tested with clang 3.5, clang 6, gcc 6.4.0 without retpoline support and gcc 7.3.1 with retpoline support.
Signed-off-by Andrew Cooper <[email protected]>Signed-off-by Roger Pau Monné <[email protected]>
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 11 lines · Roger Pau Monne
If the required features are present.
Modify as-option-add to add an option in case the test fails, and use it to detect whether the required clang integrated assembler features are present.
This patch has been tested with clang 3.5, clang 6, gcc 6.4.0 without retpoline support and gcc 7.3.1 with retpoline support.
Signed-off-by Andrew Cooper <[email protected]>Signed-off-by Roger Pau Monné <[email protected]>
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel