1 --- include/iprt/x86.h.orig 2020-05-13 19:36:52 UTC 2 +++ include/iprt/x86.h 3 @@ -35,6 +35,16 @@ 4 # pragma D depends_on library vbox-types.d 5 #endif 6 7 +/* Workaround for FreeBSD machine/specialreg.h defining MSRs */ 8 +#ifdef RT_OS_FREEBSD 9 +# undef MSR_P5_MC_ADDR 10 +# undef MSR_P5_MC_TYPE 11 +# undef MSR_IA32_PLATFORM_ID 12 +# undef MSR_BBL_CR_CTL3 13 +# undef MSR_IA32_MISC_ENABLE 14 +# undef MSR_IA32_FEATURE_CONTROL 15 +#endif 16 + 17 /* Workaround for Solaris sys/regset.h defining CS, DS */ 18 #ifdef RT_OS_SOLARIS 19 # undef CS 20