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

Unified Diff: pnacl/driver/pnacl-ld.py

Issue 8437034: Roll UPSTREAM_REV and make other changes needed to bring in CL: (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: '' Created 9 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
« no previous file with comments | « pnacl/driver/pnacl-driver.py ('k') | pnacl/support/crt1.x » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pnacl/driver/pnacl-ld.py
===================================================================
--- pnacl/driver/pnacl-ld.py (revision 7096)
+++ pnacl/driver/pnacl-ld.py (working copy)
@@ -45,8 +45,6 @@
'STDLIB' : '1',
'RELOCATABLE': '0',
- 'BAREBONES_LINK' : '0',
-
'STRIP_MODE' : 'none',
'STRIP_FLAGS' : '${STRIP_FLAGS_%STRIP_MODE%}',
@@ -73,10 +71,7 @@
'${#LD_SCRIPT ? -T ${LD_SCRIPT} : -Ttext=0x20000}',
'GOLD_PLUGIN_ARGS': '-plugin=${GOLD_PLUGIN_SO} ' +
- '-plugin-opt=emit-llvm ' +
- '${LIBMODE_NEWLIB && !BAREBONES_LINK ? ' +
- '-plugin-opt=-add-nacl-read-tp-dependency ' +
- '-plugin-opt=-add-libgcc-dependencies}',
+ '-plugin-opt=emit-llvm',
# Symbols to wrap
'WRAP_SYMBOLS': '',
@@ -166,8 +161,6 @@
( '-o(.+)', "env.set('OUTPUT', pathtools.normalize($0))"),
( ('-o', '(.+)'), "env.set('OUTPUT', pathtools.normalize($0))"),
- ( '-barebones-link', "env.set('BAREBONES_LINK', '1')"),
-
( '-shared', "env.set('SHARED', '1')"),
( '-static', "env.set('STATIC', '1')\n"
@@ -260,7 +253,6 @@
if env.getbool('SHARED'):
Log.Fatal("-r and -shared may not be used together")
env.set('STATIC', '0')
- env.set('BAREBONES_LINK', '1')
if env.getbool('LIBMODE_NEWLIB'):
if env.getbool('SHARED'):
« no previous file with comments | « pnacl/driver/pnacl-driver.py ('k') | pnacl/support/crt1.x » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698