From f243d9b04b4bf17d7ccdae179fa43b04d8a87317 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Fri, 3 Jun 2016 10:15:23 +0200 Subject: [PATCH] eal/x86: fix clang build with -O0 Clang seems to have a bug with asm inside inline function rte_xabort(): rte_rtm.h:56:15: error: invalid operand for inline asm constraint 'i' asm volatile(".byte 0xc6,0xf8,%P0" :: "i" (status) : "memory"); ^ It is seen only when building with EXTRA_CFLAGS=-O0. The workaround is to replace the inline function by a macro. Fixes: ba7468997ea6 ("spinlock: add HTM lock elision for x86") Signed-off-by: Damjan Marion Signed-off-by: Thomas Monjalon Acked-by: Olivier Matz --- lib/librte_eal/common/include/arch/x86/rte_rtm.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/librte_eal/common/include/arch/x86/rte_rtm.h b/lib/librte_eal/common/include/arch/x86/rte_rtm.h index d9356419af..0649f7940d 100644 --- a/lib/librte_eal/common/include/arch/x86/rte_rtm.h +++ b/lib/librte_eal/common/include/arch/x86/rte_rtm.h @@ -50,11 +50,10 @@ void rte_xend(void) asm volatile(".byte 0x0f,0x01,0xd5" ::: "memory"); } -static __attribute__((__always_inline__)) inline -void rte_xabort(const unsigned int status) -{ - asm volatile(".byte 0xc6,0xf8,%P0" :: "i" (status) : "memory"); -} +/* not an inline function to workaround a clang bug with -O0 */ +#define rte_xabort(status) do { \ + asm volatile(".byte 0xc6,0xf8,%P0" :: "i" (status) : "memory"); \ +} while (0) static __attribute__((__always_inline__)) inline int rte_xtest(void) -- 2.20.1