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

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: '' 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
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 native_env = blob_env.Clone() 68 native_env = blob_env.Clone()
69 native_env.PNaClForceNative() 69 native_env.PNaClForceNative()
70 irt_support_objs.append(native_env.ComponentObject('aeabi_read_tp.o', 70 irt_support_objs.append(native_env.ComponentObject('aeabi_read_tp.o',
71 'aeabi_read_tp.S')) 71 'aeabi_read_tp.S'))
72 72
73 # These go into only one image or the other. 73 # These go into only one image or the other.
74 irt_nonbrowser = ['irt_interfaces.c', 74 irt_nonbrowser = ['irt_interfaces.c',
75 ] 75 ]
76 76
77 irt_browser = ['irt_interfaces_ppapi.c', 77 irt_browser = ['irt_interfaces_ppapi.c',
78 'irt_entry_ppapi.c',
78 'irt_ppapi.c', 79 'irt_ppapi.c',
80 'irt_manifest.c',
79 ] 81 ]
80 82
81 def LinkIrt(output, files, libs): 83 def LinkIrt(output, files, libs):
82 return blob_env.ComponentProgram(output, irt_support_objs + files, 84 return blob_env.ComponentProgram(output, irt_support_objs + files,
83 EXTRA_LIBS=libs + irt_support_libs) 85 EXTRA_LIBS=libs + irt_support_libs)
84 86
85 irt_core_library = LinkIrt('irt_core', irt_nonbrowser, []) 87 irt_core_library = LinkIrt('irt_core', irt_nonbrowser, [])
86 irt_library = LinkIrt('irt', irt_browser, ['ppruntime', 88 irt_library = LinkIrt('irt', irt_browser, ['ppruntime',
87 'srpc', 89 'srpc',
88 'imc_syscalls', 90 'imc_syscalls',
(...skipping 12 matching lines...) Expand all
101 # call to __nacl_read_tp, which the IRT code overrides to segregate 103 # call to __nacl_read_tp, which the IRT code overrides to segregate
102 # IRT-private TLS from user TLS. 104 # IRT-private TLS from user TLS.
103 node = env.CommandTest('irt_tls_test.out', 105 node = env.CommandTest('irt_tls_test.out',
104 ['${PYTHON}', env.File('check_tls.py'), 106 ['${PYTHON}', env.File('check_tls.py'),
105 '${OBJDUMP}', irt_library]) 107 '${OBJDUMP}', irt_library])
106 env.AddNodeToTestSuite(node, ['small_tests'], 'run_irt_tls_test') 108 env.AddNodeToTestSuite(node, ['small_tests'], 'run_irt_tls_test')
107 node = env.CommandTest('irt_core_tls_test.out', 109 node = env.CommandTest('irt_core_tls_test.out',
108 ['${PYTHON}', env.File('check_tls.py'), 110 ['${PYTHON}', env.File('check_tls.py'),
109 '${OBJDUMP}', irt_core_library]) 111 '${OBJDUMP}', irt_core_library])
110 env.AddNodeToTestSuite(node, ['small_tests'], 'run_irt_core_tls_test') 112 env.AddNodeToTestSuite(node, ['small_tests'], 'run_irt_core_tls_test')
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698