From 24cc138c03e5e58dd3cd1536be0bbcdd6bd9ba49 Mon Sep 17 00:00:00 2001 From: dschuff Date: Thu, 25 Sep 2014 13:23:14 -0700 Subject: NaCl: Update revision in DEPS, r13759 -> r13783 This pulls in the following Native Client changes: r13760: (mseaborn) untrusted.gypi: Factor out duplicated "--gomadir" option r13761: (mseaborn) Fix mmap() with length > 0xffff0000 to behave consistently on 32/64-bit r13762: (teravest) Support file path metadata for the main nexe. r13763: (teravest) Add CreateNaClDescWithFilePathMetadata fn. r13764: (dschuff) Switch PNaCl lib, include, and translator directories for new layout r13765: (dschuff) Pass naclsdk_validate=0 to scons runs run by main waterfall bots r13768: (dbrazdil) Allowed decrementing program break with sbrk() in MinSFI r13769: (dyen) Added tests for rename functions in irt_ext. r13770: (dyen) Added tests for unlink functions irt_ext. r13771: (dschuff) Update revision for PNaCl r13753->r13769 r13772: (dyen) Added tests for fsync/fdatasync functions in irt_ext. r13773: (petarj) PNaCl: Update libcxx revision in pnacl/COMPONENT_REVISIONS r13774: (dyen) Added tests for file truncation functions in irt_ext. r13775: (sehr) Add Nick Bray and Shyam as owners of the validator r13776: (jvoung) Remember to va_end in callingconv test. r13777: (shyamsundarr) a script to generate a trie from our DFA. r13778: (shyamsundarr) updated version of mseaborn@chromium's old trie code. We will generate r13779: (dschuff) Allow build of host tools with system compiler r13780: (dyen) Added support for supplying futex calls under irt_ext. r13781: (dschuff) Remove archived_frontend test and use gcc build for FYI bots r13782: (dschuff) Clang and binutils for direct to nacl x86_64 r13783: (dschuff) Change prep_nacl_sdk header locations for PNaCl to match new layout r13784: (dschuff) Revert r13723, r13730, r13744 r13785: (dschuff) Revert "untrusted.gypi: Factor out duplicated "--gomadir" option" This also adjusts the SDK header copying script to put the libnacl headers in the new location for PNaCl. BUG=none TEST=browser_tests and nacl_integration CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_rel_precise32,linux_nacl_sdk,linux_chromium_dbg Review URL: https://codereview.chromium.org/597393003 Cr-Commit-Position: refs/heads/master@{#296781} --- .../pnacl_support_extension/pnacl_component_crx_gen.py | 11 ++--------- .../pnacl_support_extension/pnacl_support_extension.gyp | 8 ++++---- 2 files changed, 6 insertions(+), 13 deletions(-) (limited to 'ppapi') diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py index bdc6cbf..f3726c7 100755 --- a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py +++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py @@ -54,13 +54,6 @@ ARCHES = ['x86-32', 'x86-64', 'arm', 'mips32'] def IsValidArch(arch): return arch in ARCHES -# The version of the arch used by configure and pnacl's build.sh. -def StandardArch(arch): - return {'x86-32': 'i686', - 'x86-64': 'x86_64', - 'arm' : 'armv7', - 'mips32': 'mips'}[arch] - ###################################################################### @@ -170,11 +163,11 @@ class PnaclDirs(object): @staticmethod def LibDir(target_arch): - return J(PnaclDirs.TranslatorRoot(), 'lib-%s' % target_arch) + return J(PnaclDirs.TranslatorRoot(), 'translator', '%s' % target_arch) @staticmethod def SandboxedCompilerDir(target_arch): - return J(PnaclDirs.TranslatorRoot(), StandardArch(target_arch), 'bin') + return J(PnaclDirs.TranslatorRoot(), 'translator', target_arch, 'bin') @staticmethod def SetOutputDir(d): diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp index 8a048a4..db0c603 100644 --- a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp +++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp @@ -19,14 +19,14 @@ '<(DEPTH)/native_client/build/package_version/package_version.py', '<(DEPTH)/native_client/toolchain/.tars/<(TOOLCHAIN_OS)_x86/pnacl_translator.json', ], - 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/<(TOOLCHAIN_OS)_x86/pnacl_translator/pnacl_translator.json'], + 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_translator/pnacl_translator.json'], 'action': [ 'python', '<(DEPTH)/native_client/build/package_version/package_version.py', '--quiet', '--packages', 'pnacl_translator', '--tar-dir', '<(DEPTH)/native_client/toolchain/.tars', - '--dest-dir', '<(SHARED_INTERMEDIATE_DIR)', + '--dest-dir', '<(SHARED_INTERMEDIATE_DIR)/sdk', 'extract', ], }], @@ -52,7 +52,7 @@ 'inputs': [ 'pnacl_component_crx_gen.py', # A stamp file representing the contents of pnacl_translator. - '<(SHARED_INTERMEDIATE_DIR)/<(TOOLCHAIN_OS)_x86/pnacl_translator/pnacl_translator.json', + '<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_translator/pnacl_translator.json', '<(DEPTH)/native_client/pnacl/driver/pnacl_info_template.json', '<(DEPTH)/native_client/toolchain_revisions/pnacl_newlib.json', ], @@ -184,7 +184,7 @@ '<@(lib_overrides)', '--target_arch=<(target_arch)', '--info_template_path=<(DEPTH)/native_client/pnacl/driver/pnacl_info_template.json', - '--pnacl_translator_path=<(SHARED_INTERMEDIATE_DIR)/<(TOOLCHAIN_OS)_x86/pnacl_translator', + '--pnacl_translator_path=<(SHARED_INTERMEDIATE_DIR)/sdk/<(TOOLCHAIN_OS)_x86/pnacl_translator', '--package_version_path=<(DEPTH)/native_client/build/package_version/package_version.py', '--pnacl_package_name=pnacl_newlib', # ABI Version Number. -- cgit v1.1