Index: pnacl/driver/pnacl-translate.py |
diff --git a/pnacl/driver/pnacl-translate.py b/pnacl/driver/pnacl-translate.py |
index eac4bf3dc77ccd12ad5b95193d53aed658007d73..81224234cfbf61b5eff079013069e869a3e20dad 100755 |
--- a/pnacl/driver/pnacl-translate.py |
+++ b/pnacl/driver/pnacl-translate.py |
@@ -240,7 +240,9 @@ def SetUpArch(): |
'X8664': 'x86_64-none-nacl-gnu', |
'ARM': 'armv7a-none-nacl-gnueabihf', |
'MIPS32': 'mipsel-none-nacl-gnu'}, |
- 'linux': {'X8632': 'i686-linux-gnu'}, |
+ 'linux': |
+ {'X8632': 'i686-linux-gnu', |
+ 'X8664': 'x86_64-linux-gnux32'}, |
'mac': {'X8632': 'i686-apple-darwin'}} |
env.set('TRIPLE', triple_map[env.getone('TARGET_OS')][base_arch]) |
@@ -281,7 +283,7 @@ def SetUpArch(): |
env.append('SZ_FLAGS_ARCH', '--sandbox=' + |
('1' if env.getone('TARGET_OS') == 'nacl' else '0')) |
env.append('SZ_FLAGS_ARCH', '--target=' + base_arch.lower()) |
- if base_arch != 'X8632': |
+ if base_arch not in ['ARM32', 'X8632', 'X8664']: |
Jim Stichnoth
2015/12/22 17:36:27
This needs more precision about which configuratio
John
2015/12/22 18:12:00
I was thinking about that. Reverting for now, unti
|
env.set('SZ_UNSUPPORTED', '1') |
# Hard-fail on an unsupported architecture. |
if env.getbool('USE_SZ'): |