diff options
Diffstat (limited to 'chromium/native_client/src/untrusted')
5 files changed, 6 insertions, 140 deletions
diff --git a/chromium/native_client/src/untrusted/irt/check_tls.gypi b/chromium/native_client/src/untrusted/irt/check_tls.gypi deleted file mode 100644 index 89764974cbe..00000000000 --- a/chromium/native_client/src/untrusted/irt/check_tls.gypi +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright (c) 2012 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This file is used via 'includes' by an irt_test.gyp both here and in -# chromium/src/ppapi/native_client. The including file must first -# set the variable 'irt_test_nexe' (e.g. to 'irt_core'); setting that to '' -# (the empty string) instructs this file to run the test on the -# nacl_irt_*.nexe file instead of a named one. The including file must -# also set the variable 'irt_test_dep' to the 'foo.gyp:bar' Gyp target that -# builds the nexe to be tested. - -{ - 'conditions': [ - ['irt_test_nexe==""', { - 'variables': { - 'check_tls_nexe': '>(nacl_irt_name).nexe', - 'check_tls_target': 'nacl_irt', - }, - }, { - 'variables': { - 'check_tls_nexe': '<(irt_test_nexe)_>(nexe_suffix).nexe', - 'check_tls_target': '<(irt_test_nexe)', - }, - }] - ], - 'targets': [ - { - 'target_name': '<(check_tls_target)_tls_check', - 'type': 'none', - 'dependencies': [ - '<(DEPTH)/native_client/tools.gyp:untar_toolchains', - '<(irt_test_dep)', - ], - 'actions': [ - { - 'action_name': 'run_tls_check', - 'msvs_cygwin_shell': 0, - 'inputs': [ - '<(PRODUCT_DIR)/<(check_tls_nexe)', - ], - 'outputs': ['<(PRODUCT_DIR)/<(_target_name).out'], - 'message': 'Sanity-checking TLS usage in <(check_tls_nexe)', - 'conditions': [ - ['target_arch=="arm"', { - 'variables': { - 'nacl_objdump': - '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_pnacl/host_x86_32/bin/le32-nacl-objdump', - }, - }, { - # target_arch!="arm", so it's x86. - 'variables': { - 'nacl_objdump': - '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/bin/x86_64-nacl-objdump', - }, - }], - ['target_arch=="x64"', { - 'variables': { - 'check_tls_arch': 'x86-64', - 'nexe_suffix': 'newlib_x64', - 'nacl_irt_name': 'nacl_irt_x86_64', - }, - }], - ['target_arch=="ia32"', { - 'variables': { - 'check_tls_arch': 'x86-32', - 'nexe_suffix': 'newlib_x32', - 'nacl_irt_name': 'nacl_irt_x86_32', - }, - }], - ['target_arch=="arm"', { - 'variables': { - 'check_tls_arch': 'arm', - 'nexe_suffix': 'newlib_arm', - 'nacl_irt_name': 'nacl_irt_arm', - }, - }], - ], - 'action': ['python', - '<(DEPTH)/native_client/src/untrusted/irt/check_tls.py', - '<(check_tls_arch)', '<(nacl_objdump)', - '<@(_inputs)', '<@(_outputs)'], - }, - ], - }, - ], -} diff --git a/chromium/native_client/src/untrusted/irt/irt.gyp b/chromium/native_client/src/untrusted/irt/irt.gyp index ef24b3f0190..3ff530861e0 100644 --- a/chromium/native_client/src/untrusted/irt/irt.gyp +++ b/chromium/native_client/src/untrusted/irt/irt.gyp @@ -10,6 +10,7 @@ 'irt_sources': [ # irt_support_sources 'irt_entry.c', + 'irt_interfaces.c', 'irt_malloc.c', 'irt_private_pthread.c', 'irt_private_tls.c', @@ -41,12 +42,10 @@ '../valgrind/dynamic_annotations.c', ], 'irt_nonbrowser': [ - 'irt_interfaces.c', 'irt_core_resource.c', + 'irt_entry_core.c', ], 'irt_browser': [ - 'irt_interfaces_ppapi.c', - 'irt_ppapi.c', 'irt_manifest.c', ], }, @@ -68,18 +67,11 @@ '-lgio', '-lm', ], - 'conditions': [ - # See comment in native_client/src/untrusted/irt/nacl.scons - # regarding -Ttext-segment. - ['target_arch=="arm"', { - 'sources': ['<@(irt_sources)', - 'aeabi_read_tp.S'], - }], - ], 'dependencies': [ '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib', + '<(DEPTH)/native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib', '<(DEPTH)/native_client/tools.gyp:prep_toolchain', @@ -95,12 +87,6 @@ 'build_irt': 1, }, 'sources': ['<@(irt_sources)', '<@(irt_browser)'], - 'include_dirs': ['../../../../ppapi'], - 'conditions': [ - ['target_arch=="arm"', { - 'sources': [ 'aeabi_read_tp.S' ], - }], - ], 'dependencies': [ '<(DEPTH)/native_client/tools.gyp:prep_toolchain', '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib', diff --git a/chromium/native_client/src/untrusted/irt/irt_test.gyp b/chromium/native_client/src/untrusted/irt/irt_test.gyp deleted file mode 100644 index 85238b4937f..00000000000 --- a/chromium/native_client/src/untrusted/irt/irt_test.gyp +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2012 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'irt_test_nexe': 'irt_core', - 'irt_test_dep': 'irt.gyp:irt_core_nexe', - }, - 'includes': [ - '../../../build/common.gypi', - 'check_tls.gypi', - ], -} diff --git a/chromium/native_client/src/untrusted/nacl/nacl.gyp b/chromium/native_client/src/untrusted/nacl/nacl.gyp index 3c27dfff858..8528f93b5f8 100644 --- a/chromium/native_client/src/untrusted/nacl/nacl.gyp +++ b/chromium/native_client/src/untrusted/nacl/nacl.gyp @@ -25,9 +25,11 @@ 'ftruncate.c', 'getcwd.c', 'getdents.c', + 'gethostname.c', 'getpagesize.c', 'getpid.c', 'gettimeofday.c', + 'isatty.c', 'link.c', 'lock.c', 'lseek.c', @@ -288,6 +290,7 @@ 'nso_target': 'libimc_syscalls.so', 'build_glibc': 1, 'build_newlib': 1, + 'build_pnacl_newlib': 1, 'build_irt': 1, }, 'sources': ['<@(imc_syscalls)'], diff --git a/chromium/native_client/src/untrusted/pthread/pthread.gyp b/chromium/native_client/src/untrusted/pthread/pthread.gyp index 212ebaa8d80..5107f032833 100644 --- a/chromium/native_client/src/untrusted/pthread/pthread.gyp +++ b/chromium/native_client/src/untrusted/pthread/pthread.gyp @@ -32,27 +32,5 @@ '<(DEPTH)/native_client/tools.gyp:prep_toolchain', ], }, - { - 'target_name': 'pthread_private_lib', - 'type': 'none', - 'variables': { - 'nlib_target': 'libpthread_private.a', - 'build_glibc': 0, - 'build_newlib': 1, - 'build_pnacl_newlib': 1, - }, - 'sources': [ - '<@(common_sources)', - 'nc_init_private.c', - '../irt/irt_blockhook.c', - '../irt/irt_cond.c', - '../irt/irt_mutex.c', - '../irt/irt_sem.c', - ], - 'dependencies': [ - '<(DEPTH)/native_client/tools.gyp:prep_toolchain', - 'pthread_lib' - ], - }, ], } |