From: Jan Beulich <jbeulich@suse.com>
Date: Tue, 31 May 2016 16:14:22 +0000 (+0200)
Subject: build: fix assembler instruction tests again
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1078
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1dda826420fff634983e94f97fb8411486acda0d;p=xen.git

build: fix assembler instruction tests again

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>
---

diff --git a/Config.mk b/Config.mk
index 5ddfbf8fbb..bc5c456f68 100644
--- 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.