Ticket #57032: patch-mozjs52-tiger-ppc-notfixedyetfully.diff

File patch-mozjs52-tiger-ppc-notfixedyetfully.diff, 18.0 KB (added by kencu (Ken), 5 years ago)

  • build/build-clang/build-clang.py 

    diff --git build/build-clang/build-clang.py build/build-clang/build-clang.py
index 697bbb9b..26b3118e 100755
    if __name__ == "__main__": 
    368368
    369369    if is_darwin():
    370370        extra_cflags = []
    371         extra_cxxflags = ["-stdlib=libc++"]
    372371        extra_cflags2 = []
    373         extra_cxxflags2 = ["-stdlib=libc++"]
    374372    elif is_linux():
    375373        extra_cflags = ["-static-libgcc"]
    376374        extra_cxxflags = ["-static-libgcc", "-static-libstdc++"]

  • build/clang-plugin/moz.build 

    diff --git build/clang-plugin/moz.build build/clang-plugin/moz.build
index d9b20cd9..724089ae 100644
    SOURCES += [ 
    1313DISABLE_STL_WRAPPING = True
    1414NO_VISIBILITY_FLAGS = True
    1515
    16 # libc++ is required to build plugins against clang on OS X.
    17 if CONFIG['HOST_OS_ARCH'] == 'Darwin':
    18     CXXFLAGS += ['-stdlib=libc++']
    19     LDFLAGS += ['-lc++']
    20 
    2116DIRS += [
    2217    'tests',
    2318]

  • js/src/ctypes/CTypes.cpp 

    diff --git js/src/ctypes/CTypes.cpp js/src/ctypes/CTypes.cpp
index 0facd000..e3011ae3 100644
    struct ConvertImpl<uint64_t, double> { 
    25382538// round-trip. In fact, on some platforms, including SPARC, there are pairs of
    25392539// values, a uint64_t and a double, such that neither value is exactly
    25402540// representable in the other type, but they cast to each other.
    2541 #if defined(SPARC) || defined(__powerpc__)
     2541#if defined(SPARC) || defined(__powerpc__) || defined(__POWERPC__)
    25422542// Simulate x86 overflow behavior
    25432543template<>
    25442544struct ConvertImpl<uint64_t, double> {

  • js/src/ds/MemoryProtectionExceptionHandler.cpp 

    diff --git js/src/ds/MemoryProtectionExceptionHandler.cpp js/src/ds/MemoryProtectionExceptionHandler.cpp
index 7c6646a9..93636f0d 100644
     
    3030#include "threading/Thread.h"
    3131#include "vm/MutexIDs.h"
    3232
     33
     34/* These aren't defined in the 10.4 SDK, so provide them here */
     35#ifndef EXC_MASK_CRASH
     36#define EXC_MASK_CRASH 0x400
     37#endif
     38#ifndef MACH_EXCEPTION_CODES
     39#define MACH_EXCEPTION_CODES 0x80000000
     40#endif
     41
    3342namespace js {
    3443
    3544/*

  • js/src/jsgc.cpp 

    diff --git js/src/jsgc.cpp js/src/jsgc.cpp
index 42d10283..1fd4ccd9 100644
    js::GetCPUCount() 
    32533253        GetSystemInfo(&sysinfo);
    32543254        ncpus = unsigned(sysinfo.dwNumberOfProcessors);
    32553255# else
    3256         long n = sysconf(_SC_NPROCESSORS_ONLN);
    3257         ncpus = (n > 0) ? unsigned(n) : 1;
     3256//        long n = sysconf(_SC_NPROCESSORS_ONLN);
     3257//        ncpus = (n > 0) ? unsigned(n) : 1;
     3258          ncpus = 1;
    32583259# endif
    32593260    }
    32603261    return ncpus;

  • js/src/old-configure 

    diff --git js/src/old-configure js/src/old-configure
index de0f8779..961602c7 100644
    case "$target" in 
    49684968    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
    49694969    MOZ_OPTIMIZE_FLAGS="-O3 -fno-stack-protector"
    49704970    CFLAGS="$CFLAGS -fno-common"
    4971     CXXFLAGS="$CXXFLAGS -fno-common -stdlib=libc++"
     4971    CXXFLAGS="$CXXFLAGS -fno-common"
    49724972    DLL_SUFFIX=".dylib"
    49734973    DSO_LDOPTS=''
    49744974    STRIP="$STRIP -x -S"

  • js/src/old-configure.in 

    diff --git js/src/old-configure.in js/src/old-configure.in
index ff0617e3..ba19a6ef 100644
    case "$target" in 
    604604    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
    605605    MOZ_OPTIMIZE_FLAGS="-O3 -fno-stack-protector"
    606606    CFLAGS="$CFLAGS -fno-common"
    607     CXXFLAGS="$CXXFLAGS -fno-common -stdlib=libc++"
     607    CXXFLAGS="$CXXFLAGS -fno-common"
    608608    DLL_SUFFIX=".dylib"
    609609    DSO_LDOPTS=''
    610610    STRIP="$STRIP -x -S"

  • js/src/threading/posix/Thread.cpp 

    diff --git js/src/threading/posix/Thread.cpp js/src/threading/posix/Thread.cpp
index 2572cc72..b9f57e7a 100644
    void 
    140140js::ThisThread::SetName(const char* name)
    141141{
    142142  MOZ_RELEASE_ASSERT(name);
     143#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060
    143144
    144145#if (defined(__APPLE__) && defined(__MACH__)) || defined(__linux__)
    145146  // On linux and OS X the name may not be longer than 16 bytes, including
    … … js::ThisThread::SetName(const char* name) 
    162163#else
    163164  rv = pthread_setname_np(pthread_self(), name);
    164165#endif
     166
    165167  MOZ_RELEASE_ASSERT(!rv);
     168#endif /* __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060 */
    166169}
    167170
    168171void
    169172js::ThisThread::GetName(char* nameBuffer, size_t len)
    170173{
    171174  MOZ_RELEASE_ASSERT(len >= 16);
     175#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060
    172176
    173177  int rv = -1;
    174178#ifdef HAVE_PTHREAD_GETNAME_NP
    … … js::ThisThread::GetName(char* nameBuffer, size_t len) 
    177181  rv = prctl(PR_GET_NAME, reinterpret_cast<unsigned long>(nameBuffer));
    178182#endif
    179183
     184
    180185  if (rv)
    181186    nameBuffer[0] = '\0';
     187#endif /* __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060 */
    182188}

  • js/src/vm/TraceLogging.cpp 

    diff --git js/src/vm/TraceLogging.cpp js/src/vm/TraceLogging.cpp
index 3d6183b3..cb7d1e66 100644
    uint64_t inline rdtsc() { 
    3838    return ReadTimestampCounter();
    3939}
    4040
    41 #elif defined(__powerpc__)
     41#elif defined(__powerpc__) || defined(__POWERPC__)
    4242static __inline__ uint64_t
    4343rdtsc(void)
    4444{

  • js/src/wasm/WasmSignalHandlers.cpp 

    diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp
index 78d21369..31cfdc5c 100644
    extern "C" MFBT_API bool IsSignalHandlingBroken(); 
    4141# endif
    4242#endif
    4343
     44/* These aren't defined in the 10.4 SDK, so provide them here */
     45#ifndef EXC_MASK_CRASH
     46#define EXC_MASK_CRASH 0x400
     47#endif
     48#ifndef MACH_EXCEPTION_CODES
     49#define MACH_EXCEPTION_CODES 0x80000000
     50#endif
     51
     52
    4453// For platforms where the signal/exception handler runs on the same
    4554// thread/stack as the victim (Unix and Windows), we can use TLS to find any
    4655// currently executing wasm code.

  • memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in 

    diff --git memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in
index fdc8fef9..b880b830 100644
    typedef unsigned szind_t; 
    260260#  ifdef __or1k__
    261261#    define LG_QUANTUM          3
    262262#  endif
    263 #  ifdef __powerpc__
     263#  ifdef __powerpc__ || defined(__POWERPC__)
    264264#    define LG_QUANTUM          4
    265265#  endif
    266266#  ifdef __riscv__

  • memory/jemalloc/src/include/jemalloc/internal/mb.h 

    diff --git memory/jemalloc/src/include/jemalloc/internal/mb.h memory/jemalloc/src/include/jemalloc/internal/mb.h
index 5384728f..c1081ae5 100644
    mb_write(void) 
    6565            : "memory" /* Clobbers. */
    6666            );
    6767}
    68 #elif defined(__powerpc__)
     68#elif defined(__powerpc__) || defined(__POWERPC__)
    6969JEMALLOC_INLINE void
    7070mb_write(void)
    7171{

  • memory/mozjemalloc/jemalloc.c 

    diff --git memory/mozjemalloc/jemalloc.c memory/mozjemalloc/jemalloc.c
index 5d4d83a2..03183e50 100644
    static const bool isthreaded = true; 
    511511#  define SIZEOF_PTR_2POW       2
    512512#  define NO_TLS
    513513#endif
    514 #ifdef __powerpc__
     514#ifdef __powerpc__ || defined(__POWERPC__)
    515515#  define QUANTUM_2POW_MIN      4
    516516#  define SIZEOF_PTR_2POW       2
    517517#endif
    … … static const bool config_recycle = false; 
    11101110#if (defined(SOLARIS) || defined(__FreeBSD__)) && \
    11111111    (defined(__sparc) || defined(__sparcv9) || defined(__ia64))
    11121112#define pagesize_2pow                   ((size_t) 13)
    1113 #elif defined(__powerpc64__)
     1113#elif defined(__powerpc64__) || defined(__POWERPC64__)
    11141114#define pagesize_2pow                   ((size_t) 16)
    11151115#else
    11161116#define pagesize_2pow                   ((size_t) 12)

  • mfbt/EndianUtils.h 

    diff --git mfbt/EndianUtils.h mfbt/EndianUtils.h
index 00815580..a885a402 100644
     
    9494#  else
    9595#    error "CPU type is unknown"
    9696#  endif
    97 #elif defined(__APPLE__) || defined(__powerpc__) || defined(__ppc__)
     97#elif defined(__APPLE__) || defined(__powerpc__) || defined(__POWERPC__) || defined(__ppc__)
    9898#  if __LITTLE_ENDIAN__
    9999#    define MOZ_LITTLE_ENDIAN 1
    100100#  elif __BIG_ENDIAN__

  • mfbt/double-conversion/utils.h 

    diff --git mfbt/double-conversion/utils.h mfbt/double-conversion/utils.h
index 15dd4bfb..82add5ec 100644
     
    5656    defined(__ARMEL__) || defined(__avr32__) || \
    5757    defined(__hppa__) || defined(__ia64__) || \
    5858    defined(__mips__) || \
    59     defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
     59    defined(__powerpc__) || defined(__POWERPC__) || defined(__ppc__) || defined(__ppc64__) || \
    6060    defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
    6161    defined(__SH4__) || defined(__alpha__) || \
    6262    defined(_MIPS_ARCH_MIPS32R2) || \

  • mfbt/lz4.c 

    diff --git mfbt/lz4.c mfbt/lz4.c
index c416fe81..440518f8 100644
     
    4747**************************************/
    4848/* 32 or 64 bits ? */
    4949#if (defined(__x86_64__) || defined(_M_X64) || defined(_WIN64) \
    50   || defined(__powerpc64__) || defined(__powerpc64le__) \
     50  || defined(__powerpc64__) || defined(__powerpc64le__) || defined(__POWERPC64__) \
    5151  || defined(__ppc64__) || defined(__ppc64le__) \
    5252  || defined(__PPC64__) || defined(__PPC64LE__) \
    5353  || defined(__ia64) || defined(__itanium__) || defined(_M_IA64) \
    … …  
    7070#elif (defined(__BIG_ENDIAN__) || defined(__BIG_ENDIAN) || defined(_BIG_ENDIAN)) && !(defined(__LITTLE_ENDIAN__) || defined(__LITTLE_ENDIAN) || defined(_LITTLE_ENDIAN))
    7171#  define LZ4_BIG_ENDIAN 1
    7272#elif defined(__sparc) || defined(__sparc__) \
    73    || defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) \
     73   || defined(__powerpc__) || defined(__POWERPC__) || defined(__ppc__) || defined(__PPC__) \
    7474   || defined(__hpux)  || defined(__hppa) \
    7575   || defined(_MIPSEB) || defined(__s390__)
    7676#  define LZ4_BIG_ENDIAN 1

  • nsprpub/pr/include/md/_beos.cfg 

    diff --git nsprpub/pr/include/md/_beos.cfg nsprpub/pr/include/md/_beos.cfg
index 5a3c5699..d7f19a6e 100644
     
    1717
    1818#define PR_AF_INET6 5  /* same as AF_INET6 */
    1919
    20 #ifdef __powerpc__
     20#ifdef __powerpc__ || defined(__POWERPC__)
    2121#undef  IS_LITTLE_ENDIAN
    2222#define IS_BIG_ENDIAN 1
    2323#else

  • nsprpub/pr/include/md/_beos.h 

    diff --git nsprpub/pr/include/md/_beos.h nsprpub/pr/include/md/_beos.h
index 78469dde..4028aa62 100644
     
    2929
    3030#define PR_LINKER_ARCH  "beos"
    3131#define _PR_SI_SYSNAME  "BEOS"
    32 #ifdef __powerpc__
     32#ifdef __powerpc__ || defined(__POWERPC__)
    3333#define _PR_SI_ARCHITECTURE "ppc"
    3434#else
    3535#define _PR_SI_ARCHITECTURE "x86"

  • nsprpub/pr/include/md/_freebsd.cfg 

    diff --git nsprpub/pr/include/md/_freebsd.cfg nsprpub/pr/include/md/_freebsd.cfg
index 1d1039a5..1e410554 100644
     
    251251#define PR_ALIGN_OF_POINTER 8
    252252#define PR_ALIGN_OF_WORD    8
    253253
    254 #elif defined(__powerpc64__)
     254#elif defined(__powerpc64__) || defined(__POWERPC64__)
    255255
    256256#undef  IS_LITTLE_ENDIAN
    257257#define IS_BIG_ENDIAN    1
    … …  
    297297#define PR_BYTES_PER_WORD_LOG2   3
    298298#define PR_BYTES_PER_DWORD_LOG2  3
    299299
    300 #elif defined(__powerpc__)
     300#elif defined(__powerpc__) || defined(__POWERPC__)
    301301
    302302#undef  IS_LITTLE_ENDIAN
    303303#define IS_BIG_ENDIAN    1

  • nsprpub/pr/include/md/_freebsd.h 

    diff --git nsprpub/pr/include/md/_freebsd.h nsprpub/pr/include/md/_freebsd.h
index 9a179bcb..56177fe1 100644
     
    2525#define _PR_SI_ARCHITECTURE "ia64"
    2626#elif defined(__amd64__)
    2727#define _PR_SI_ARCHITECTURE "amd64"
    28 #elif defined(__powerpc64__)
     28#elif defined(__powerpc64__) || defined(__POWERPC64__)
    2929#define _PR_SI_ARCHITECTURE "powerpc64"
    30 #elif defined(__powerpc__)
     30#elif defined(__powerpc__) || defined(__POWERPC__)
    3131#define _PR_SI_ARCHITECTURE "powerpc"
    3232#elif defined(__aarch64__)
    3333#define _PR_SI_ARCHITECTURE "aarch64"

  • nsprpub/pr/include/md/_linux.cfg 

    diff --git nsprpub/pr/include/md/_linux.cfg nsprpub/pr/include/md/_linux.cfg
index 8cbf0cb9..665f1a95 100644
     
    2727#define PR_AF_INET6 10  /* same as AF_INET6 */
    2828#endif
    2929
    30 #ifdef __powerpc64__
     30#ifdef __powerpc64__ || defined(__POWERPC64__)
    3131
    3232#ifdef __LITTLE_ENDIAN__
    3333#define IS_LITTLE_ENDIAN 1
    … …  
    7878#define PR_BYTES_PER_WORD_LOG2   3
    7979#define PR_BYTES_PER_DWORD_LOG2  3
    8080
    81 #elif defined(__powerpc__)
     81#elif defined(__powerpc__) || defined(__POWERPC__)
    8282
    8383#ifdef __LITTLE_ENDIAN__
    8484#define IS_LITTLE_ENDIAN 1

  • nsprpub/pr/include/md/_linux.h 

    diff --git nsprpub/pr/include/md/_linux.h nsprpub/pr/include/md/_linux.h
index b4b298b7..5298075b 100644
     
    1919
    2020#define PR_LINKER_ARCH  "linux"
    2121#define _PR_SI_SYSNAME  "LINUX"
    22 #ifdef __powerpc64__
     22#ifdef __powerpc64__ || defined(__POWERPC64__)
    2323#define _PR_SI_ARCHITECTURE "ppc64"
    24 #elif defined(__powerpc__)
     24#elif defined(__powerpc__) || defined(__POWERPC__)
    2525#define _PR_SI_ARCHITECTURE "ppc"
    2626#elif defined(__alpha)
    2727#define _PR_SI_ARCHITECTURE "alpha"
    … … extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval); 
    137137#endif
    138138#endif
    139139
    140 #if defined(__powerpc__) && !defined(__powerpc64__)
     140#if defined(__powerpc__) || defined(__POWERPC__) && !defined(__powerpc64__)
    141141#define _PR_HAVE_ATOMIC_OPS
    142142#define _MD_INIT_ATOMIC()
    143143extern PRInt32 _PR_ppc_AtomicIncrement(PRInt32 *val);
    … … extern PRInt32 _PR_ppc_AtomicSet(PRInt32 *val, PRInt32 newval); 
    150150#define _MD_ATOMIC_SET                _PR_ppc_AtomicSet
    151151#endif
    152152
    153 #if defined(__powerpc64__)
     153#if defined(__powerpc64__) || defined(__POWERPC64__)
    154154#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
    155155/* Use GCC built-in functions */
    156156#define _PR_HAVE_ATOMIC_OPS
    … … extern void _MD_CleanupBeforeExit(void); 
    329329
    330330#define CONTEXT(_th) ((_th)->md.context)
    331331
    332 #ifdef __powerpc__
     332#ifdef __powerpc__ || defined(__POWERPC__)
    333333/*
    334334 * PowerPC based MkLinux
    335335 *
    … … extern void _MD_CleanupBeforeExit(void); 
    505505/*
    506506** Initialize a thread context to run "_main()" when started
    507507*/
    508 #ifdef __powerpc__
     508#ifdef __powerpc__ || defined(__POWERPC__)
    509509
    510510#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)  \
    511511{  \

  • nsprpub/pr/include/md/_netbsd.cfg 

    diff --git nsprpub/pr/include/md/_netbsd.cfg nsprpub/pr/include/md/_netbsd.cfg
index 1326556e..a91213ed 100644
     
    250250#define PR_BYTES_PER_WORD_LOG2  3
    251251#define PR_BYTES_PER_DWORD_LOG2 3
    252252
    253 #elif defined(__powerpc__) || defined(__m68k__)
     253#elif defined(__powerpc__) || defined(__POWERPC__) || defined(__m68k__)
    254254
    255255#undef  IS_LITTLE_ENDIAN
    256256#define IS_BIG_ENDIAN    1

  • nsprpub/pr/include/md/_netbsd.h 

    diff --git nsprpub/pr/include/md/_netbsd.h nsprpub/pr/include/md/_netbsd.h
index 945d94ff..16d383cf 100644
     
    1919#define _PR_SI_ARCHITECTURE "amd64"
    2020#elif defined(__m68k__)
    2121#define _PR_SI_ARCHITECTURE "m68k"
    22 #elif defined(__powerpc__)
     22#elif defined(__powerpc__) || defined(__POWERPC__)
    2323#define _PR_SI_ARCHITECTURE "powerpc"
    2424#elif defined(__sparc_v9__)
    2525#define _PR_SI_ARCHITECTURE "sparc64"
    … …  
    7171
    7272#define CONTEXT(_th) ((_th)->md.context)
    7373
    74 #if defined(__i386__) || defined(__sparc__) || defined(__m68k__) || defined(__powerpc__)
     74#if defined(__i386__) || defined(__sparc__) || defined(__m68k__) || defined(__powerpc__) || defined(__POWERPC__)
    7575#define JB_SP_INDEX 2
    7676#elif defined(__mips__)
    7777#define JB_SP_INDEX 4

  • nsprpub/pr/include/md/_openbsd.cfg 

    diff --git nsprpub/pr/include/md/_openbsd.cfg nsprpub/pr/include/md/_openbsd.cfg
index b68d6e9c..02f725ed 100644
     
    252252#define PR_BYTES_PER_WORD_LOG2  3
    253253#define PR_BYTES_PER_DWORD_LOG2 3
    254254
    255 #elif defined(__powerpc__) || defined(__m68k__)
     255#elif defined(__powerpc__) || defined(__POWERPC__) || defined(__m68k__)
    256256
    257257#undef  IS_LITTLE_ENDIAN
    258258#define IS_BIG_ENDIAN    1

  • nsprpub/pr/include/md/_openbsd.h 

    diff --git nsprpub/pr/include/md/_openbsd.h nsprpub/pr/include/md/_openbsd.h
index 666c177e..3517f812 100644
     
    1818#define _PR_SI_ARCHITECTURE "amd64"
    1919#elif defined(__m68k__)
    2020#define _PR_SI_ARCHITECTURE "m68k"
    21 #elif defined(__powerpc__)
     21#elif defined(__powerpc__) || defined(__POWERPC__)
    2222#define _PR_SI_ARCHITECTURE "powerpc"
    2323#elif defined(__sparc__)
    2424#define _PR_SI_ARCHITECTURE "sparc"
    … …  
    6161
    6262#if defined(__i386__) || defined(__sparc__) || defined(__m68k__)
    6363#define JB_SP_INDEX 2
    64 #elif defined(__powerpc__)
     64#elif defined(__powerpc__) || defined(__POWERPC__)
    6565#define JB_SP_INDEX 1
    6666#elif defined(__alpha__)
    6767#define JB_SP_INDEX 34

  • nsprpub/pr/include/pratom.h 

    diff --git nsprpub/pr/include/pratom.h nsprpub/pr/include/pratom.h
index dff9d6c0..6a10734b 100644
    NSPR_API(PRInt32) PR_AtomicAdd(PRInt32 *ptr, PRInt32 val); 
    9999
    100100#elif ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && \
    101101      ((defined(__APPLE__) && \
    102            (defined(__ppc__) || defined(__i386__) || defined(__x86_64__))) || \
     102           (defined(__ppc__) || defined(__POWERPC__) || defined(__POWERPC64__) || defined(__i386__) || defined(__x86_64__))) || \
    103103       (defined(__linux__) && \
    104104           ((defined(__i386__) && \
    105105           defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)) || \
    106106           defined(__ia64__) || defined(__x86_64__) || \
    107            defined(__powerpc__) || \
     107           defined(__powerpc__) || defined(__POWERPC__) || \
    108108           (defined(__arm__) && \
    109109           defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)) || \
    110110           defined(__aarch64__) || defined(__alpha) || \

  • python/mozbuild/mozbuild/configure/constants.py 

    diff --git python/mozbuild/mozbuild/configure/constants.py python/mozbuild/mozbuild/configure/constants.py
index dfc7cf8a..02f0f3bf 100644
    CPU_preprocessor_checks = OrderedDict(( 
    7777    ('ia64', '__ia64__'),
    7878    ('s390x', '__s390x__'),
    7979    ('s390', '__s390__'),
    80     ('ppc64', '__powerpc64__'),
    81     ('ppc', '__powerpc__'),
     80    ('ppc64', '__powerpc64__ || __POWERPC64__'),
     81    ('ppc', '__powerpc__ || __POWERPC__'),
    8282    ('Alpha', '__alpha__'),
    8383    ('hppa', '__hppa__'),
    8484    ('sparc64', '__sparc__ && __arch64__'),