Changeset 100837 in vbox

Timestamp:

Aug 9, 2023 3:08:16 PM (18 months ago)

Author:

vboxsync

Message:

include/iprt/x86.h: A small Solaris-specific build warning remediation.
Undefine MSR_AMD_VIRT_SPEC_CTL to avoid warnings about
'"MSR_AMD_VIRT_SPEC_CTL" redefined' when compiling SUPLib.cpp and
SUPLibLdr.cpp. Both of these files include <iprt/alloca.h> which
includes <stdlib.h> which pulls in numerous other header files before
penultimately including <sys/privregs.h> which ultimately pulls in
<sys/controlregs.h> which has its own definition of MSR_AMD_VIRT_SPEC_CTL
as of S11.4 SRU60/st_147.

File:

• trunk/include/iprt/x86.h (modified) (1 diff)

trunk/include/iprt/x86.h

@@ -50 +50 @@
 
 /** Workaround for Solaris sys/regset.h defining CS, DS and sys/controlregs.h
- * defining MSR_IA32_FLUSH_CMD */
+ * defining MSR_IA32_FLUSH_CMD and MSR_AMD_VIRT_SPEC_CTL */
 #ifdef RT_OS_SOLARIS
 # undef CS
 # undef DS
 # undef MSR_IA32_FLUSH_CMD
+# undef MSR_AMD_VIRT_SPEC_CTL
 #endif