VirtualBox

Changeset 65639 in vbox for trunk


Ignore:
Timestamp:
Feb 7, 2017 10:51:43 AM (8 years ago)
Author:
vboxsync
Message:

gcc 7: iprt/asm.h: simplify macro declaration to make gcc 7 happy

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/iprt/asm.h

    r63688 r65639  
    141141 * the compiler. So far this workaround is still required for 4.4 and 4.5 but
    142142 * definitely not for 5.x */
    143 #define RT_INLINE_ASM_GCC_4_3_X_X86 (RT_GNUC_PREREQ(4, 3) && !RT_GNUC_PREREQ(5, 0) && defined(__i386__))
    144 #ifndef RT_INLINE_ASM_GCC_4_3_X_X86
     143#if (RT_GNUC_PREREQ(4, 3) && !RT_GNUC_PREREQ(5, 0) && defined(__i386__))
     144# define RT_INLINE_ASM_GCC_4_3_X_X86 1
     145#else
    145146# define RT_INLINE_ASM_GCC_4_3_X_X86 0
    146147#endif
     
    159160# elif defined(_MSC_VER) /* Visual C++ has trouble too, but it'll only tell us when C4688 is enabled. */
    160161#  define RT_INLINE_DONT_MIX_CMPXCHG8B_AND_PIC 0
     162# elif (   (defined(PIC) || defined(__PIC__)) \
     163        && defined(RT_ARCH_X86) \
     164        && (   RT_INLINE_ASM_GCC_4_3_X_X86 \
     165            || defined(RT_OS_DARWIN)) )
     166#  define RT_INLINE_DONT_MIX_CMPXCHG8B_AND_PIC 1
    161167# else
    162 #  define RT_INLINE_DONT_MIX_CMPXCHG8B_AND_PIC \
    163     (   (defined(PIC) || defined(__PIC__)) \
    164      && defined(RT_ARCH_X86) \
    165      && (   RT_INLINE_ASM_GCC_4_3_X_X86 \
    166          || defined(RT_OS_DARWIN)) )
     168#  define RT_INLINE_DONT_MIX_CMPXCHG8B_AND_PIC 0
    167169# endif
    168170#endif
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette