13 files changed, 10 insertions, 20 deletions
diff --git a/sysdeps/alpha/Dist b/sysdeps/alpha/Dist
index c4ea856..0b1e1b9 100644
--- a/sysdeps/alpha/Dist
+++ b/sysdeps/alpha/Dist
@@ -1,4 +1,4 @@
 setjmp_aux.c
 DEFS.h
-divrem.m4 macros.m4
+divrem.h
 divl.S divlu.S divq.S divqu.S reml.S remlu.S remq.S remqu.S
diff --git a/sysdeps/gnu/Dist b/sysdeps/gnu/Dist
new file mode 100644
index 0000000..093b211
--- /dev/null
+++ b/sysdeps/gnu/Dist
@@ -0,0 +1 @@
+errlist.awk
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 7ed20de..b52e604 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -111,7 +111,9 @@ elf_machine_rel (struct link_map *map,
 	  *reloc_addr -= (map->l_addr +
 			  dlsymtab[ELF32_R_SYM (reloc->r_info)].st_value);
 	}
-      loadbase = (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0);
+      loadbase = (resolve ? (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0) :
+		  /* RESOLVE is null during bootstrap relocation.  */
+		  map->l_addr);
       *reloc_addr += sym ? (loadbase + sym->st_value) : 0;
       break;
     case R_386_RELATIVE:
@@ -119,7 +121,9 @@ elf_machine_rel (struct link_map *map,
 	*reloc_addr += map->l_addr;
       break;
     case R_386_PC32:
-      loadbase = (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0);
+      loadbase = (resolve ? (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0) :
+		  /* RESOLVE is null during bootstrap relocation.  */
+		  map->l_addr);
       *reloc_addr += ((sym ? (loadbase + sym->st_value) : 0) -
 		      (Elf32_Addr) reloc_addr);
       break;
diff --git a/sysdeps/mach/hurd/Dist b/sysdeps/mach/hurd/Dist
index 89a6b56..986efc4 100644
--- a/sysdeps/mach/hurd/Dist
+++ b/sysdeps/mach/hurd/Dist
@@ -1,3 +1,3 @@
-errnos.awk errlist.awk err_hurd.sub
+errnos.awk err_hurd.sub
 libc-ldscript
 
diff --git a/sysdeps/unix/bsd/sony/newsos4/Dist b/sysdeps/unix/bsd/sony/newsos4/Dist
deleted file mode 100644
index d7500fd..0000000
--- a/sysdeps/unix/bsd/sony/newsos4/Dist
+++ /dev/null
@@ -1 +0,0 @@
-sys_wait4.S
diff --git a/sysdeps/unix/bsd/sun/sunos4/Dist b/sysdeps/unix/bsd/sun/sunos4/Dist
deleted file mode 100644
index f1c9046..0000000
--- a/sysdeps/unix/bsd/sun/sunos4/Dist
+++ /dev/null
@@ -1,2 +0,0 @@
-sys_wait4.S
-sys_mmap.S
diff --git a/sysdeps/unix/bsd/ultrix4/Dist b/sysdeps/unix/bsd/ultrix4/Dist
deleted file mode 100644
index 6745cd4..0000000
--- a/sysdeps/unix/bsd/ultrix4/Dist
+++ /dev/null
@@ -1 +0,0 @@
-getsysinfo.S
diff --git a/sysdeps/unix/bsd/ultrix4/mips/Dist b/sysdeps/unix/bsd/ultrix4/mips/Dist
index c2e8abb..06cf9cc 100644
--- a/sysdeps/unix/bsd/ultrix4/mips/Dist
+++ b/sysdeps/unix/bsd/ultrix4/mips/Dist
@@ -1 +1 @@
-sigtramp.c __handler.S
+__handler.S
diff --git a/sysdeps/unix/sysv/Dist b/sysdeps/unix/sysv/Dist
index f70fcf6..14343b6 100644
--- a/sysdeps/unix/sysv/Dist
+++ b/sysdeps/unix/sysv/Dist
@@ -1,3 +1 @@
 sysv_termio.h
-utmp.h
-s_getdents.S
diff --git a/sysdeps/unix/sysv/irix4/Dist b/sysdeps/unix/sysv/irix4/Dist
index c5dd106..cf0a898 100644
--- a/sysdeps/unix/sysv/irix4/Dist
+++ b/sysdeps/unix/sysv/irix4/Dist
@@ -1,2 +1 @@
-syssgi.S sysmp.S
 __handler.S sigtramp.c
diff --git a/sysdeps/unix/sysv/linux/i386/Dist b/sysdeps/unix/sysv/linux/i386/Dist
deleted file mode 100644
index 91365ad..0000000
--- a/sysdeps/unix/sysv/linux/i386/Dist
+++ /dev/null
@@ -1 +0,0 @@
-fxstat.S lxstat.S xmknod.S xstat.S
diff --git a/sysdeps/unix/sysv/sco3.2.4/Dist b/sysdeps/unix/sysv/sco3.2.4/Dist
deleted file mode 100644
index 462b9fb..0000000
--- a/sysdeps/unix/sysv/sco3.2.4/Dist
+++ /dev/null
@@ -1,2 +0,0 @@
-pgrpsys.S
-sco_getgrp.S
diff --git a/sysdeps/unix/sysv/sysv4/Dist b/sysdeps/unix/sysv/sysv4/Dist
index f603d8b..da3d7e5 100644
--- a/sysdeps/unix/sysv/sysv4/Dist
+++ b/sysdeps/unix/sysv/sysv4/Dist
@@ -1,7 +1,2 @@
 sysconfig.h
-sysconfig.S
-pgrpsys.S
-__waitid.S
 siginfo.h
-__getpgid.c __setpgid.c
-sysinfo.S