src/trusted/service_runtime/nacl.scons - Issue 62643002: Deploy new x86 binutils

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/trusted/service_runtime/nacl.scons

Issue 62643002: Deploy new x86 binutils (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client

Patch Set: add TODO comment; disable ncval-using test when using old ncval Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/trusted/service_runtime/nacl.scons

diff --git a/src/trusted/service_runtime/nacl.scons b/src/trusted/service_runtime/nacl.scons

index f76eb50d4326aec55a87de6390920be5d10bb44b..ae1230c6d9c34562ecf16248d567b79d2e047f24 100644

--- a/src/trusted/service_runtime/nacl.scons

+++ b/src/trusted/service_runtime/nacl.scons

@@ -56,9 +56,9 @@ def NewAsmEnv(env, defines, rodata_address, rwdata_address):

' -o ${TARGET} ${SOURCES}')

if env.Bit('target_x86_32'):

- link_cmd += ' -melf_nacl'

+ link_cmd += ' -melf_i386_nacl'

elif env.Bit('target_x86_64'):

- link_cmd += ' -melf64_nacl'

+ link_cmd += ' -melf_x86_64_nacl'

elif env.Bit('target_arm'):

link_cmd += ' -marmelf_nacl'

elif env.Bit('target_mips32'):