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

Side by Side Diff: src/shared/ppapi_proxy/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 7
8 # Underlay $SOURCE_ROOT/gpu in this directory. 8 # Underlay $SOURCE_ROOT/gpu in this directory.
9 Dir('.').addRepository(Dir('#/../gpu')) 9 Dir('.').addRepository(Dir('#/../gpu'))
10 10
11 # To enable getting the generated include files and sources and also common and 11 # To enable getting the generated include files and sources and also common and
12 # client GPU command buffer sources. 12 # client GPU command buffer sources.
13 env.Append(CPPPATH= 13 env.Append(CPPPATH=
14 ['${SOURCE_ROOT}/native_client/src/shared/ppapi_proxy/untrusted', 14 ['${SOURCE_ROOT}/native_client/src/shared/ppapi_proxy/untrusted',
15 '$SOURCE_ROOT/gpu']) 15 '$SOURCE_ROOT/gpu'])
16 16
17 env.Append(CPPDEFINES=['XP_UNIX']) 17 env.Append(CPPDEFINES=['XP_UNIX'])
18 env.FilterOut(CCFLAGS=['-Wswitch-enum']) 18 env.FilterOut(CCFLAGS=['-Wswitch-enum'])
19 env.Append(CCFLAGS=['-Wno-long-long']) 19 env.Append(CCFLAGS=['-Wno-long-long'])
20 20
21 # This library is linked into irt.nexe (see src/untrusted/irt/).
22 # All IRT code must avoid direct use of the TLS ABI register, which
23 # is reserved for user TLS. Instead, ensure all TLS accesses use a
24 # call to __nacl_read_tp, which the IRT code overrides to segregate
25 # IRT-private TLS from user TLS.
26 if not env.Bit('bitcode'):
27 env.Append(CCFLAGS=['-mtls-use-call'])
28
21 # The PPAPI RPCs are specified abstractly via .srpc files. 29 # The PPAPI RPCs are specified abstractly via .srpc files.
22 # Once a .srpc file is added to the UntrustedSrpc rules below, the low-level 30 # Once a .srpc file is added to the UntrustedSrpc rules below, the low-level
23 # server/client proxies and stubs can be generated automatically using 31 # server/client proxies and stubs can be generated automatically using
24 # scons --mode=nacl_extra_sdk srpcgen 32 # scons --mode=nacl_extra_sdk srpcgen
25 # The .cc files are written to ./ and .h files - to ./untrusted/srpcgen/. 33 # The .cc files are written to ./ and .h files - to ./untrusted/srpcgen/.
26 # The generated files must be committed when changes are made to .srpc files. 34 # The generated files must be committed when changes are made to .srpc files.
27 35
28 env.UntrustedSrpc(is_client=False, 36 env.UntrustedSrpc(is_client=False,
29 srpc_files=['objectstub.srpc', 37 srpc_files=['objectstub.srpc',
30 'completion_callback.srpc', 38 'completion_callback.srpc',
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 'ppb_rpc_client.cc', 134 'ppb_rpc_client.cc',
127 'upcall_client.cc' 135 'upcall_client.cc'
128 ] + command_buffer_srcs) 136 ] + command_buffer_srcs)
129 137
130 env.Depends('ppruntime', 'srpc_untrusted') 138 env.Depends('ppruntime', 'srpc_untrusted')
131 header_install = env.AddHeaderToSdk(['ppruntime.h']) 139 header_install = env.AddHeaderToSdk(['ppruntime.h'])
132 env.AddLibraryToSdk(['ppruntime']) 140 env.AddLibraryToSdk(['ppruntime'])
133 141
134 # Clients that overload main() will use ppruntime.h. 142 # Clients that overload main() will use ppruntime.h.
135 env.Requires('ppruntime', header_install) 143 env.Requires('ppruntime', header_install)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698