build: fix assembler instruction tests again
authorJan Beulich <jbeulich@suse.com>
Tue, 31 May 2016 16:14:22 +0000 (18:14 +0200)
committerJan Beulich <jbeulich@suse.com>
Tue, 31 May 2016 16:14:22 +0000 (18:14 +0200)
Commit 7fb252bd41 ("build/xen: fix assembler instruction tests") added
$(AFLAGS) here, which results in all of those tests now failing.
Certain items need to be removed for things to work again.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
Config.mk

index 5ddfbf8fbb96ce9003ca191f9d2e8cfb7c36c9bd..bc5c456f6887fab706094b85c37f022b956614c3 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -150,7 +150,8 @@ endif
 # as-insn: Check whether assembler supports an instruction.
 # Usage: cflags-y += $(call as-insn "insn",option-yes,option-no)
 as-insn = $(if $(shell echo 'void _(void) { asm volatile ( $(2) ); }' \
-                       | $(1) $(AFLAGS) -c -x c -o /dev/null - 2>&1),$(4),$(3))
+                       | $(1) $(filter-out -M% %.d -include %/include/xen/config.h,$(AFLAGS)) \
+                              -c -x c -o /dev/null - 2>&1),$(4),$(3))
 
 # as-insn-check: Add an option to compilation flags, but only if insn is
 #                supported by assembler.