Revert of Remove NACL_BUILD_ARCH_MAP

build/build_nexe.py

 #!/usr/bin/python
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """NEXE building script
 
 This module will take a set of source files, include paths, library paths, and
 additional arguments, and use them to build.
 """
@@ skipping 13 matching lines @@
 import time
 import traceback
 import urllib2
 
 from build_nexe_tools import (CommandRunner, Error, FixPath,
                               IsFile, MakeDir, RemoveFile)
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 import pynacl.platform
 
 
+# When a header file defining NACL_BUILD_SUBARCH is introduced,
+# we can simply remove this map.
+# cf) https://code.google.com/p/chromium/issues/detail?id=440012.
+NACL_BUILD_ARCH_MAP = {
+  'x86-32': ['NACL_BUILD_ARCH=x86', 'NACL_BUILD_SUBARCH=32'],
+  'x86-32-nonsfi': ['NACL_BUILD_ARCH=x86', 'NACL_BUILD_SUBARCH=32'],
+  'x86-64': ['NACL_BUILD_ARCH=x86', 'NACL_BUILD_SUBARCH=64'],
+  'arm': ['NACL_BUILD_ARCH=arm', 'NACL_BUILD_SUBARCH=32'],
+  'arm-nonsfi': ['NACL_BUILD_ARCH=arm', 'NACL_BUILD_SUBARCH=32'],
+  'mips': ['NACL_BUILD_ARCH=mips', 'NACL_BUILD_SUBARCH=32'],
+  'pnacl': ['NACL_BUILD_ARCH=pnacl'],
+}
+
+
 def RemoveQuotes(opt):
   if opt and opt[0] == '"':
     assert opt[-1] == '"', opt
     return opt[1:-1].replace('\\"', '"')
   return opt
 
 
 def ArgToList(opt):
   outlist = []
   if opt is None:
@@ skipping 286 matching lines @@
                            define.startswith('NACL_BUILD_ARCH=') or
                            define.startswith('NACL_BUILD_SUBARCH=') or
                            define == 'COMPONENT_BUILD' or
                            'WIN32' in define or
                            'WINDOWS' in define or
                            'WINVER' in define)]
     define_list.extend(['NACL_WINDOWS=0',
                         'NACL_OSX=0',
                         'NACL_LINUX=0',
                         'NACL_ANDROID=0'])
-    if arch == 'pnacl':
-      define_list.extend(['NACL_BUILD_ARCH=pnacl'])
+    define_list.extend(NACL_BUILD_ARCH_MAP[arch])
     options += ['-D' + define for define in define_list]
     self.compile_options = options + ['-I' + name for name in self.inc_paths]
 
   def BuildLinkOptions(self, options):
     """Generates link options, called once by __init__."""
     options = ArgToList(options)
     if self.outtype == 'nso':
       options += ['-Wl,-rpath-link,' + name for name in self.lib_paths]
       options += ['-shared']
       options += ['-Wl,-soname,' + os.path.basename(self.Soname())]
@@ skipping 666 matching lines @@
     if build is not None:
       build.EmitDeferredLog()
     return 1
   except:
     if build is not None:
       build.EmitDeferredLog()
     raise
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))