PNaCl. Enables x32 libraries for non-sfi runtime.

toolchain_build/pnacl_targetlibs.py

Index: toolchain_build/pnacl_targetlibs.py
diff --git a/toolchain_build/pnacl_targetlibs.py b/toolchain_build/pnacl_targetlibs.py
index a2a9f0479f47b4cc89dbfbd8f2fce8b5604bb218..73ef3e423c03645eeaec8b17d76e1e5f978ebefa 100755
--- a/toolchain_build/pnacl_targetlibs.py
+++ b/toolchain_build/pnacl_targetlibs.py
@@ -817,17 +817,22 @@ def TranslatorLibs(arch, is_canonical, no_nacl_gcc):
   return libs
 
 def UnsandboxedRuntime(arch, is_canonical):
-  assert arch in ('arm-linux', 'x86-32-linux', 'x86-32-mac')
+  assert arch in ('arm-linux', 'x86-32-linux', 'x86-32-mac', 'x86-64-linux')
 
-  prefix = {
-    'arm-linux': 'arm-linux-gnueabihf-',
-    'x86-32-linux': '',
-    'x86-32-mac': '',
+  compiler = {
+    'arm-linux': 'arm-linux-gnueabihf-gcc',
+    'x86-32-linux': 'gcc',
+    'x86-32-mac': 'gcc',
+    # x86-64 can't use gcc because the gcc available in the bots does not
+    # support x32. clang is good enough for the task, and it is available in
+    # the bots.
+    'x86-64-linux': '%(abs_target_lib_compiler)s/bin/clang',

[Petr Hosek, 2015/12/22 17:26:41]

Couldn't we use clang for other targets as well?

[John, 2015/12/22 18:12:00]

clang fails to build the arm unsandboxed runtime:

@@@BUILD_STEP unsandboxed_runtime_arm_linux (build)@@@
Running:
subprocess.check_call(['/usr/local/google/home/jpp/work/nacl/native_client/toolchain_build/out/target_lib_compiler_install/target_lib_compiler/bin/clang',
'-target=arm-linux-gnueabihf', '-mcpu=cortex-a9', '-D__arm_nonsfi_linux__',
'-O2', '-Wall', '-Werror', '-I../../../..', '-DNACL_LINUX=1', '-DDEFINE_MAIN',
'-c', '../../../src/nonsfi/irt/irt_interfaces.c', '-o',
'../unsandboxed_runtime_arm_linux_install/translator/arm-linux/lib/unsandboxed_irt.o'],
cwd='/usr/local/google/home/jpp/work/nacl/native_client/toolchain_build/out/unsandboxed_runtime_arm_linux_work')
In file included from ../../../src/nonsfi/irt/irt_interfaces.c:11:
/usr/include/pthread.h:692:6: error: 'regparm' is not valid on this platform
     __cleanup_fct_attribute;
     ^~~~~~~~~~~~~~~~~~~~~~~
/usr/include/bits/pthreadtypes.h:246:50: note: expanded from macro
'__cleanup_fct_attribute'
# define __cleanup_fct_attribute __attribute__ ((__regparm__ (1)))
                                                 ^            ~
In file included from ../../../src/nonsfi/irt/irt_interfaces.c:11:
/usr/include/pthread.h:704:3: error: 'regparm' is not valid on this platform
  __cleanup_fct_attribute;
  ^~~~~~~~~~~~~~~~~~~~~~~
/usr/include/bits/pthreadtypes.h:246:50: note: expanded from macro
'__cleanup_fct_attribute'
# define __cleanup_fct_attribute __attribute__ ((__regparm__ (1)))
                                                 ^            ~
In file included from ../../../src/nonsfi/irt/irt_interfaces.c:11:
/usr/include/pthread.h:745:6: error: 'regparm' is not valid on this platform
     __cleanup_fct_attribute __attribute__ ((__noreturn__))
     ^~~~~~~~~~~~~~~~~~~~~~~
/usr/include/bits/pthreadtypes.h:246:50: note: expanded from macro
'__cleanup_fct_attribute'
# define __cleanup_fct_attribute __attribute__ ((__regparm__ (1)))
                                                 ^            ~
3 errors generated.
Error building unsandboxed_runtime_arm_linux: Command
'['/usr/local/google/home/jpp/work/nacl/native_client/toolchain_build/out/target_lib_compiler_install/target_lib_compiler/bin/clang',
'-target=arm-linux-gnueabihf', '-mcpu=cortex-a9', '-D__arm_nonsfi_linux__',
'-O2', '-Wall', '-Werror', '-I../../../..', '-DNACL_LINUX=1', '-DDEFINE_MAIN',
'-c', '../../../src/nonsfi/irt/irt_interfaces.c', '-o',
'../unsandboxed_runtime_arm_linux_install/translator/arm-linux/lib/unsandboxed_irt.o']'
returned non-zero exit status 1

So I'll leave this as is.

   }[arch]
   arch_cflags = {
     'arm-linux': ['-mcpu=cortex-a9', '-D__arm_nonsfi_linux__'],
     'x86-32-linux': ['-m32'],
     'x86-32-mac': ['-m32'],
+    'x86-64-linux': ['-mx32'],
   }[arch]
 
   libs = {
@@ -848,16 +853,16 @@ def UnsandboxedRuntime(arch, is_canonical):
               # even on non-Linux systems is OK.
               # TODO(dschuff): this include path breaks the input encapsulation
               # for build rules.
-              command.Command([prefix + 'gcc'] + arch_cflags + ['-O2', '-Wall',
+              command.Command([compiler] + arch_cflags + ['-O2', '-Wall',
                   '-Werror', '-I%(top_srcdir)s/..',
                   '-DNACL_LINUX=1', '-DDEFINE_MAIN',
                   '-c', command.path.join('%(support)s', 'irt_interfaces.c'),
                   '-o', command.path.join('%(output)s', 'unsandboxed_irt.o')]),
-              command.Command([prefix + 'gcc'] + arch_cflags + ['-O2', '-Wall',
+              command.Command([compiler] + arch_cflags + ['-O2', '-Wall',
                   '-Werror', '-I%(top_srcdir)s/..',
                   '-c', command.path.join('%(support)s', 'irt_random.c'),
                   '-o', command.path.join('%(output)s', 'irt_random.o')]),
-              command.Command([prefix + 'gcc'] + arch_cflags + ['-O2', '-Wall',
+              command.Command([compiler] + arch_cflags + ['-O2', '-Wall',
                   '-Werror', '-I%(top_srcdir)s/..',
                   '-c', command.path.join('%(untrusted)s', 'irt_query_list.c'),
                   '-o', command.path.join('%(output)s', 'irt_query_list.o')]),