summaryrefslogtreecommitdiffstats
path: root/chrome/nacl/nacl_helper_bootstrap_munge_phdr.py
diff options
context:
space:
mode:
authormcgrathr@chromium.org <mcgrathr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-08 20:37:23 +0000
committermcgrathr@chromium.org <mcgrathr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-08 20:37:23 +0000
commit0d0a668f56a05882e52c6d90acd31104e508e165 (patch)
tree2cf8c7b792508e6e10de521e4ed19d422c6cc9e3 /chrome/nacl/nacl_helper_bootstrap_munge_phdr.py
parent8d9285c8bb6fe0eaed34ff2674e95a5ed6f8a706 (diff)
downloadchromium_src-0d0a668f56a05882e52c6d90acd31104e508e165.zip
chromium_src-0d0a668f56a05882e52c6d90acd31104e508e165.tar.gz
chromium_src-0d0a668f56a05882e52c6d90acd31104e508e165.tar.bz2
Clean up nacl_helper_bootstrap linker script
This includes the changes from rev 99975, which got reverted because the gyp file didn't have necessary dependencies to make bots' incremental rebuilds rebuild everything they should have. The gyp file got fixed as part of rev 100031. Using linux_syscall_support.h requires having a global variable (for the local errno), which I did not have in my original version. Hence, we now have bss space, where originally I had none at all. This updates the linker script to have a proper data+bss segment. Without this, the text segment winds up both writable and executable, which is generally frowned upon (and requires extra special privileges in some Linux systems). The .note.gnu.build-id section is generated by the linker (given the --build-id option, which the compiler driver passes by default). This normally produces a PT_NOTE header pointing to the section, so do that in our custom linker script too. We also separate out the .rodata section from .text, so that debugging tools examining the binary are not confused about what is and isn't expected to be machine instructions. (This has no effect on the memory image, just on the ELF file.) BUG= none TEST= hand-verified that the build comes out as intended and still works R=bradchen@google.com,mseaborn@chromium.org Review URL: http://codereview.chromium.org/7845026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl/nacl_helper_bootstrap_munge_phdr.py')
-rwxr-xr-xchrome/nacl/nacl_helper_bootstrap_munge_phdr.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/nacl/nacl_helper_bootstrap_munge_phdr.py b/chrome/nacl/nacl_helper_bootstrap_munge_phdr.py
index c3a3931..7a53374 100755
--- a/chrome/nacl/nacl_helper_bootstrap_munge_phdr.py
+++ b/chrome/nacl/nacl_helper_bootstrap_munge_phdr.py
@@ -28,7 +28,7 @@ def Main(argv):
[prog, munger, infile, outfile] = argv
tmpfile = outfile + '.tmp'
shutil.copy(infile, tmpfile)
- segment_num = '1'
+ segment_num = '2'
subprocess.check_call([munger, tmpfile, segment_num])
shutil.move(tmpfile, outfile)