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

Side by Side Diff: src/shared/platform/nacl.scons

Issue 6839002: Pass -mtls-use-call when building libraries used in IRT. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: more comments; typo fix; conditionalize irt_tls.c vs bitcode Created 9 years, 8 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 2010 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 3 # Use of this source code is governed by a BSD-style license that can be
4 # be found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 Import('env') 6 Import('env')
7 env.Append(CCFLAGS=['-Wno-long-long']) 7 env.Append(CCFLAGS=['-Wno-long-long'])
8 8
9 # This library is linked into irt.nexe (see src/untrusted/irt/).
10 # All IRT code must avoid direct use of the TLS ABI register, which
11 # is reserved for user TLS. Instead, ensure all TLS accesses use a
12 # call to __nacl_read_tp, which the IRT code overrides to segregate
13 # IRT-private TLS from user TLS.
14 if not env.Bit('bitcode'):
15 env.Append(CCFLAGS=['-mtls-use-call'])
16
9 platform_inputs = [ 17 platform_inputs = [
10 'nacl_check.c', 18 'nacl_check.c',
11 'nacl_log.c', 19 'nacl_log.c',
12 'linux/condition_variable.cc', 20 'linux/condition_variable.cc',
13 'linux/lock.cc', 21 'linux/lock.cc',
14 'linux/nacl_exit.c', 22 'linux/nacl_exit.c',
15 'linux/nacl_threads.c', 23 'linux/nacl_threads.c',
16 'linux/nacl_timestamp.c', 24 'linux/nacl_timestamp.c',
17 'linux/time_linux.cc', 25 'linux/time_linux.cc',
18 'nacl_sync.cc', 26 'nacl_sync.cc',
19 'time.cc', 27 'time.cc',
20 ] 28 ]
21 29
22 env.ComponentLibrary('platform', platform_inputs) 30 env.ComponentLibrary('platform', platform_inputs)
23 31
24 headers = [ 32 headers = [
25 'nacl_check.h', 33 'nacl_check.h',
26 'nacl_log.h', 34 'nacl_log.h',
27 'nacl_threads.h', 35 'nacl_threads.h',
28 ] 36 ]
29 37
30 header_install = env.AddHeaderToSdk(headers) 38 header_install = env.AddHeaderToSdk(headers)
31 env.AddLibraryToSdk(['platform']) 39 env.AddLibraryToSdk(['platform'])
32 40
33 env.Requires('platform', header_install) 41 env.Requires('platform', header_install)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698