Changeset View
Changeset View
Standalone View
Standalone View
emulators/virtualbox-ose/files/patch-include-iprt-x86.h
| --- include/iprt/x86.h.orig 2020-05-13 19:36:52 UTC | --- include/iprt/x86.h.orig 2021-01-07 15:31:34 UTC | ||||
| +++ include/iprt/x86.h | +++ include/iprt/x86.h | ||||
| @@ -35,6 +35,16 @@ | @@ -38,6 +38,16 @@ | ||||
| # pragma D depends_on library vbox-types.d | # pragma D depends_on library vbox-types.d | ||||
| #endif | #endif | ||||
| +/* Workaround for FreeBSD machine/specialreg.h defining MSRs */ | +/* Workaround for FreeBSD machine/specialreg.h defining MSRs */ | ||||
| +#ifdef RT_OS_FREEBSD | +#ifdef RT_OS_FREEBSD | ||||
| +# undef MSR_P5_MC_ADDR | +# undef MSR_P5_MC_ADDR | ||||
| +# undef MSR_P5_MC_TYPE | +# undef MSR_P5_MC_TYPE | ||||
| +# undef MSR_IA32_PLATFORM_ID | +# undef MSR_IA32_PLATFORM_ID | ||||
| +# undef MSR_BBL_CR_CTL3 | +# undef MSR_BBL_CR_CTL3 | ||||
| +# undef MSR_IA32_MISC_ENABLE | +# undef MSR_IA32_MISC_ENABLE | ||||
| +# undef MSR_IA32_FEATURE_CONTROL | +# undef MSR_IA32_FEATURE_CONTROL | ||||
| +#endif | +#endif | ||||
| + | + | ||||
| /* Workaround for Solaris sys/regset.h defining CS, DS */ | /* Workaround for Solaris sys/regset.h defining CS, DS */ | ||||
| #ifdef RT_OS_SOLARIS | #ifdef RT_OS_SOLARIS | ||||
| # undef CS | # undef CS | ||||