diff mbox

[for-4.7,2/2] build: use CFLAGS instead of AFLAGS for as-insn checks

Message ID 1464625676-17775-3-git-send-email-roger.pau@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Roger Pau Monné May 30, 2016, 4:27 p.m. UTC
The test code is a C file with inline assembly, not plain assembly.

This fixes the fallout introduced by commit 7fb252bd41 ("build/xen: fix
assembler instruction tests")

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: George Dunlap <George.Dunlap@eu.citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Tim Deegan <tim@xen.org>
Cc: Wei Liu <wei.liu2@citrix.com>
---
 Config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jan Beulich May 31, 2016, 8:25 a.m. UTC | #1
>>> On 30.05.16 at 18:27, <roger.pau@citrix.com> wrote:
> The test code is a C file with inline assembly, not plain assembly.
> 
> This fixes the fallout introduced by commit 7fb252bd41 ("build/xen: fix
> assembler instruction tests")

I don't follow (did you check this time that previous behavior gets
restored; you clearly can't have checked that old behavior was
retained for gcc builds with that earlier change of yours):

> --- a/Config.mk
> +++ b/Config.mk
> @@ -150,7 +150,7 @@ 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) $(CFLAGS) -c -x c -o /dev/null - 2>&1),$(4),$(3))

Afaict this leaves in place the problematic -M options. Changing from
AFLAGS to CFLAGS is probably fine here (if only patch 1, which is a
prereq to the change here, was okay), but leaving out the other
change my patch did I can't see how you fix aforementioned fallout.
Please explain.

Jan
diff mbox

Patch

diff --git a/Config.mk b/Config.mk
index 5ddfbf8..13475e0 100644
--- a/Config.mk
+++ b/Config.mk
@@ -150,7 +150,7 @@  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) $(CFLAGS) -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.