site_scons/site_tools/naclsdk.py - Issue 4181005: Fixes some bugs with memory setup and halt-sled allocation and...

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: site_scons/site_tools/naclsdk.py

Issue 4181005: Fixes some bugs with memory setup and halt-sled allocation and... (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/

Patch Set: '' Created 10 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:

View side-by-side diff with in-line comments

Download patch

Index: site_scons/site_tools/naclsdk.py

===================================================================

--- site_scons/site_tools/naclsdk.py (revision 3633)

+++ site_scons/site_tools/naclsdk.py (working copy)

@@ -171,6 +171,8 @@

GDB=os.path.join(bin_path, 'nacl-gdb'),

# NOTE: use g++ for linking so we can handle C AND C++.

LINK=os.path.join(bin_path, '%s-g++' % arch),

+ # Grrr... and sometimes we really need ld.

+ LD=os.path.join(bin_path, '%s-ld' % arch),

RANLIB=os.path.join(bin_path, '%s-ranlib' % arch),

CFLAGS = ['-std=gnu99'],

CCFLAGS=['-O3',

@@ -229,6 +231,9 @@

# (CC_NATIVE had to handle both .c and .S files)

CC_NATIVE=pnacl_sdk_cc + pnacl_sdk_cc_native_flags,

LINK=pnacl_sdk_ld + pnacl_sdk_ld_flags,

+ # Grrr... and sometimes we need raw assembly and the real ld.

+ LD=(pnacl_sdk_root + '/arm-none-linux-gnueabi/bin/' +

+ 'arm-none-linux-gnueabi-ld'),

AR=pnacl_sdk_ar,

RANLIB=pnacl_sdk_ranlib,

DISASS=pnacl_sdk_disass,

« no previous file with comments | « SConstruct ('k') | src/trusted/service_runtime/arch/arm/nacl_text_pad_test.S » ('j') | no next file with comments »