Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: src/untrusted/irt/nacl.scons

Issue 7605029: Extend IRT with nacl_irt_resource_open interface (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: fixed license Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/untrusted/irt/irt_manifest.c ('k') | tests/manifest_file/irt_manifest_file.nmf » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # -*- python -*- 1 # -*- python -*-
2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 6
7 Import('env') 7 Import('env')
8 8
9 # This module shouldn't be built in an environment that uses glibc. 9 # This module shouldn't be built in an environment that uses glibc.
10 if env.Bit('nacl_glibc'): 10 if env.Bit('nacl_glibc'):
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 native_env = blob_env.Clone() 70 native_env = blob_env.Clone()
71 native_env.PNaClForceNative() 71 native_env.PNaClForceNative()
72 irt_support_objs.append(native_env.ComponentObject('aeabi_read_tp.o', 72 irt_support_objs.append(native_env.ComponentObject('aeabi_read_tp.o',
73 'aeabi_read_tp.S')) 73 'aeabi_read_tp.S'))
74 74
75 # These go into only one image or the other. 75 # These go into only one image or the other.
76 irt_nonbrowser = ['irt_interfaces.c', 76 irt_nonbrowser = ['irt_interfaces.c',
77 ] 77 ]
78 78
79 irt_browser = ['irt_interfaces_ppapi.c', 79 irt_browser = ['irt_interfaces_ppapi.c',
80 'irt_entry_ppapi.c',
80 'irt_ppapi.c', 81 'irt_ppapi.c',
82 'irt_manifest.c',
81 ] 83 ]
82 84
83 def LinkIrt(output, files, libs): 85 def LinkIrt(output, files, libs):
84 return blob_env.ComponentProgram(output, irt_support_objs + files, 86 return blob_env.ComponentProgram(output, irt_support_objs + files,
85 EXTRA_LIBS=libs) 87 EXTRA_LIBS=libs)
86 88
87 irt_core_library = LinkIrt('irt_core', irt_nonbrowser, []) 89 irt_core_library = LinkIrt('irt_core', irt_nonbrowser, [])
88 irt_library = LinkIrt('irt', irt_browser, ['ppruntime', 90 irt_library = LinkIrt('irt', irt_browser, ['ppruntime',
89 'srpc', 91 'srpc',
90 'imc_syscalls', 92 'imc_syscalls',
(...skipping 12 matching lines...) Expand all
103 # call to __nacl_read_tp, which the IRT code overrides to segregate 105 # call to __nacl_read_tp, which the IRT code overrides to segregate
104 # IRT-private TLS from user TLS. 106 # IRT-private TLS from user TLS.
105 node = env.CommandTest('irt_tls_test.out', 107 node = env.CommandTest('irt_tls_test.out',
106 ['${PYTHON}', env.File('check_tls.py'), 108 ['${PYTHON}', env.File('check_tls.py'),
107 '${OBJDUMP}', irt_library]) 109 '${OBJDUMP}', irt_library])
108 env.AddNodeToTestSuite(node, ['small_tests'], 'run_irt_tls_test') 110 env.AddNodeToTestSuite(node, ['small_tests'], 'run_irt_tls_test')
109 node = env.CommandTest('irt_core_tls_test.out', 111 node = env.CommandTest('irt_core_tls_test.out',
110 ['${PYTHON}', env.File('check_tls.py'), 112 ['${PYTHON}', env.File('check_tls.py'),
111 '${OBJDUMP}', irt_core_library]) 113 '${OBJDUMP}', irt_core_library])
112 env.AddNodeToTestSuite(node, ['small_tests'], 'run_irt_core_tls_test') 114 env.AddNodeToTestSuite(node, ['small_tests'], 'run_irt_core_tls_test')
OLDNEW
« no previous file with comments | « src/untrusted/irt/irt_manifest.c ('k') | tests/manifest_file/irt_manifest_file.nmf » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698