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

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

Issue 19288005: Factor linker flag which sets text segment into a function in SConstruct (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: comment on -Wn Created 7 years, 5 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 | « SConstruct ('k') | tests/irt_compatibility/nacl.scons » ('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) 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 # TODO(mseaborn): Enable -Wstrict-prototypes here. Currently 9 # TODO(mseaborn): Enable -Wstrict-prototypes here. Currently
10 # dlmalloc/malloc.c does not build with this warning. 10 # dlmalloc/malloc.c does not build with this warning.
11 env.FilterOut(CFLAGS=['-Wstrict-prototypes']) 11 env.FilterOut(CFLAGS=['-Wstrict-prototypes'])
12 12
13 # This module shouldn't be built in an environment that uses glibc. 13 # This module shouldn't be built in an environment that uses glibc.
14 if env.Bit('nacl_glibc'): 14 if env.Bit('nacl_glibc'):
15 raise UserError('src/untrusted/irt/nacl.scons in the wrong environment?') 15 raise UserError('src/untrusted/irt/nacl.scons in the wrong environment?')
16 16
17 blob_env = env.Clone() 17 blob_env = env.Clone()
18 blob_env.Append(LINKFLAGS=[blob_env.RodataSwitch('${IRT_BLOB_DATA_START}'), 18 blob_env.Append(LINKFLAGS=[blob_env.RodataSwitch('${IRT_BLOB_DATA_START}'),
19 '-Wl,-Ttext-segment=${IRT_BLOB_CODE_START}']) 19 blob_env.TextSwitch('${IRT_BLOB_CODE_START}')])
20 20
21 irt_support_sources = [ 21 irt_support_sources = [
22 'irt_malloc.c', 22 'irt_malloc.c',
23 'irt_private_pthread.c', 23 'irt_private_pthread.c',
24 'irt_private_tls.c', 24 'irt_private_tls.c',
25 ] 25 ]
26 26
27 irt_entry_obj = blob_env.ComponentObject('irt_entry.c') 27 irt_entry_obj = blob_env.ComponentObject('irt_entry.c')
28 28
29 # NACL_GC_WRAP_SYSCALL uses ({...}) syntax. 29 # NACL_GC_WRAP_SYSCALL uses ({...}) syntax.
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 and not env.Bit('built_elsewhere')): 126 and not env.Bit('built_elsewhere')):
127 check_tls_arch = '${TARGET_FULLARCH}' 127 check_tls_arch = '${TARGET_FULLARCH}'
128 if env.Bit('build_arm'): 128 if env.Bit('build_arm'):
129 check_tls_arch = 'arm' 129 check_tls_arch = 'arm'
130 node = env.CommandTest('irt_core_tls_test.out', 130 node = env.CommandTest('irt_core_tls_test.out',
131 ['${PYTHON}', env.File('check_tls.py'), 131 ['${PYTHON}', env.File('check_tls.py'),
132 check_tls_arch, '${OBJDUMP}', irt_core_library], 132 check_tls_arch, '${OBJDUMP}', irt_core_library],
133 # don't run ${PYTHON} under the emulator. 133 # don't run ${PYTHON} under the emulator.
134 direct_emulation=False) 134 direct_emulation=False)
135 env.AddNodeToTestSuite(node, ['small_tests'], 'run_irt_core_tls_test') 135 env.AddNodeToTestSuite(node, ['small_tests'], 'run_irt_core_tls_test')
OLDNEW
« no previous file with comments | « SConstruct ('k') | tests/irt_compatibility/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698