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

Unified Diff: chrome/nacl.gypi

Issue 7655010: Reserve 1GB at the base of the address space of linux nacl_helper for Native Client module. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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 | « chrome/common/chrome_paths.cc ('k') | chrome/nacl/nacl_fork_delegate_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/nacl.gypi
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi
index 9467359c8582aad8951e1e5cd29da2ec899dad51..bfc6652c2d2a63092badf1b9a817d47ac44db85d 100644
--- a/chrome/nacl.gypi
+++ b/chrome/nacl.gypi
@@ -144,10 +144,12 @@
},
],
}],
- ['OS=="linux" and touchui == 0', {
+ ['OS=="linux"', {
'targets': [
{
- 'target_name': 'nacl_helper',
+ 'target_name': 'nacl_helper.so',
+ # 'executable' will be overridden below when we add the -shared
+ # flag; here it prevents gyp from using the --whole-archive flag
'type': 'executable',
'include_dirs': [
'..',
@@ -165,6 +167,35 @@
],
}],
],
+ 'link_settings': {
+ # NOTE: '-shared' overrides 'executable' above
+ 'ldflags': ['-shared',
+ '-Wl,--version-script=chrome/nacl/nacl_helper_exports.txt',
+ ],
+ },
+ },
+ {
+ 'target_name': 'nacl_helper_bootstrap',
+ 'type': 'executable',
+ 'dependencies': [
+ 'nacl_helper.so',
+ ],
+ 'sources': [
+ '../chrome/nacl/nacl_helper_bootstrap_linux.c',
+ ],
+ # TODO(bradchen): Delete the -B argument when Gold supports
+ # -Ttext properly. Until then use ld.bfd.
+ 'link_settings': {
+ 'ldflags': ['-B', 'tools/ld_bfd',
+ # Force text segment at 0x10000 (64KB)
+ # The max-page-size option is needed on x86-64 linux
+ # where 4K pages are not the default in the BFD linker.
+ '-Wl,-Ttext-segment,10000,-z,max-page-size=0x1000',
+ # reference nacl_helper as a shared library
+ '<(PRODUCT_DIR)/nacl_helper.so',
+ '-Wl,-rpath,<(SHARED_LIB_DIR)',
+ ],
+ },
},
],
}],
« no previous file with comments | « chrome/common/chrome_paths.cc ('k') | chrome/nacl/nacl_fork_delegate_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698