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

Unified Diff: pnacl/build.sh

Issue 15960018: Update pnacl binutils DEPS and enable mips support in binutils (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: rebase Created 7 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 | « pnacl/DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pnacl/build.sh
diff --git a/pnacl/build.sh b/pnacl/build.sh
index f0f43ebb184bd771bbbced7c3987c42152cee23f..a07afee0892029a50e1f69185b705d4858eec0b2 100755
--- a/pnacl/build.sh
+++ b/pnacl/build.sh
@@ -1859,7 +1859,7 @@ binutils-configure() {
local objdir="${TC_BUILD_BINUTILS}"
# enable multiple targets so that we can use the same ar with all .o files
- local targ="arm-pc-nacl,i686-pc-nacl,x86_64-pc-nacl"
+ local targ="arm-pc-nacl,i686-pc-nacl,x86_64-pc-nacl,mipsel-pc-nacl"
mkdir -p "${objdir}"
spushd "${objdir}"
@@ -1887,11 +1887,11 @@ binutils-configure() {
local zlib=''
fi
# The --enable-gold and --enable-plugins options are on so that we
- # can use gold's support for plugin to link PNaCl modules.
+ # can use gold's support for plugin to link PNaCl modules, and use
+ # gold as the final linker. We do not use bfd ld, and it is disabled
+ # in part because we do not have its MIPS support downstream.
# We llvm's mc for assembly so we no longer build gas
- # TODO(robertm): We no longer use ld and should really use
- # --enable-ld=no but the binutils build setup is buggy
RunWithLog binutils.configure \
env -i \
PATH="${PATH}" \
@@ -1903,8 +1903,8 @@ binutils-configure() {
--target=${BINUTILS_TARGET} \
--enable-targets=${targ} \
--enable-shared=${shared} \
- --enable-gold=yes \
- --enable-ld=yes \
+ --enable-gold=default \
+ --enable-ld=no \
--disable-nls \
--enable-plugins \
--disable-werror \
« no previous file with comments | « pnacl/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698