Bug 1477048 - part 1 - remove '86' in CONFIG['OS_TEST'] stanzas fro…

…m moz.build files; r=gps

The current code is somewhat non-obvious to a first-time reader, and
OS_TEST is a bizarre thing anyway, since it's actually the name of the
CPU we're running on.  We'd do well to minimize the use of OS_TEST.

Note that the complete nuking of the xptcall/md/unix/moz.build lines are
because we don't support OS X/x86 anymore.

gfx/cairo/libpixman/src/moz.build

@@ -82,7 +82,7 @@ use_sse2 = False
 use_vmx = False
 use_arm_simd_gcc = False
 use_arm_neon_gcc = False
-if '86' in CONFIG['OS_TEST']:
+if CONFIG['INTEL_ARCHITECTURE']:
     use_sse2 = True
     if '64' not in CONFIG['OS_TEST']:
         if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):

gfx/qcms/moz.build

@@ -25,7 +25,7 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
 use_sse1 = False
 use_sse2 = False
 use_altivec = False
-if '86' in CONFIG['OS_TEST']:
+if CONFIG['INTEL_ARCHITECTURE']:
     use_sse2 = True
     if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
         if CONFIG['OS_ARCH'] != 'WINNT' or CONFIG['OS_TEST'] != 'x86_64':

ipc/chromium/atomics/moz.build

@@ -10,7 +10,7 @@ Library('chromium_atomics')
 
 # This test is copied from ../moz.build for atomicops_internals_mutex.cc
 ost = CONFIG['OS_TEST']
-if '86' not in ost and 'arm' not in ost and 'aarch64' != ost and 'mips' not in ost and 'powerpc' not in ost:
+if not CONFIG['INTEL_ARCHITECTURE'] and 'arm' not in ost and 'aarch64' != ost and 'mips' not in ost and 'powerpc' not in ost:
     SOURCES += [
         '../src/base/atomicops_internals_mutex.cc',
         '../src/base/lock_impl_posix.cc',

ipc/chromium/moz.build

@@ -133,7 +133,7 @@ if os_solaris:
     ]
 
 ost = CONFIG['OS_TEST']
-if '86' not in ost and 'arm' not in ost and 'aarch64' != ost and 'mips' not in ost and 'powerpc' not in ost:
+if not CONFIG['INTEL_ARCHITECTURE'] and 'arm' not in ost and 'aarch64' != ost and 'mips' not in ost and 'powerpc' not in ost:
     SOURCES += [
         'src/base/atomicops_internals_mutex.cc',
     ]

media/libtheora/moz.build

@@ -48,7 +48,7 @@ UNIFIED_SOURCES += [
 
 LOCAL_INCLUDES += ['include']
 
-if '86' in CONFIG['OS_TEST']:
+if CONFIG['INTEL_ARCHITECTURE']:
     if CONFIG['OS_ARCH'] != 'SunOS':
         if CONFIG['CC_TYPE'] == 'clang-cl':
             # clang-cl can't handle libtheora's inline asm.

modules/xz-embedded/moz.build

@@ -27,7 +27,7 @@ if CONFIG['TARGET_CPU'].startswith('arm'):
         DEFINES['XZ_DEC_ARMTHUMB'] = 1
     else:
         DEFINES['XZ_DEC_ARM'] = 1
-elif '86' in CONFIG['TARGET_CPU']:
+elif CONFIG['INTEL_ARCHITECTURE']:
     # Accept x86, x86_64, i386, i686, etc.
     DEFINES['XZ_DEC_X86'] = 1
 

xpcom/reflect/xptcall/md/unix/moz.build

@@ -18,8 +18,6 @@ if CONFIG['OS_ARCH'] == 'Darwin':
         SOURCES += [
             'xptcinvoke_asm_x86_64_unix.S',
         ]
-    if '86' in CONFIG['OS_TEST'] and CONFIG['OS_TEST'] != 'x86_64':
-        DEFINES['MOZ_NEED_LEADING_UNDERSCORE'] = True
 
 if CONFIG['OS_ARCH'] == 'GNU':
     if CONFIG['CPU_ARCH'] == 'x86':
@@ -51,7 +49,7 @@ if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD'):
             'xptcstubs_ipf64.cpp'
         ]
 
-if CONFIG['OS_ARCH'] == 'SunOS' and '86' in CONFIG['OS_TEST']:
+if CONFIG['OS_ARCH'] == 'SunOS' and CONFIG['INTEL_ARCHITECTURE']:
     if CONFIG['OS_TEST'] == 'x86_64':
         if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
             SOURCES += [
@@ -273,7 +271,7 @@ if CONFIG['OS_ARCH'] in ('OpenBSD', 'FreeBSD', 'Linux') and CONFIG['OS_TEST'] ==
         'xptcstubs_sparc64_openbsd.cpp',
     ]
 
-if CONFIG['OS_ARCH'] == 'SunOS' and '86' not in CONFIG['OS_TEST']:
+if CONFIG['OS_ARCH'] == 'SunOS' and not CONFIG['INTEL_ARCHITECTURE']:
     if CONFIG['HAVE_64BIT_BUILD']:
         ASFLAGS += ['-xarch=v9']
         SOURCES += [