Bug 1477081 - remove TARGET_CPU use from moz.build files; r=ted.mielczarek

TARGET_CPU is not canonicalized, whereas CPU_ARCH is, so we should be
using CPU_ARCH to get consistent values everywhere.

build/unix/elfhack/inject/moz.build

@@ -10,12 +10,7 @@ Library('elfhack_inject')
 
 DIST_INSTALL = False
 
-if CONFIG['TARGET_CPU'].endswith('86'):
-    cpu = 'x86'
-elif CONFIG['TARGET_CPU'].startswith('arm'):
-    cpu = 'arm'
-else:
-    cpu = CONFIG['TARGET_CPU']
+cpu = CONFIG['CPU_ARCH']
 
 gen_src = '%s.c' % cpu
 GENERATED_FILES += [

media/libtremor/lib/moz.build

@@ -24,7 +24,7 @@ FINAL_LIBRARY = 'gkmedias'
 if CONFIG['OS_ARCH'] == 'AIX':
     DEFINES['alloca'] = '__alloca'
 
-if CONFIG['TARGET_CPU'] == 'arm' and CONFIG['CC_TYPE'] in ('clang', 'gcc') and not CONFIG['MOZ_THUMB2']:
+if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['CC_TYPE'] in ('clang', 'gcc') and not CONFIG['MOZ_THUMB2']:
     DEFINES['_ARM_ASSEM_'] = True
 
 LOCAL_INCLUDES += [

modules/xz-embedded/moz.build

@@ -21,7 +21,7 @@ UNIFIED_SOURCES += [
 
 AllowCompilerWarnings()
 
-if CONFIG['TARGET_CPU'].startswith('arm'):
+if CONFIG['CPU_ARCH'] == 'arm':
     # Accept arm, armv7, etc.
     if CONFIG['MOZ_THUMB2']:
         DEFINES['XZ_DEC_ARMTHUMB'] = 1

mozglue/build/moz.build

@@ -130,7 +130,7 @@ if CONFIG['OS_TARGET'] == 'Darwin':
     # for TLS.
     LDFLAGS += ['-Wl,-bind_at_load']
 
-if CONFIG['MOZ_LINKER'] and CONFIG['TARGET_CPU'] == 'arm':
+if CONFIG['MOZ_LINKER'] and CONFIG['CPU_ARCH'] == 'arm':
     LDFLAGS += ['-Wl,-version-script,%s/arm-eabi-filter' % SRCDIR]
 
 DIST_INSTALL = True

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

@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-if CONFIG['TARGET_CPU'] == 'x86_64':
+if CONFIG['CPU_ARCH'] == 'x86_64':
     if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
         SOURCES += [
             'xptcinvoke_x86_64.cpp',