Update documentation to 64b ld.so

11 files changed, 34 insertions, 13 deletions

diff --git a/grub.mdwn b/grub.mdwn
index d57f6231..60e668fe 100644
--- a/grub.mdwn
+++ b/grub.mdwn
@@ -29,9 +29,11 @@ supports the multiboot standard, necessary to boot the Hurd.
         			--device-master-port='${device-port}' \
         			--exec-server-task='${exec-task}' -T typed '${root}' \
         			'$(task-create)' '$(task-resume)'
-            module /lib/ld.so.1 exec /hurd/exec '$(exec-task=task-create)'
+            module /lib/ld-x86-64.so.1 exec /hurd/exec '$(exec-task=task-create)'
         }
 
+  * Use `ld.so.1` instead of `ld-x86-64.so.1` on 32b systems.
+
 
 # syslinux' `mboot.c32`
 
diff --git a/grub/tftp_boot.mdwn b/grub/tftp_boot.mdwn
index a094f248..1a2f5848 100644
--- a/grub/tftp_boot.mdwn
+++ b/grub/tftp_boot.mdwn
@@ -33,4 +33,6 @@ The `menu.lst` can look something like this:
            --device-master-port=${device-port}              \
            --exec-server-task=${exec-task}                  \
            -T typed ${root} $(task-create) $(task-resume)
-    module /lib/ld.so.1 /hurd/exec $(exec-task=task-create)
+    module /lib/ld-x86-64.so.1 /hurd/exec $(exec-task=task-create)
+
+Note: use `ld.so.1` instead of `ld-x86-64.so.1` on 32b systems.
diff --git a/hurd/bootstrap.mdwn b/hurd/bootstrap.mdwn
index 76ad0dc5..875541cf 100644
--- a/hurd/bootstrap.mdwn
+++ b/hurd/bootstrap.mdwn
@@ -44,8 +44,9 @@ bootloader can have the following typical configuration:
                     --multiboot-command-line='${kernel-command-line}' \
                     --exec-server-task='${exec-task}' -T typed '${root}' \
                     '$(fs-task=task-create)'
-    module          /lib/ld.so.1 exec /hurd/exec '$(exec-task=task-create)'
+    module          /lib/ld-x86-64.so.1 exec /hurd/exec '$(exec-task=task-create)'
 
+Note: use `ld.so.1` instead of `ld-x86-64.so.1` on 32b systems.
 
 GNU Mach will first make the `$(task-create)` function calls, and thus create
 a series of tasks for the various modules, and assign to the `pci-task`,
diff --git a/hurd/debugging/glibc.mdwn b/hurd/debugging/glibc.mdwn
index 1b7e6ab1..a5515e29 100644
--- a/hurd/debugging/glibc.mdwn
+++ b/hurd/debugging/glibc.mdwn
@@ -23,9 +23,11 @@ newly created libraries and loader actually work: they'll be used to run the
 `rpcgen` program.  If that step doesn't succeed, it'll look similar to this:
 
     [...]
-    CPP='gcc -E -x c-header' [...]/build/elf/ld.so.1 --library-path [...] [...]/build/sunrpc/rpcgen [...]
+    CPP='gcc -E -x c-header' [...]/build/elf/ld-x86-64.so.1 --library-path [...] [...]/build/sunrpc/rpcgen [...]
     Segmentation fault
 
+Note: use `ld.so.1` instead of `ld-x86-64.so.1` on 32b systems.
+
 ---
 
 Unless cross-compiling, the next thing you'll probably want to do
diff --git a/hurd/debugging/subhurd.mdwn b/hurd/debugging/subhurd.mdwn
index 7b5b07b1..e240dcb9 100644
--- a/hurd/debugging/subhurd.mdwn
+++ b/hurd/debugging/subhurd.mdwn
@@ -42,11 +42,11 @@ with _ps_.)
 
 W3
 
-    $ sudo gdb /var/tmp/one.full/lib/ld.so.1
+    $ sudo gdb /var/tmp/one.full/lib/ld-x86-64.so.1
     [...]
     (gdb) set solib-absolute-prefix /var/tmp/one.full
     (gdb) attach 854
-    Attaching to program `/var/tmp/one.full/lib/ld.so.1', pid 854
+    Attaching to program `/var/tmp/one.full/lib/ld-x86-64.so.1', pid 854
     warning: Can't modify tracing state for pid 854: No signal thread
     Can't fetch registers from thread 1: No such thread
 
@@ -54,7 +54,9 @@ W1
 
     [<Enter>.]
     /hurd/ext2fs.static --bootflags=-dsf --host-priv-port=38 --device-master-port=43 --exec-server-task=47 -Tdevice pseudo-root
-    /lib/ld.so.1 /hurd/exec
+    /lib/ld-x86-64.so.1 /hurd/exec
+
+Note: use `ld.so.1` instead of `ld-x86-64.so.1` on 32b systems.
 
 Now that this step has been accomplished, you can set break points in GDB, etc.
 
diff --git a/hurd/running/debian/CrossInstall.mdwn b/hurd/running/debian/CrossInstall.mdwn
index 0f56a3e7..38a33040 100644
--- a/hurd/running/debian/CrossInstall.mdwn
+++ b/hurd/running/debian/CrossInstall.mdwn
@@ -45,7 +45,9 @@ When all packages have been extracted we must prepare [[GRUB]] for the Hurd when
            --device-master-port=${device-port}             \
            --exec-server-task=${exec-task}                 \
            -T typed ${root} $(task-create) $(task-resume)
