Remove NACL_BUILD_ARCH_MAP

Remove NACL_BUILD_ARCH_MAP.

This mapping is no longer necessary now that build_config.h provides these definitions.

The only exception is when NACL_BUILD_ARCH=pnacl should be defined, which build_config.h doesn't have the necessary information to detect.

BUG=https://code.google.com/p/chromium/issues/detail?id=440012

Committed: https://chromium.googlesource.com/native_client/src/native_client/+/1e45f86b3f0b78399d853fd187e8a3d515b1a38f

[teravest, 2015-03-30 21:45:37]

teravest@chromium.org changed reviewers:
+ ncbray@chromium.org

[Nick Bray (chromium), 2015-03-31 00:25:23]

LGTM, but write a decent commit message and BUG= before committing.

https://codereview.chromium.org/1039253003/diff/1/build/build_nexe.py
File build/build_nexe.py (right):

https://codereview.chromium.org/1039253003/diff/1/build/build_nexe.py#newcode341
build/build_nexe.py:341: define_list.extend(['NACL_BUILD_ARCH=pnacl'])
I assume the header doesn't clobber this when it's overridden.

Meta question: is this the officially support way to build for pnacl, or is
there a cleaner alternative?

[teravest, 2015-03-31 14:05:24]

On 2015/03/31 00:25:23, Nick Bray (chromium) wrote:
> LGTM, but write a decent commit message and BUG= before committing.
> 
> https://codereview.chromium.org/1039253003/diff/1/build/build_nexe.py
> File build/build_nexe.py (right):
> 
>
https://codereview.chromium.org/1039253003/diff/1/build/build_nexe.py#newcode341
> build/build_nexe.py:341: define_list.extend(['NACL_BUILD_ARCH=pnacl'])
> I assume the header doesn't clobber this when it's overridden.

That's correct.

> 
> Meta question: is this the officially support way to build for pnacl, or is
> there a cleaner alternative?

I'd like to cover this case in build_config.h, but haven't found a good way to
do that yet.

[teravest, 2015-03-31 14:09:16]

The CQ bit was checked by teravest@chromium.org

[commit-bot: I haz the power, 2015-03-31 14:09:27]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1039253003/1

[commit-bot: I haz the power, 2015-03-31 15:07:08]

Committed patchset #1 (id:1) as
https://chromium.googlesource.com/native_client/src/native_client/+/1e45f86b3...

[JF, 2015-04-04 16:40:08]

jfb@chromium.org changed reviewers:
+ jfb@chromium.org

[JF, 2015-04-04 16:40:09]

This change broke the PNaCl FYI bots for x86-32 tests MIPS:

 
http://chromegw.corp.google.com/i/client.nacl.toolchain/builders/linux-pnacl-...

In file included from posix/nacl_threads.c:30:
../../../../native_client/src/trusted/service_runtime/nacl_config.h:153:5:error:
'NACL_NACL_BUILD_ARCH' is not defined, evaluates to 0 [-Werror,-Wundef]
#if NACL_ARCH(NACL_BUILD_ARCH) == NACL_x86
    ^
../../../../native_client/src/include/nacl_base.h:65:22: note: expanded from
macro 'NACL_ARCH'
#define NACL_ARCH(x) NACL_MERGE(NACL_, x)
                     ^
../../../../native_client/src/include/nacl_base.h:64:26: note: expanded from
macro 'NACL_MERGE'
#define NACL_MERGE(x, y) x ## y
                         ^
<scratch space>:37:1: note: expanded from here
NACL_NACL_BUILD_ARCH
^



Please submit a CL to fix.

[teravest, 2015-04-06 15:13:35]

A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/1056363003/ by teravest@chromium.org.

The reason for reverting is: build_nexe.py may perform cross-compliation with
the "--arch flag"; it looks like one of the PNaCl FYI bots builds MIPS nexes on
a x86_32 without defining the __mipsel__ flag.

I'd prefer to revert instead of hacking around this for MIPS; I'm a bit confused
as to why the output from the FYI bot is using pnacl-clang and gcc and don't
want to..

[petarj, 2015-04-06 15:39:19]

On 2015/04/06 15:13:35, teravest wrote:
> A revert of this CL (patchset #1 id:1) has been created in
> https://codereview.chromium.org/1056363003/ by mailto:teravest@chromium.org.
> 
> The reason for reverting is: build_nexe.py may perform cross-compliation with
> the "--arch flag"; it looks like one of the PNaCl FYI bots builds MIPS nexes
on
> a x86_32 without defining the __mipsel__ flag.
> 
> I'd prefer to revert instead of hacking around this for MIPS; I'm a bit
confused
> as to why the output from the FYI bot is using pnacl-clang and gcc and don't
> want to..

I believe it's fine if you just add "--pnacl-bias=mips32", i.e. you can likely
fix this with:

diff --git a/build/untrusted.gypi b/build/untrusted.gypi
index 77b9f11..512deec 100755
--- a/build/untrusted.gypi
+++ b/build/untrusted.gypi
@@ -1062,7 +1062,7 @@
                   '--name', '>(out_newlib_mips)',
                   '--objdir', '>(objdir_newlib_mips)',
                   '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs)
>(_include_dirs)',
-                  '--compile_flags=^(compile_flags) >(_compile_flags)
^(pnacl_compile_flags) >(_pnacl_compile_flags)',
+                  '--compile_flags=--pnacl-bias=mips32 ^(compile_flags)
>(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
                   '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B>(tc_lib_dir_newlib_mips) ^(link_flags)
>(_link_flags)',
@@ -1105,7 +1105,7 @@
                   '--name', '>(out_newlib_mips)',
                   '--objdir', '>(objdir_newlib_mips)',
                   '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs)
>(_include_dirs)',
-                  '--compile_flags=^(compile_flags) >(_compile_flags)
^(pnacl_compile_flags) >(_pnacl_compile_flags)',
+                  '--compile_flags=--pnacl-bias=mips32 ^(compile_flags)
>(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
                   '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-arch mips --pnacl-allow-translate
--pnacl-allow-native -Wt,-mtls-use-call --pnacl-disable-abi-check
-B>(tc_lib_dir_irt_mips) -L>(tc_lib_dir_irt_mips) ^(pnacl_irt_link_flags)
^(link_flags) >(_link_flags) >(libcpp_irt_stdlibs)',
@@ -1148,7 +1148,7 @@
                   '--name', '>(out_newlib_mips)',
                   '--objdir', '>(objdir_newlib_mips)',
                   '--include-dirs=>(tc_include_dir_newlib) ^(include_dirs)
>(_include_dirs)',
-                  '--compile_flags=-Wt,-mtls-use-call ^(compile_flags)
>(_compile_flags) ^(pnacl_compile_flags) >(_pnacl_compile_flags)',
+                  '--compile_flags=--pnacl-bias=mips32 -Wt,-mtls-use-call
^(compile_flags) >(_compile_flags) ^(pnacl_compile_flags)
>(_pnacl_compile_flags)',
                   '--gomadir', '<(gomadir)',
                   '--defines=^(defines) >(_defines)',
                   '--link_flags=-B>(tc_lib_dir_irt_mips)
-L>(tc_lib_dir_irt_mips) ^(pnacl_irt_link_flags) ^(link_flags) >(_link_flags)',