summaryrefslogtreecommitdiffstats
path: root/ppapi/native_client
diff options
context:
space:
mode:
authordschuff@chromium.org <dschuff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-05 22:00:02 +0000
committerdschuff@chromium.org <dschuff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-05 22:00:02 +0000
commit15d492eadb5d118a2a01a1f4a7266a0f933ba915 (patch)
tree57bc14486861f0026a93de310dd4f48036654741 /ppapi/native_client
parenteda9ef4f093bfd64d9470b0bd5c22382bb3769d0 (diff)
downloadchromium_src-15d492eadb5d118a2a01a1f4a7266a0f933ba915.zip
chromium_src-15d492eadb5d118a2a01a1f4a7266a0f933ba915.tar.gz
chromium_src-15d492eadb5d118a2a01a1f4a7266a0f933ba915.tar.bz2
NaCl: Update revision in DEPS, r11912 -> r11926
This pulls in the following Native Client changes: r11913: (jfb) Revert "Use the proper flag name for -pnaclabi-allow-dev-intrinsics." r11914: (jfb) Update PNaCl DEPS. r11915: (kschimpf) Update pnacl llvm revisions. r11916: (jvoung) Run toolchain_tests w/ translate_fast=1, use_sandboxed_translator=1 on buildbots. r11917: (mseaborn) Reduce dyncode area's consumption of swap space on Windows r11918: (dschuff) PNaCl driver: pass through options that affect the native link from the r11919: (jfb) Update TOOL_REVISIONS for PNaCl 11896->11916 r11920: (jfb) Test C++11 lock-free works for PNaCl r11921: (dschuff) Update PNaCl TOOL_REVISIONS, 11916->11918 r11922: (petarj) [MIPS] Fix the toolchain build issue with M4 and flex r11923: (kschimpf) Update pnacl llvm revisions. r11924: (mseaborn) Cleanup: Move some Linux-only signal handling code into linux/nacl_signal.c r11925: (dschuff) Create IRT gyp actions separate from newlib actions r11926: (dschuff) Build the x86-64 IRT with PNaCl r11927: (dschuff) Don't use -r when building irt_browser_lib It also changes the gyp build of the NaCL IRT to build with the new gyp variable introduced on the NaCl side. BUG= https://code.google.com/p/nativeclient/issues/detail?id=3577 R=bradnelson@chromium.org, bradnelson@google.com Review URL: https://codereview.chromium.org/22078002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
-rw-r--r--ppapi/native_client/native_client.gyp5
1 files changed, 2 insertions, 3 deletions
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
index aca69d7..d243b28 100644
--- a/ppapi/native_client/native_client.gyp
+++ b/ppapi/native_client/native_client.gyp
@@ -98,7 +98,8 @@
'out_newlib32': '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
'out_newlib_arm': '<(PRODUCT_DIR)/nacl_irt_arm.nexe',
'build_glibc': 0,
- 'build_newlib': 1,
+ 'build_newlib': 0,
+ 'build_irt': 1,
'include_dirs': [
'lib/gl/include',
'..',
@@ -125,8 +126,6 @@
'-lgio',
'-Wl,--end-group',
'-lm',
- '-Wl,<(NACL_RODATA_FLAG)=<(NACL_IRT_DATA_START)',
- '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)',
],
'extra_args': [
'--strip-all',