From c86aa9a250ca0c87760b369f295f67ae01542fa9 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Wed, 10 Feb 2016 14:50:15 +0100 Subject: [PATCH] x86: remove %z modifier from inline assembly Clang doesn't support the %z modifier. Replace both uses with an explicit l suffix, and cover the changes with BUILD_BUG_ON()s Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/xstate.c | 3 ++- xen/include/asm-x86/spinlock.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index c5d17ffc6e..4f2fb8ee69 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -353,11 +353,12 @@ void xrstor(struct vcpu *v, uint64_t mask) { switch ( __builtin_expect(ptr->fpu_sse.x[FPU_WORD_SIZE_OFFSET], 8) ) { + BUILD_BUG_ON(sizeof(faults) != 4); /* Clang doesn't support %z in asm. */ #define XRSTOR(pfx) \ alternative_io("1: .byte " pfx "0x0f,0xae,0x2f\n" \ "3:\n" \ " .section .fixup,\"ax\"\n" \ - "2: inc%z[faults] %[faults]\n" \ + "2: incl %[faults]\n" \ " jmp 3b\n" \ " .previous\n" \ _ASM_EXTABLE(1b, 2b), \ diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h index 70a85af228..be72c0ff80 100644 --- a/xen/include/asm-x86/spinlock.h +++ b/xen/include/asm-x86/spinlock.h @@ -2,7 +2,8 @@ #define __ASM_SPINLOCK_H #define _raw_read_unlock(l) \ - asm volatile ( "lock; dec%z0 %0" : "+m" ((l)->lock) :: "memory" ) + BUILD_BUG_ON(sizeof((l)->lock) != 4); /* Clang doesn't support %z in asm. */ \ + asm volatile ( "lock; decl %0" : "+m" ((l)->lock) :: "memory" ) /* * On x86 the only reordering is of reads with older writes. In the -- 2.39.5