Commit 774d566c authored by Peter Maydell's avatar Peter Maydell
Browse files

tcg/i386: Fix build for systems without working cpuid.h (MacOSX, Win32) 



Win32 doesn't have a cpuid.h, and MacOSX may have one but without
the __cpuid() function we use, which means that commit 9d2eec20
broke the build for those platforms. Fix this by tightening up
our configure cpuid.h check to test that the functions we need
are present, and adding some missing #ifdef guards in
tcg/i386/tcg-target.c.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
parent 2ca92bb9

configure

+12 −1
Original line number Diff line number Diff line
@@ -3564,6 +3564,17 @@ cpuid_h=no 
cat > $TMPC << EOF

#include <cpuid.h>

int main(void) {

    unsigned a, b, c, d;

    int max = __get_cpuid_max(0, 0);



    if (max >= 1) {

        __cpuid(1, a, b, c, d);

    }



    if (max >= 7) {

        __cpuid_count(7, 0, a, b, c, d);

    }



    return 0;

}

EOF

tcg/i386/tcg-target.c

+3 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static const int tcg_target_call_oarg_regs[] = { 
   is available.  */

#if TCG_TARGET_REG_BITS == 64

# define have_cmov 1

#elif defined(CONFIG_CPUID_H)

#elif defined(CONFIG_CPUID_H) && defined(bit_CMOV)

static bool have_cmov;

#else

# define have_cmov 0
@@ -2295,6 +2295,7 @@ static void tcg_target_qemu_prologue(TCGContext *s) 


static void tcg_target_init(TCGContext *s)

{

#ifdef CONFIG_CPUID_H

    unsigned a, b, c, d;

    int max = __get_cpuid_max(0, 0);
@@ -2323,6 +2324,7 @@ static void tcg_target_init(TCGContext *s) 
        have_bmi2 = (b & bit_BMI2) != 0;

#endif

    }

#endif



    if (TCG_TARGET_REG_BITS == 64) {

        tcg_regset_set32(tcg_target_available_regs[TCG_TYPE_I32], 0, 0xffff);