Changeset 31375 in vbox

Timestamp:

Aug 4, 2010 9:41:06 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

64432

Message:

gcc-4.4 workaround

Location:

trunk/src/VBox/Runtime/testcase

Files:

• Makefile.kmk (modified) (1 diff)
• tstInlineAsm.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -124 +124 @@
         tstRTProcIsRunningByName \
         tstRTBitOperationsPIC3 \
+        tstInlineAsmPIC \
         tstInlineAsmPIC3
-if1of ($(USERNAME), umoeller)
-else
-PROGRAMS.linux += \
-        tstInlineAsmPIC
-endif
 PROGRAMS.l4 += \
         tstIoCtl

trunk/src/VBox/Runtime/testcase/tstInlineAsm.cpp

@@ -30 +30 @@
 #include <iprt/asm.h>
 #include <iprt/asm-math.h>
-#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+
+/* See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44018. Only gcc version 4.4
+ * is affected. No harm for the VBox code: If the cpuid code compiles, it works
+ * fine. */
+#if defined(__GNUC__) && defined(RT_ARCH_X86) && defined(__PIC__)
+# if __GNUC__ == 4 && __GNUC_MINOR__ == 4
+#  define GCC44_32BIT_PIC
+# endif
+#endif
+
+#if !defined(GCC44_32BIT_PIC) && (defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86))
 # include <iprt/asm-amd64-x86.h>
 #else
@@ -69 +79 @@
 
 
-#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+#if !defined(GCC44_32BIT_PIC) && (defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86))
 
 const char *getCacheAss(unsigned u)
@@ -166 +176 @@
     for (unsigned iStd = 0; iStd <= cFunctions + 3; iStd++)
     {
+        if (iStd == 4)
+            continue; /* Leaf 04 output depends on the initial value of ECX */
         ASMCpuId(iStd, &s.uEAX, &s.uEBX, &s.uECX, &s.uEDX);
         RTPrintf("%08x  %08x %08x %08x %08x%s\n",
@@ -1226 +1238 @@
     RTPrintf("tstInlineASM: Benchmarking:\n");
 
-#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+#if !defined(GCC44_32BIT_PIC) && (defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86))
 # define BENCH(op, str) \
     do { \
@@ -1321 +1333 @@
      * Execute the tests.
      */
-#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+#if !defined(GCC44_32BIT_PIC) && (defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86))
     tstASMCpuId();
 #endif