Changeset 14808 in vbox for trunk/include/iprt

Timestamp:

Nov 29, 2008 11:06:52 PM (16 years ago)

Author:

vboxsync

Message:

iprt/asm.h: GNU C/C++ defined PIC to indicate whether -fPIC behaviour is active. Replaced the RT_OS_DARWIN check with PIC to fix incorrect complication when targetting ring-0, RC and static.

File:

• trunk/include/iprt/asm.h (modified) (8 diffs)

trunk/include/iprt/asm.h

@@ -746 +746 @@
              : "0" (uOperator)
              : "rbx", "rcx");
-#  elif (defined(PIC) || defined(RT_OS_DARWIN)) && defined(__i386__) /* darwin: PIC by default. */
+#  elif (defined(PIC) || defined(__PIC__)) && defined(__i386__)
     __asm__ ("push  %%ebx\n\t"
              "cpuid\n\t"
@@ -802 +802 @@
              : "0" (uOperator)
              : "rbx", "rdx");
-#  elif (defined(PIC) || defined(RT_OS_DARWIN)) && defined(__i386__) /* darwin: 4.0.1 compiler option / bug? */
+#  elif (defined(PIC) || defined(__PIC__)) && defined(__i386__)
     __asm__ ("push  %%ebx\n\t"
              "cpuid\n\t"
@@ -907 +907 @@
              : "0" (1)
              : "rcx", "rdx");
-#  elif (defined(PIC) || defined(RT_OS_DARWIN)) && defined(__i386__)
+#  elif (defined(PIC) || defined(__PIC__)) && defined(__i386__)
     RTCCUINTREG uSpill;
     __asm__ ("mov   %%ebx,%1\n\t"
@@ -2515 +2515 @@
 # else /* !RT_ARCH_AMD64 */
 #  if RT_INLINE_ASM_GNU_STYLE
-#   if defined(PIC) || defined(RT_OS_DARWIN) /* darwin: 4.0.1 compiler option / bug? */
+#   if defined(PIC) || defined(__PIC__)
     uint32_t u32EBX = (uint32_t)u64;
     __asm__ __volatile__(/*"xchgl %%esi, %5\n\t"*/
@@ -2879 +2879 @@
     uint32_t u32Ret;
 #  if RT_INLINE_ASM_GNU_STYLE
-#   if defined(PIC) || defined(RT_OS_DARWIN) /* darwin: 4.0.1 compiler option / bug? */
+#   if defined(PIC) || defined(__PIC__)
     uint32_t u32EBX = (uint32_t)u64New;
     uint32_t u32Spill;
@@ -3139 +3139 @@
 #  if RT_INLINE_ASM_GNU_STYLE
     uint64_t u64Ret;
-#   if defined(PIC) || defined(RT_OS_DARWIN) /* darwin: 4.0.1 compiler option / bug? */
+#   if defined(PIC) || defined(__PIC__)
     /* NB: this code uses a memory clobber description, because the clean
      * solution with an output value for *pu64 makes gcc run out of registers.
@@ -3794 +3794 @@
 # else /* !RT_ARCH_AMD64 */
 #  if RT_INLINE_ASM_GNU_STYLE
-#   if defined(PIC) || defined(RT_OS_DARWIN) /* darwin: 4.0.1 compiler option / bug? */
+#   if defined(PIC) || defined(__PIC__)
     uint32_t u32EBX = 0;
     Assert(!((uintptr_t)pu64 & 7));
@@ -3870 +3870 @@
 # else /* !RT_ARCH_AMD64 */
 #  if RT_INLINE_ASM_GNU_STYLE
-#   if defined(PIC) || defined(RT_OS_DARWIN) /* darwin: 4.0.1 compiler option / bug? */
+#   if defined(PIC) || defined(__PIC__)
     uint32_t u32EBX = 0;
     uint32_t u32Spill;