Index: rtld-elf-cap.xs
===================================================================
--- rtld-elf-cap.xs	(revision 198082)
+++ rtld-elf-cap.xs	(working copy)
@@ -5,9 +5,9 @@
  * XXXRW: Is there a way to override the executable start using the base
  * script without a custom one?
  */
-OUTPUT_FORMAT("elf32-i386-freebsd", "elf32-i386-freebsd",
-	      "elf32-i386-freebsd")
-OUTPUT_ARCH(i386)
+OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
+	      "elf64-x86-64")
+OUTPUT_ARCH(i386:x86-64)
 ENTRY(_start)
 SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
 /* Do we need any of these for elf?
@@ -69,12 +69,12 @@
   .eh_frame_hdr : { *(.eh_frame_hdr) }
   /* Adjust the address for the data segment.  We want to adjust up to
      the same address within the page on the next page up.  */
-  . = ALIGN (0x1000) - ((0x1000 - .) & (0x1000 - 1)); . = DATA_SEGMENT_ALIGN (0x1000, 0x1000);
+  . = ALIGN (0x100000) - ((0x100000 - .) & (0x100000 - 1)); . = DATA_SEGMENT_ALIGN (0x100000, 0x1000);
   /* Ensure the __preinit_array_start label is properly aligned.  We
      could instead move the label definition inside the section, but
      the linker would then create the section even if it turns out to
      be empty, which isn't pretty.  */
-  . = ALIGN(32 / 8);
+  . = ALIGN(64 / 8);
   .preinit_array     : { *(.preinit_array) }
   .init_array     : { *(.init_array) }
   .fini_array     : { *(.fini_array) }
@@ -129,9 +129,9 @@
    /* Align here to ensure that the .bss section occupies space up to
       _end.  Align after .bss to ensure correct alignment even if the
       .bss section disappears because there are no input sections.  */
-   . = ALIGN(32 / 8);
+   . = ALIGN(64 / 8);
   }
-  . = ALIGN(32 / 8);
+  . = ALIGN(64 / 8);
   _end = .;
   PROVIDE (end = .);
   . = DATA_SEGMENT_END (.);