From dc0ccfd74c3b69271f9b2cd17a8240c08662e804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Thu, 26 Jan 2017 21:36:10 +0100 Subject: [PATCH] Fix compilation with ICC (17.0.1) (#150) --- src/asmjit/asmjit_build.h | 2 +- src/asmjit/base/cpuinfo.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/asmjit/asmjit_build.h b/src/asmjit/asmjit_build.h index 2a80f80..b388d1c 100644 --- a/src/asmjit/asmjit_build.h +++ b/src/asmjit/asmjit_build.h @@ -637,7 +637,7 @@ # endif # endif # else -# if ASMJIT_CC_CLANG || ASMJIT_CC_GCC_GE(4, 0, 0) +# if ASMJIT_CC_CLANG || ASMJIT_CC_GCC_GE(4, 0, 0) || ASMJIT_CC_INTEL # define ASMJIT_API __attribute__((__visibility__("default"))) # endif # endif diff --git a/src/asmjit/base/cpuinfo.cpp b/src/asmjit/base/cpuinfo.cpp index 8e17e80..4de55bc 100644 --- a/src/asmjit/base/cpuinfo.cpp +++ b/src/asmjit/base/cpuinfo.cpp @@ -287,7 +287,7 @@ static void ASMJIT_INLINE x86CallCpuId(CpuIdResult* result, uint32_t inEax, uint : "a"(inEax), "c"(inEcx) ); -#elif (ASMJIT_CC_GCC || ASMJIT_CC_CLANG) && ASMJIT_ARCH_X64 +#elif (ASMJIT_CC_GCC || ASMJIT_CC_CLANG || ASMJIT_CC_INTEL) && ASMJIT_ARCH_X64 __asm__ __volatile__( \ "mov %%rbx, %%rdi\n" "cpuid\n"