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

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

Issue 883393005: Add IRT interface for PNaCl's sandboxed linker to use to talk to Chromium (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master
Patch Set: Add const Created 5 years, 10 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
OLDNEW
1 # -*- python -*- 1 # -*- python -*-
2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2012 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 26 matching lines...) Expand all
37 'irt_cond.c', 37 'irt_cond.c',
38 'irt_sem.c', 38 'irt_sem.c',
39 'irt_tls.c', 39 'irt_tls.c',
40 'irt_blockhook.c', 40 'irt_blockhook.c',
41 'irt_clock.c', 41 'irt_clock.c',
42 'irt_dev_getpid.c', 42 'irt_dev_getpid.c',
43 'irt_exception_handling.c', 43 'irt_exception_handling.c',
44 'irt_dev_list_mappings.c', 44 'irt_dev_list_mappings.c',
45 'irt_random.c', 45 'irt_random.c',
46 'irt_core_resource.c', 46 'irt_core_resource.c',
47 'irt_pnacl_translator.c',
47 ] 48 ]
48 49
49 # These are the objects and libraries that go into every IRT image. 50 # These are the objects and libraries that go into every IRT image.
50 irt_support_objs = [blob_env.ComponentObject(x) for x in irt_support_sources] 51 irt_support_objs = [blob_env.ComponentObject(x) for x in irt_support_sources]
51 52
52 # We also get nc_init_private.c, nc_thread.c and nc_tsd.c via 53 # We also get nc_init_private.c, nc_thread.c and nc_tsd.c via
53 # #includes of .c files. 54 # #includes of .c files.
54 irt_support_objs += [ 55 irt_support_objs += [
55 blob_env.ComponentObject(module, 56 blob_env.ComponentObject(module,
56 '${MAIN_DIR}/src/untrusted/pthread/%s.c' % module) 57 '${MAIN_DIR}/src/untrusted/pthread/%s.c' % module)
57 for module in ['nc_mutex', 58 for module in ['nc_mutex',
58 'nc_condvar']] 59 'nc_condvar']]
59 60
60 irt_support_objs += [ 61 irt_support_objs += [
61 blob_env.ComponentObject('sys_private', 62 blob_env.ComponentObject('sys_private',
62 '${MAIN_DIR}/src/untrusted/nacl/sys_private.c'), 63 '${MAIN_DIR}/src/untrusted/nacl/sys_private.c'),
63 blob_env.ComponentObject( 64 blob_env.ComponentObject(
64 'dynamic_annotations.o', 65 'dynamic_annotations.o',
65 '${MAIN_DIR}/src/untrusted/valgrind/dynamic_annotations.c'), 66 '${MAIN_DIR}/src/untrusted/valgrind/dynamic_annotations.c'),
66 ] 67 ]
67 68
68 # Build a library so that irt_support_objs can be used in tests that 69 # Build a library so that irt_support_objs can be used in tests that
69 # cover IRT-internal code. 70 # cover IRT-internal code.
70 env.ComponentLibrary('libirt_support_private', irt_support_objs) 71 env.ComponentLibrary('libirt_support_private', irt_support_objs)
71 72
72 irt_libs = ['platform', 'gio', 'm'] 73 irt_libs = ['srpc', 'imc_syscalls', 'platform', 'gio', 'm']
73 74
74 irt_core_raw = blob_env.ComponentProgram( 75 irt_core_raw = blob_env.ComponentProgram(
75 'irt_core_raw', irt_support_objs, EXTRA_LIBS=irt_libs) 76 'irt_core_raw', irt_support_objs, EXTRA_LIBS=irt_libs)
76 77
77 irt_core_nexe = blob_env.ApplyTLSEdit( 78 irt_core_nexe = blob_env.ApplyTLSEdit(
78 'irt_core.nexe', 79 'irt_core.nexe',
79 irt_core_raw) 80 irt_core_raw)
80 81
81 irt_core_library = blob_env.Install('${STAGING_DIR}', irt_core_nexe) 82 irt_core_library = blob_env.Install('${STAGING_DIR}', irt_core_nexe)
82 blob_env.Alias('irt_core', irt_core_library) 83 blob_env.Alias('irt_core', irt_core_library)
83 blob_env.ComponentProgramAlias(irt_core_library) 84 blob_env.ComponentProgramAlias(irt_core_library)
84 85
85 env.SDKInstallBin('irt_core.nexe', irt_core_library) 86 env.SDKInstallBin('irt_core.nexe', irt_core_library)
OLDNEW
« src/untrusted/irt/irt_pnacl_translator.c ('K') | « src/untrusted/irt/irt_pnacl_translator.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698