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

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

Issue 7276050: Change startup ABI for untrusted code to be C-compatible (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: disable bogus stack_frame.cc test for now Created 9 years, 6 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') | src/untrusted/nacl/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 9a4c5c3e185b6fab7b475310ef925e229fc6517f..65f69e263fdf1022cc084f667f4e4bfb93a57f7b 100644
--- a/src/untrusted/irt/nacl.scons
+++ b/src/untrusted/irt/nacl.scons
@@ -38,14 +38,6 @@ if blob_env.Bit('bitcode'):
else:
blob_env.Append(LINKFLAGS='-Wl,-Ttext-segment=${IRT_BLOB_CODE_START}')
-asm_env = blob_env.Clone()
-if asm_env.Bit('bitcode'):
- asm_env.Replace(OBJSUFFIX='.o')
- asm_env.Append(ASFLAGS=['-arch', '${TARGET_FULLARCH}'])
-
-asm_helper = asm_env.ComponentObject(
- 'elf_restart_%s.S' % env['TARGET_FULLARCH'].replace('-', '_'))
-
irt_support_sources = [
'irt_entry.c',
'irt_malloc.c',
@@ -67,8 +59,8 @@ if not env.Bit('bitcode'):
irt_common_interfaces = []
# These are the objects and libraries that go into every IRT image.
-irt_support_objs = asm_helper + [blob_env.ComponentObject(x) for x in
- (irt_support_sources + irt_common_interfaces)]
+irt_support_objs = [blob_env.ComponentObject(x) for x in
+ (irt_support_sources + irt_common_interfaces)]
irt_support_libs = ['pthread']
# These go into only one image or the other.
« no previous file with comments | « src/untrusted/irt/irt_entry.c ('k') | src/untrusted/nacl/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698