Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update cpuid code for clang-cl
The clang-cl compiler defines `__llvm__` but not `__GNUC__`. The `__cpuid` intrinsic doesn't seem to exist with clang-cl, so the code won't link properly. The `__GNUC__` versions of these functions will work properly on Windows with clang-cl.
  • Loading branch information
nicolasnoble authored and sezero committed Mar 3, 2021
1 parent 4de0c74 commit 6158621
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/cpuinfo/SDL_cpuinfo.c
Expand Up @@ -129,7 +129,7 @@ CPU_haveCPUID(void)

/* *INDENT-OFF* */
#ifndef SDL_CPUINFO_DISABLED
#if defined(__GNUC__) && defined(__i386__)
#if (defined(__GNUC__) || defined(__llvm__)) && defined(__i386__)
__asm__ (
" pushfl # Get original EFLAGS \n"
" popl %%eax \n"
Expand All @@ -147,7 +147,7 @@ CPU_haveCPUID(void)
:
: "%eax", "%ecx"
);
#elif defined(__GNUC__) && defined(__x86_64__)
#elif (defined(__GNUC__) || defined(__llvm__)) && defined(__x86_64__)
/* Technically, if this is being compiled under __x86_64__ then it has
CPUid by definition. But it's nice to be able to prove it. :) */
__asm__ (
Expand Down Expand Up @@ -220,7 +220,7 @@ CPU_haveCPUID(void)
return has_CPUID;
}

#if defined(__GNUC__) && defined(__i386__)
#if (defined(__GNUC__) || defined(__llvm__)) && defined(__i386__)
#define cpuid(func, a, b, c, d) \
__asm__ __volatile__ ( \
" pushl %%ebx \n" \
Expand All @@ -229,7 +229,7 @@ CPU_haveCPUID(void)
" movl %%ebx, %%esi \n" \
" popl %%ebx \n" : \
"=a" (a), "=S" (b), "=c" (c), "=d" (d) : "a" (func))
#elif defined(__GNUC__) && defined(__x86_64__)
#elif (defined(__GNUC__) || defined(__llvm__)) && defined(__x86_64__)
#define cpuid(func, a, b, c, d) \
__asm__ __volatile__ ( \
" pushq %%rbx \n" \
Expand Down

0 comments on commit 6158621

Please sign in to comment.