Align and pad code segments to 64k

nacl/dyn-link/ldscripts/elf64_nacl.x

 /* Default linker script, for normal executables */
 OUTPUT_FORMAT("elf64-nacl", "elf64-nacl",
               "elf64-nacl")
 OUTPUT_ARCH(i386:x86-64)
 ENTRY(_start)
 SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib");
 PHDRS
 {
   seg_interp   PT_INTERP FLAGS(4) ;     /* read */
   seg_code     PT_LOAD FLAGS(5) ;       /* read + execute */
   seg_rodata   PT_LOAD FLAGS(4) ;       /* read */
   seg_rwdata   PT_LOAD FLAGS(6) ;       /* read + write */
   seg_bss      PT_LOAD FLAGS(6) ;       /* read + write */
   seg_dynamic  PT_DYNAMIC FLAGS(6) ;
   seg_stack    PT_GNU_STACK FLAGS(6) ;
   seg_tls      PT_TLS FLAGS(4) ;
 }
 SECTIONS
 {
-  PROVIDE (__executable_start = 0x1000000); . = 0x1000000 + SIZEOF_HEADERS;
-  . = ALIGN(32);
+  . = 0x1000000;
+  PROVIDE (__executable_start = .);
+
   /* The ALIGN(32) instructions below are workarounds.
      TODO(mseaborn): Get the object files to include the correct
      alignments and padding themselves.
      See http://code.google.com/p/nativeclient/issues/detail?id=499. */
   .init           :
   {
     KEEP (*(.init))
     . = ALIGN(32); /* ensures NOP fill */
   } :seg_code =0x90909090
   .plt            : { *(.plt) }
   .text           :
   {
     *(.text .stub .text.* .gnu.linkonce.t.*)
     KEEP (*(.text.*personality*))
     /* .gnu.warning sections are handled specially by elf32.em.  */
     *(.gnu.warning)
     . = ALIGN(32); /* ensures NOP fill */
   } =0x90909090
   .fini           :
   {
     KEEP (*(.fini))
-    . = ALIGN(32); /* ensures NOP fill */
+    . = ALIGN(CONSTANT (MAXPAGESIZE)); /* ensures NOP fill */
   } =0x90909090
   PROVIDE (__etext = .);
   PROVIDE (_etext = .);
   PROVIDE (etext = .);
 
-  . = 0x11000000 + (. & (CONSTANT (MAXPAGESIZE) - 1));
+  . = 0x11000000;
   .interp         : { *(.interp) } :seg_rodata :seg_interp
   .note.gnu.build-id : { *(.note.gnu.build-id) } :seg_rodata
   .hash           : { *(.hash) }
   .gnu.hash       : { *(.gnu.hash) }
   .dynsym         : { *(.dynsym) }
   .dynstr         : { *(.dynstr) }
   .gnu.version    : { *(.gnu.version) }
   .gnu.version_d  : { *(.gnu.version_d) }
   .gnu.version_r  : { *(.gnu.version_r) }
   .rel.init       : { *(.rel.init) }
@@ skipping 172 matching lines @@
   .debug_typenames 0 : { *(.debug_typenames) }
   .debug_varnames  0 : { *(.debug_varnames) }
   /* DWARF 3 */
   .debug_pubtypes 0 : { *(.debug_pubtypes) }
   .debug_ranges   0 : { *(.debug_ranges) }
   .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
   /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) }
   /DISCARD/ : { *(.note.ABI-tag) }
   /DISCARD/ : { *(.interp) }
 }