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

Unified Diff: src/untrusted/irt/nacl.scons

Issue 19571003: IRT: Replace __attribute__((constructor)) with explicit call in _start() (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Fix + cleanup 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/untrusted/irt/irt_entry.c ('k') | tests/irt_compatibility/nacl.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/untrusted/irt/nacl.scons
diff --git a/src/untrusted/irt/nacl.scons b/src/untrusted/irt/nacl.scons
index 74d451f6cfd85454cacd308650083d514ca8b600..17d143890627ed6ea24d13a39085b8a4804d8a37 100644
--- a/src/untrusted/irt/nacl.scons
+++ b/src/untrusted/irt/nacl.scons
@@ -19,13 +19,12 @@ blob_env.Append(LINKFLAGS=[blob_env.RodataSwitch('${IRT_BLOB_DATA_START}'),
blob_env.TextSwitch('${IRT_BLOB_CODE_START}')])
irt_support_sources = [
+ 'irt_entry.c',
'irt_malloc.c',
'irt_private_pthread.c',
'irt_private_tls.c',
]
-irt_entry_obj = blob_env.ComponentObject('irt_entry.c')
-
# NACL_GC_WRAP_SYSCALL uses ({...}) syntax.
blob_env.FilterOut(CCFLAGS=['-pedantic'])
@@ -83,7 +82,6 @@ if env.Bit('target_arm'):
env.ComponentLibrary('libirt_support_private', irt_support_objs)
irt_nonbrowser = ['irt_interfaces.c',
- 'irt_core_entry.c',
'irt_core_resource.c',
]
@@ -95,9 +93,7 @@ irt_libs = ['srpc',
]
irt_core_library = blob_env.ComponentProgram(
- 'irt_core',
- [irt_entry_obj] + irt_support_objs + irt_nonbrowser,
- EXTRA_LIBS=irt_libs)
+ 'irt_core', irt_support_objs + irt_nonbrowser, EXTRA_LIBS=irt_libs)
env.SDKInstallBin('irt_core.nexe', irt_core_library)
# TODO(mcgrathr): these should be installed, but scons is a mystery
« no previous file with comments | « src/untrusted/irt/irt_entry.c ('k') | tests/irt_compatibility/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698