-      module /lib/ld.so.1 /hurd/exec $(exec-task=task-create)
+      module /lib/ld-x86-64.so.1 /hurd/exec $(exec-task=task-create)
+
+Note: use `ld.so.1` instead of `ld-x86-64.so.1` on 32b systems.
 
 **_Nota Bene:_** In your menu file there should be no extra white space after the back slashes.
 
diff --git a/microkernel/mach/gnumach/debugging.mdwn b/microkernel/mach/gnumach/debugging.mdwn
index bcff970e..2aeae7f4 100644
--- a/microkernel/mach/gnumach/debugging.mdwn
+++ b/microkernel/mach/gnumach/debugging.mdwn
@@ -165,9 +165,10 @@ example `/boot/grub/grub.cfg`:
                     --host-priv-port='${host-port}' --device-master-port='${device-port}' \
                     --exec-server-task='${exec-task}' -T typed '${root}' \
                     '$(fs-task=task-create)' '$(task-resume)'
-    module          /lib/ld.so.1 exec /hurd/exec '$(exec-task=task-create)'
+    module          /lib/ld-x86-64.so.1 exec /hurd/exec '$(exec-task=task-create)'
 
 
+Note: use `ld.so.1` instead of `ld-x86-64.so.1` on 32b systems.
 
 
 # Code Inside the Kernel
diff --git a/unsorted/BuildingHurdLiveCD.mdwn b/unsorted/BuildingHurdLiveCD.mdwn
index e2082268..a0830c77 100644
--- a/unsorted/BuildingHurdLiveCD.mdwn
+++ b/unsorted/BuildingHurdLiveCD.mdwn
@@ -49,6 +49,7 @@ That was the recipe for using a floppy image. If you use the `-t hd` switch of `
 * `/hurd/iso9660fs.static`
 * `/hurd/exec`
 * `/lib/ld.so.1`
+* `/lib/ld-x86-64.so.1`
 
 ## <a name="Contents_of_grub_conf"> Contents of grub.conf </a>
 
@@ -63,7 +64,9 @@ That was the recipe for using a floppy image. If you use the `-t hd` switch of `
               --host-priv-port=${host-port} --device-master-port=${device-port}      \
               --exec-server-task=${exec-task} -T typed ${root} $(task-create)        \
               $(task-resume)
-       module /lib/ld.so.1 /hurd/exec $(exec-task=task-create)
+       module /lib/ld-x86-64.so.1 /hurd/exec $(exec-task=task-create)
+
+Note: use `ld.so.1` instead of `ld-x86-64.so.1` on 32b systems.
 
 **_Note:_** The `root (cd)` line may prevent some computers from booting the livecd.
 
diff --git a/unsorted/CrossHurd.mdwn b/unsorted/CrossHurd.mdwn
index 3e3eca8c..6a01e1bc 100644
--- a/unsorted/CrossHurd.mdwn
+++ b/unsorted/CrossHurd.mdwn
@@ -45,7 +45,9 @@ The first two runs (reboots) you must run the Hurd in single-user mode!
            --device-master-port=${device-port}             \
            --exec-server-task=${exec-task}                 \
            -T typed ${root} $(task-create) $(task-resume)
-      module /lib/ld.so.1 /hurd/exec $(exec-task=task-create)
+      module /lib/ld-x86-64.so.1 /hurd/exec $(exec-task=task-create)
+
+Note: use `ld.so.1` instead of `ld-x86-64.so.1` on 32b systems.
 
 N.B. the '-s' on the kernel line, it is "single user mode", which you need for the first two reboots.
 
diff --git a/unsorted/MakeImage.mdwn b/unsorted/MakeImage.mdwn
index b9b6e21a..f71743a6 100644
--- a/unsorted/MakeImage.mdwn
+++ b/unsorted/MakeImage.mdwn
@@ -45,12 +45,14 @@ I use this for testing OSKit...
            --host-priv-port=${host-port} --device-master-port=${device-port}   \
            --exec-server-task=${exec-task} -T typed ${root} $(task-create)     \
            $(task-resume)
-    module /lib/ld.so.1 /hurd/exec $(exec-task=task-create)
+    module /lib/ld-x86-64.so.1 /hurd/exec $(exec-task=task-create)
 
     EOF
     mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 \
             -boot-info-table -o grub.iso iso
 
+Note: use `ld.so.1` instead of `ld-x86-64.so.1` on 32b systems.
+
 ## <a name="Booting_Qemu"> Booting Qemu </a>
 
     qemu -m 512 -boot d -cdrom grub.iso -drive cache=writeback,file=gnu.img
diff --git a/unsorted/OskitMach.mdwn b/unsorted/OskitMach.mdwn
index 0f7dfa54..6e1b8e31 100644
--- a/unsorted/OskitMach.mdwn
+++ b/unsorted/OskitMach.mdwn
@@ -48,7 +48,9 @@ You start Oskit-Mach almost the same way as the old 1.x version of GNUmach. Usin
               --device-master-port=${device-port}             \
               --exec-server-task=${exec-task}                 \
               -T typed ${root} $(task-create) $(task-resume)
-       module /lib/ld.so.1 /hurd/exec $(exec-task=task-create)
+       module /lib/ld-x86-64.so.1 /hurd/exec $(exec-task=task-create)
+
+Note: use `ld.so.1` instead of `ld-x86-64.so.1` on 32b systems.
 
 _Remember_ to ensure that there are no trailing spaces after the backslashes on the lines above if you copy-paste this into your menu.list file.