diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp | 23 |
2 files changed, 10 insertions, 15 deletions
@@ -28,7 +28,7 @@ vars = { "chromiumos_git": "https://chromium.googlesource.com/chromiumos", "skia_git": "https://skia.googlesource.com", "swig_revision": "230490", - "nacl_revision": "12710", + "nacl_revision": "12726", # After changing nacl_revision, run 'glient sync' and check native_client/DEPS # to update other nacl_*_revision's. "nacl_tools_revision": "12655", # native_client/DEPS: tools_rev diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp index 787d620..e251e3d2 100644 --- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp +++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp @@ -12,12 +12,16 @@ 'type': 'none', 'variables': { 'nlib_target': 'libpnacl_irt_shim.a', - 'out_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/libpnacl_irt_shim.a', - 'out_newlib32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/libpnacl_irt_shim.a', - 'out_newlib64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/libpnacl_irt_shim.a', + 'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/>(nlib_target)', + 'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/>(nlib_target)', + 'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/>(nlib_target)', 'build_glibc': 0, - 'build_newlib': 1, - 'force_arm_pnacl': 1, + 'build_newlib': 0, + 'build_pnacl_newlib': 1, + 'pnacl_native_biased': 1, + 'enable_x86_32': 1, + 'enable_x86_64': 1, + 'enable_arm': 1, 'sources': [ 'pnacl_shim.c', 'shim_entry.c', @@ -29,15 +33,6 @@ 'extra_args': [ '--strip-debug', ], - 'conditions': [ - ['target_arch=="arm"', { - 'compile_flags': [ - '--pnacl-allow-translate', - '--pnacl-allow-native', - '-arch', 'arm', - ], - }], - ], }, 'dependencies': [ '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |