From 695cb9d23b0da6376b777ac971ac2b368f56f0f8 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Tue, 24 Jul 2018 16:08:55 -0400
Subject: [PATCH] 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      | 7 +------
 media/libtremor/lib/moz.build            | 2 +-
 modules/xz-embedded/moz.build            | 2 +-
 mozglue/build/moz.build                  | 2 +-
 xpcom/reflect/xptcall/md/win32/moz.build | 2 +-
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/build/unix/elfhack/inject/moz.build b/build/unix/elfhack/inject/moz.build
index 1a58cb08df2b..061f25191161 100644
--- a/build/unix/elfhack/inject/moz.build
+++ b/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 += [
diff --git a/media/libtremor/lib/moz.build b/media/libtremor/lib/moz.build
index 204ce20430ac..11d49a744aea 100644
--- a/media/libtremor/lib/moz.build
+++ b/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 += [
diff --git a/modules/xz-embedded/moz.build b/modules/xz-embedded/moz.build
index e839440d284e..4520d9f6583e 100644
--- a/modules/xz-embedded/moz.build
+++ b/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
diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
index af41ed77c9db..b3d9dfc387fe 100644
--- a/mozglue/build/moz.build
+++ b/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
diff --git a/xpcom/reflect/xptcall/md/win32/moz.build b/xpcom/reflect/xptcall/md/win32/moz.build
index 6722a5be7c08..528858088bf3 100644
--- a/xpcom/reflect/xptcall/md/win32/moz.build
+++ b/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',