sync, libiberty bump, binutils changes (non-split info pages, mmalloc gone)

31 files changed, 98 insertions, 272 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index df6736a75b5..aec1209c0eb 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -43,7 +43,7 @@
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
 ./usr/lib/libgssapi.so.2.1
-./usr/lib/libiberty.so.6.1
+./usr/lib/libiberty.so.7.0
 ./usr/lib/libkafs.so.13.0
 ./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.1
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 029d1a56844..4db56096a8a 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -42,7 +42,7 @@
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
 ./usr/lib/libgssapi.so.2.1
-./usr/lib/libiberty.so.6.1
+./usr/lib/libiberty.so.7.0
 ./usr/lib/libkafs.so.13.0
 ./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.1
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index 02f480cee60..851e6515f09 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -46,7 +46,7 @@
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
 ./usr/lib/libgssapi.so.2.1
-./usr/lib/libiberty.so.6.1
+./usr/lib/libiberty.so.7.0
 ./usr/lib/libkafs.so.13.0
 ./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.1
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 570527e9b6e..178adacc86c 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -37,7 +37,7 @@
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
 ./usr/lib/libgssapi.so.2.1
-./usr/lib/libiberty.so.6.1
+./usr/lib/libiberty.so.7.0
 ./usr/lib/libkafs.so.13.0
 ./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.1
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 3c037d0da78..f876b940ca7 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -45,7 +45,7 @@
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
 ./usr/lib/libgssapi.so.2.1
-./usr/lib/libiberty.so.6.1
+./usr/lib/libiberty.so.7.0
 ./usr/lib/libkafs.so.13.0
 ./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.1
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index d1cbbb55fba..9c53cb7357a 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -38,7 +38,7 @@
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
 ./usr/lib/libgssapi.so.2.1
-./usr/lib/libiberty.so.6.1
+./usr/lib/libiberty.so.7.0
 ./usr/lib/libkafs.so.13.0
 ./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.1
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 1b450e58098..d489724c8ec 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -46,7 +46,7 @@
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
 ./usr/lib/libgssapi.so.2.1
-./usr/lib/libiberty.so.6.1
+./usr/lib/libiberty.so.7.0
 ./usr/lib/libkafs.so.13.0
 ./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.1
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 6ed913bf5a1..24ef6ed0b56 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -37,7 +37,7 @@
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
 ./usr/lib/libgssapi.so.2.1
-./usr/lib/libiberty.so.6.1
+./usr/lib/libiberty.so.7.0
 ./usr/lib/libkafs.so.13.0
 ./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.1
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index a2b1e0d666f..b3ee32301e6 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -42,7 +42,7 @@
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
 ./usr/lib/libgssapi.so.2.1
-./usr/lib/libiberty.so.6.1
+./usr/lib/libiberty.so.7.0
 ./usr/lib/libkafs.so.13.0
 ./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.1
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 7204126f982..6e17a34af6e 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -40,7 +40,7 @@
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
 ./usr/lib/libgssapi.so.2.1
-./usr/lib/libiberty.so.6.1
+./usr/lib/libiberty.so.7.0
 ./usr/lib/libkafs.so.13.0
 ./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.1
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 52b0e426976..6cbb8b4a11b 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -36,7 +36,7 @@
 ./usr/lib/libform.so.2.0
 ./usr/lib/libg2c.so.7.0
 ./usr/lib/libgssapi.so.2.1
-./usr/lib/libiberty.so.6.1
+./usr/lib/libiberty.so.7.0
 ./usr/lib/libkafs.so.13.0
 ./usr/lib/libkrb5.so.13.0
 ./usr/lib/libkvm.so.7.1
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 78e87d894b4..51e27c557bb 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -1,5 +1,4 @@
 ./usr/bin/addr2line
-./usr/bin/gasp
 ./usr/bin/objcopy
 ./usr/bin/readelf
 ./usr/include/alpha
@@ -313,11 +312,13 @@
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
 ./usr/libdata/ldscripts
-./usr/libdata/ldscripts/elf64alpha.x
-./usr/libdata/ldscripts/elf64alpha.xbn
-./usr/libdata/ldscripts/elf64alpha.xn
-./usr/libdata/ldscripts/elf64alpha.xr
-./usr/libdata/ldscripts/elf64alpha.xs
-./usr/libdata/ldscripts/elf64alpha.xu
-./usr/libdata/ldscripts/elf64alpha.xz
+./usr/libdata/ldscripts/elf64alpha_obsd.x
+./usr/libdata/ldscripts/elf64alpha_obsd.xbn
+./usr/libdata/ldscripts/elf64alpha_obsd.xc
+./usr/libdata/ldscripts/elf64alpha_obsd.xn
+./usr/libdata/ldscripts/elf64alpha_obsd.xr
+./usr/libdata/ldscripts/elf64alpha_obsd.xs
+./usr/libdata/ldscripts/elf64alpha_obsd.xsc
+./usr/libdata/ldscripts/elf64alpha_obsd.xu
+./usr/libdata/ldscripts/elf64alpha_obsd.xz
 ./usr/share/man/cat1/objcopy.0
diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64
index e1878d7602a..af487f9dae7 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -1,5 +1,5 @@
+
 ./usr/bin/addr2line
-./usr/bin/gasp
 ./usr/bin/objcopy
 ./usr/bin/readelf
 ./usr/include/amd64
@@ -329,16 +329,29 @@
 ./usr/libdata/ldscripts
 ./usr/libdata/ldscripts/elf_i386.x
 ./usr/libdata/ldscripts/elf_i386.xbn
+./usr/libdata/ldscripts/elf_i386.xc
 ./usr/libdata/ldscripts/elf_i386.xn
 ./usr/libdata/ldscripts/elf_i386.xr
 ./usr/libdata/ldscripts/elf_i386.xs
+./usr/libdata/ldscripts/elf_i386.xsc
 ./usr/libdata/ldscripts/elf_i386.xu
 ./usr/libdata/ldscripts/elf_i386.xz
-./usr/libdata/ldscripts/elf_x86_64.x
-./usr/libdata/ldscripts/elf_x86_64.xbn
-./usr/libdata/ldscripts/elf_x86_64.xn
-./usr/libdata/ldscripts/elf_x86_64.xr
-./usr/libdata/ldscripts/elf_x86_64.xs
-./usr/libdata/ldscripts/elf_x86_64.xu
-./usr/libdata/ldscripts/elf_x86_64.xz
+./usr/libdata/ldscripts/elf_i386_obsd.x
+./usr/libdata/ldscripts/elf_i386_obsd.xbn
+./usr/libdata/ldscripts/elf_i386_obsd.xc
+./usr/libdata/ldscripts/elf_i386_obsd.xn
+./usr/libdata/ldscripts/elf_i386_obsd.xr
+./usr/libdata/ldscripts/elf_i386_obsd.xs
+./usr/libdata/ldscripts/elf_i386_obsd.xsc
+./usr/libdata/ldscripts/elf_i386_obsd.xu
+./usr/libdata/ldscripts/elf_i386_obsd.xz
+./usr/libdata/ldscripts/elf_x86_64_obsd.x
+./usr/libdata/ldscripts/elf_x86_64_obsd.xbn
+./usr/libdata/ldscripts/elf_x86_64_obsd.xc
+./usr/libdata/ldscripts/elf_x86_64_obsd.xn
+./usr/libdata/ldscripts/elf_x86_64_obsd.xr
+./usr/libdata/ldscripts/elf_x86_64_obsd.xs
+./usr/libdata/ldscripts/elf_x86_64_obsd.xsc
+./usr/libdata/ldscripts/elf_x86_64_obsd.xu
+./usr/libdata/ldscripts/elf_x86_64_obsd.xz
 ./usr/share/man/cat1/objcopy.0
diff --git a/distrib/sets/lists/comp/md.cats b/distrib/sets/lists/comp/md.cats
index 3532d8ac0f6..107a941897a 100644
--- a/distrib/sets/lists/comp/md.cats
+++ b/distrib/sets/lists/comp/md.cats
@@ -1,5 +1,4 @@
 ./usr/bin/addr2line
-./usr/bin/gasp
 ./usr/bin/objcopy
 ./usr/bin/readelf
 ./usr/include/arm
@@ -348,4 +347,23 @@
 ./usr/lib/libutil_pic.a
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
+./usr/libdata/ldscripts
+./usr/libdata/ldscripts/armelf_obsd.x
+./usr/libdata/ldscripts/armelf_obsd.xbn
+./usr/libdata/ldscripts/armelf_obsd.xc
+./usr/libdata/ldscripts/armelf_obsd.xn
+./usr/libdata/ldscripts/armelf_obsd.xr
+./usr/libdata/ldscripts/armelf_obsd.xs
+./usr/libdata/ldscripts/armelf_obsd.xsc
+./usr/libdata/ldscripts/armelf_obsd.xu
+./usr/libdata/ldscripts/armelf_obsd.xz
+./usr/libdata/ldscripts/armelfb_obsd.x
+./usr/libdata/ldscripts/armelfb_obsd.xbn
+./usr/libdata/ldscripts/armelfb_obsd.xc
+./usr/libdata/ldscripts/armelfb_obsd.xn
+./usr/libdata/ldscripts/armelfb_obsd.xr
+./usr/libdata/ldscripts/armelfb_obsd.xs
+./usr/libdata/ldscripts/armelfb_obsd.xsc
+./usr/libdata/ldscripts/armelfb_obsd.xu
+./usr/libdata/ldscripts/armelfb_obsd.xz
 ./usr/share/man/cat1/objcopy.0
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index af847893a6c..59a67193ef3 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -1,5 +1,4 @@
 ./usr/bin/addr2line
-./usr/bin/gasp
 ./usr/bin/objcopy
 ./usr/bin/readelf
 ./usr/include/g++/FlexLexer.h
@@ -236,9 +235,11 @@
 ./usr/libdata/ldscripts
 ./usr/libdata/ldscripts/hppaobsd.x
 ./usr/libdata/ldscripts/hppaobsd.xbn
+./usr/libdata/ldscripts/hppaobsd.xc
 ./usr/libdata/ldscripts/hppaobsd.xn
 ./usr/libdata/ldscripts/hppaobsd.xr
 ./usr/libdata/ldscripts/hppaobsd.xs
+./usr/libdata/ldscripts/hppaobsd.xsc
 ./usr/libdata/ldscripts/hppaobsd.xu
 ./usr/libdata/ldscripts/hppaobsd.xz
 ./usr/share/man/cat1/objcopy.0
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 96afa57a988..c99470f56fd 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -1,5 +1,4 @@
 ./usr/bin/addr2line
-./usr/bin/gasp
 ./usr/bin/objcopy
 ./usr/bin/readelf
 ./usr/include/g++/FlexLexer.h
@@ -288,11 +287,13 @@
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
 ./usr/libdata/ldscripts
-./usr/libdata/ldscripts/elf_i386.x
-./usr/libdata/ldscripts/elf_i386.xbn
-./usr/libdata/ldscripts/elf_i386.xn
-./usr/libdata/ldscripts/elf_i386.xr
-./usr/libdata/ldscripts/elf_i386.xs
-./usr/libdata/ldscripts/elf_i386.xu
-./usr/libdata/ldscripts/elf_i386.xz
+./usr/libdata/ldscripts/elf_i386_obsd.x
+./usr/libdata/ldscripts/elf_i386_obsd.xbn
+./usr/libdata/ldscripts/elf_i386_obsd.xc
+./usr/libdata/ldscripts/elf_i386_obsd.xn
+./usr/libdata/ldscripts/elf_i386_obsd.xr
+./usr/libdata/ldscripts/elf_i386_obsd.xs
+./usr/libdata/ldscripts/elf_i386_obsd.xsc
+./usr/libdata/ldscripts/elf_i386_obsd.xu
+./usr/libdata/ldscripts/elf_i386_obsd.xz
 ./usr/share/man/cat1/objcopy.0
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index 6a0c2940053..2f90b3608d9 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -1,4 +1,3 @@
-./usr/bin/gasp
 ./usr/bin/objcopy
 ./usr/include/g++/FlexLexer.h
 ./usr/include/g++/PlotFile.h
@@ -318,25 +317,13 @@
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
 ./usr/libdata/ldscripts
-./usr/libdata/ldscripts/elf32ppc.x
-./usr/libdata/ldscripts/elf32ppc.xbn
-./usr/libdata/ldscripts/elf32ppc.xn
-./usr/libdata/ldscripts/elf32ppc.xr
-./usr/libdata/ldscripts/elf32ppc.xs
-./usr/libdata/ldscripts/elf32ppc.xu
-./usr/libdata/ldscripts/elf32ppc.xz
-./usr/libdata/ldscripts/elf32ppclinux.x
-./usr/libdata/ldscripts/elf32ppclinux.xbn
-./usr/libdata/ldscripts/elf32ppclinux.xn
-./usr/libdata/ldscripts/elf32ppclinux.xr
-./usr/libdata/ldscripts/elf32ppclinux.xs
-./usr/libdata/ldscripts/elf32ppclinux.xu
-./usr/libdata/ldscripts/elf32ppclinux.xz
-./usr/libdata/ldscripts/elf32ppcsim.x
-./usr/libdata/ldscripts/elf32ppcsim.xbn
-./usr/libdata/ldscripts/elf32ppcsim.xn
-./usr/libdata/ldscripts/elf32ppcsim.xr
-./usr/libdata/ldscripts/elf32ppcsim.xs
-./usr/libdata/ldscripts/elf32ppcsim.xu
-./usr/libdata/ldscripts/elf32ppcsim.xz
+./usr/libdata/ldscripts/elf32ppc_obsd.x
+./usr/libdata/ldscripts/elf32ppc_obsd.xbn
+./usr/libdata/ldscripts/elf32ppc_obsd.xc
+./usr/libdata/ldscripts/elf32ppc_obsd.xn
+./usr/libdata/ldscripts/elf32ppc_obsd.xr
+./usr/libdata/ldscripts/elf32ppc_obsd.xs
+./usr/libdata/ldscripts/elf32ppc_obsd.xsc
+./usr/libdata/ldscripts/elf32ppc_obsd.xu
+./usr/libdata/ldscripts/elf32ppc_obsd.xz
 ./usr/share/man/cat1/objcopy.0
diff --git a/distrib/sets/lists/comp/md.mvmeppc b/distrib/sets/lists/comp/md.mvmeppc
index 63ba846a65f..f2fff795b2d 100644
--- a/distrib/sets/lists/comp/md.mvmeppc
+++ b/distrib/sets/lists/comp/md.mvmeppc
@@ -1,4 +1,3 @@
-./usr/bin/gasp
 ./usr/bin/objcopy
 ./usr/include/g++/FlexLexer.h
 ./usr/include/g++/PlotFile.h
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index de221cff1ea..7141027b717 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -1,5 +1,4 @@
 ./usr/bin/addr2line
-./usr/bin/gasp
 ./usr/bin/objcopy
 ./usr/bin/readelf
 ./usr/include/g++/FlexLexer.h
@@ -285,11 +284,13 @@
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
 ./usr/libdata/ldscripts
-./usr/libdata/ldscripts/elf32_sparc.x
-./usr/libdata/ldscripts/elf32_sparc.xbn
-./usr/libdata/ldscripts/elf32_sparc.xn
-./usr/libdata/ldscripts/elf32_sparc.xr
-./usr/libdata/ldscripts/elf32_sparc.xs
-./usr/libdata/ldscripts/elf32_sparc.xu
-./usr/libdata/ldscripts/elf32_sparc.xz
+./usr/libdata/ldscripts/elf32_sparc_obsd.x
+./usr/libdata/ldscripts/elf32_sparc_obsd.xbn
+./usr/libdata/ldscripts/elf32_sparc_obsd.xc
+./usr/libdata/ldscripts/elf32_sparc_obsd.xn
+./usr/libdata/ldscripts/elf32_sparc_obsd.xr
+./usr/libdata/ldscripts/elf32_sparc_obsd.xs
+./usr/libdata/ldscripts/elf32_sparc_obsd.xsc
+./usr/libdata/ldscripts/elf32_sparc_obsd.xu
+./usr/libdata/ldscripts/elf32_sparc_obsd.xz
 ./usr/share/man/cat1/objcopy.0
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index f8ce161d0f6..a3f03cd4272 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -1,6 +1,4 @@
 ./usr/bin/addr2line
-./usr/bin/gasp
-./usr/bin/objcopy
 ./usr/bin/readelf
 ./usr/include/g++/FlexLexer.h
 ./usr/include/g++/algorithm
@@ -316,11 +314,13 @@
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
 ./usr/libdata/ldscripts
-./usr/libdata/ldscripts/elf64_sparc.x
-./usr/libdata/ldscripts/elf64_sparc.xbn
-./usr/libdata/ldscripts/elf64_sparc.xn
-./usr/libdata/ldscripts/elf64_sparc.xr
-./usr/libdata/ldscripts/elf64_sparc.xs
-./usr/libdata/ldscripts/elf64_sparc.xu
-./usr/libdata/ldscripts/elf64_sparc.xz
+./usr/libdata/ldscripts/elf64_sparc_obsd.x
+./usr/libdata/ldscripts/elf64_sparc_obsd.xbn
+./usr/libdata/ldscripts/elf64_sparc_obsd.xc
+./usr/libdata/ldscripts/elf64_sparc_obsd.xn
+./usr/libdata/ldscripts/elf64_sparc_obsd.xr
+./usr/libdata/ldscripts/elf64_sparc_obsd.xs
+./usr/libdata/ldscripts/elf64_sparc_obsd.xsc
+./usr/libdata/ldscripts/elf64_sparc_obsd.xu
+./usr/libdata/ldscripts/elf64_sparc_obsd.xz
 ./usr/share/man/cat1/objcopy.0
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 251191c316e..3d4c0a99a06 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1547,7 +1547,6 @@
 ./usr/lib/libm_p.a
 ./usr/lib/libmenu.a
 ./usr/lib/libmenu_p.a
-./usr/lib/libmmalloc.a
 ./usr/lib/libncurses.a
 ./usr/lib/libncurses_p.a
 ./usr/lib/libobjc.a
diff --git a/distrib/sets/lists/man/md.alpha b/distrib/sets/lists/man/md.alpha
index 57832be5ea4..a327150c0ef 100644
--- a/distrib/sets/lists/man/md.alpha
+++ b/distrib/sets/lists/man/md.alpha
@@ -1,25 +1,6 @@
 ./usr/share/info/as.info
-./usr/share/info/as.info-1
-./usr/share/info/as.info-2
-./usr/share/info/as.info-3
-./usr/share/info/as.info-4
-./usr/share/info/as.info-5
-./usr/share/info/as.info-6
-./usr/share/info/as.info-7
-./usr/share/info/as.info-8
-./usr/share/info/as.info-9
 ./usr/share/info/binutils.info
-./usr/share/info/binutils.info-1
-./usr/share/info/binutils.info-2
-./usr/share/info/binutils.info-3
-./usr/share/info/gasp.info
 ./usr/share/info/ld.info
-./usr/share/info/ld.info-1
-./usr/share/info/ld.info-2
-./usr/share/info/ld.info-3
-./usr/share/info/ld.info-4
-./usr/share/info/ld.info-5
-./usr/share/info/ld.info-6
 ./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
 ./usr/share/man/cat8/ldconfig.0
diff --git a/distrib/sets/lists/man/md.amd64 b/distrib/sets/lists/man/md.amd64
index 57832be5ea4..a327150c0ef 100644
--- a/distrib/sets/lists/man/md.amd64
+++ b/distrib/sets/lists/man/md.amd64
@@ -1,25 +1,6 @@
 ./usr/share/info/as.info
-./usr/share/info/as.info-1
-./usr/share/info/as.info-2
-./usr/share/info/as.info-3
-./usr/share/info/as.info-4
-./usr/share/info/as.info-5
-./usr/share/info/as.info-6
-./usr/share/info/as.info-7
-./usr/share/info/as.info-8
-./usr/share/info/as.info-9
 ./usr/share/info/binutils.info
-./usr/share/info/binutils.info-1
-./usr/share/info/binutils.info-2
-./usr/share/info/binutils.info-3
-./usr/share/info/gasp.info
 ./usr/share/info/ld.info
-./usr/share/info/ld.info-1
-./usr/share/info/ld.info-2
-./usr/share/info/ld.info-3
-./usr/share/info/ld.info-4
-./usr/share/info/ld.info-5
-./usr/share/info/ld.info-6
 ./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
 ./usr/share/man/cat8/ldconfig.0
diff --git a/distrib/sets/lists/man/md.cats b/distrib/sets/lists/man/md.cats
index 57832be5ea4..a327150c0ef 100644
--- a/distrib/sets/lists/man/md.cats
+++ b/distrib/sets/lists/man/md.cats
@@ -1,25 +1,6 @@
 ./usr/share/info/as.info
-./usr/share/info/as.info-1
-./usr/share/info/as.info-2
-./usr/share/info/as.info-3
-./usr/share/info/as.info-4
-./usr/share/info/as.info-5
-./usr/share/info/as.info-6
-./usr/share/info/as.info-7
-./usr/share/info/as.info-8
-./usr/share/info/as.info-9
 ./usr/share/info/binutils.info
-./usr/share/info/binutils.info-1
-./usr/share/info/binutils.info-2
-./usr/share/info/binutils.info-3
-./usr/share/info/gasp.info
 ./usr/share/info/ld.info
-./usr/share/info/ld.info-1
-./usr/share/info/ld.info-2
-./usr/share/info/ld.info-3
-./usr/share/info/ld.info-4
-./usr/share/info/ld.info-5
-./usr/share/info/ld.info-6
 ./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
 ./usr/share/man/cat8/ldconfig.0
diff --git a/distrib/sets/lists/man/md.hppa b/distrib/sets/lists/man/md.hppa
index f61cdaa85da..e83e355e226 100644
--- a/distrib/sets/lists/man/md.hppa
+++ b/distrib/sets/lists/man/md.hppa
@@ -1,22 +1,3 @@
 ./usr/share/info/as.info
-./usr/share/info/as.info-1
-./usr/share/info/as.info-2
-./usr/share/info/as.info-3
-./usr/share/info/as.info-4
-./usr/share/info/as.info-5
-./usr/share/info/as.info-6
-./usr/share/info/as.info-7
-./usr/share/info/as.info-8
-./usr/share/info/as.info-9
 ./usr/share/info/binutils.info
-./usr/share/info/binutils.info-1
-./usr/share/info/binutils.info-2
-./usr/share/info/binutils.info-3
-./usr/share/info/gasp.info
 ./usr/share/info/ld.info
-./usr/share/info/ld.info-1
-./usr/share/info/ld.info-2
-./usr/share/info/ld.info-3
-./usr/share/info/ld.info-4
-./usr/share/info/ld.info-5
-./usr/share/info/ld.info-6
diff --git a/distrib/sets/lists/man/md.i386 b/distrib/sets/lists/man/md.i386
index 57832be5ea4..a327150c0ef 100644
--- a/distrib/sets/lists/man/md.i386
+++ b/distrib/sets/lists/man/md.i386
@@ -1,25 +1,6 @@
 ./usr/share/info/as.info
-./usr/share/info/as.info-1
-./usr/share/info/as.info-2
-./usr/share/info/as.info-3
-./usr/share/info/as.info-4
-./usr/share/info/as.info-5
-./usr/share/info/as.info-6
-./usr/share/info/as.info-7
-./usr/share/info/as.info-8
-./usr/share/info/as.info-9
 ./usr/share/info/binutils.info
-./usr/share/info/binutils.info-1
-./usr/share/info/binutils.info-2
-./usr/share/info/binutils.info-3
-./usr/share/info/gasp.info
 ./usr/share/info/ld.info
-./usr/share/info/ld.info-1
-./usr/share/info/ld.info-2
-./usr/share/info/ld.info-3
-./usr/share/info/ld.info-4
-./usr/share/info/ld.info-5
-./usr/share/info/ld.info-6
 ./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
 ./usr/share/man/cat8/ldconfig.0
diff --git a/distrib/sets/lists/man/md.macppc b/distrib/sets/lists/man/md.macppc
index 57832be5ea4..a327150c0ef 100644
--- a/distrib/sets/lists/man/md.macppc
+++ b/distrib/sets/lists/man/md.macppc
@@ -1,25 +1,6 @@
 ./usr/share/info/as.info
-./usr/share/info/as.info-1
-./usr/share/info/as.info-2
-./usr/share/info/as.info-3
-./usr/share/info/as.info-4
-./usr/share/info/as.info-5
-./usr/share/info/as.info-6
-./usr/share/info/as.info-7
-./usr/share/info/as.info-8
-./usr/share/info/as.info-9
 ./usr/share/info/binutils.info
-./usr/share/info/binutils.info-1
-./usr/share/info/binutils.info-2
-./usr/share/info/binutils.info-3
-./usr/share/info/gasp.info
 ./usr/share/info/ld.info
-./usr/share/info/ld.info-1
-./usr/share/info/ld.info-2
-./usr/share/info/ld.info-3
-./usr/share/info/ld.info-4
-./usr/share/info/ld.info-5
-./usr/share/info/ld.info-6
 ./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
 ./usr/share/man/cat8/ldconfig.0
diff --git a/distrib/sets/lists/man/md.mvmeppc b/distrib/sets/lists/man/md.mvmeppc
index 57832be5ea4..a327150c0ef 100644
--- a/distrib/sets/lists/man/md.mvmeppc
+++ b/distrib/sets/lists/man/md.mvmeppc
@@ -1,25 +1,6 @@
 ./usr/share/info/as.info
-./usr/share/info/as.info-1
-./usr/share/info/as.info-2
-./usr/share/info/as.info-3
-./usr/share/info/as.info-4
-./usr/share/info/as.info-5
-./usr/share/info/as.info-6
-./usr/share/info/as.info-7
-./usr/share/info/as.info-8
-./usr/share/info/as.info-9
 ./usr/share/info/binutils.info
-./usr/share/info/binutils.info-1
-./usr/share/info/binutils.info-2
-./usr/share/info/binutils.info-3
-./usr/share/info/gasp.info
 ./usr/share/info/ld.info
-./usr/share/info/ld.info-1
-./usr/share/info/ld.info-2
-./usr/share/info/ld.info-3
-./usr/share/info/ld.info-4
-./usr/share/info/ld.info-5
-./usr/share/info/ld.info-6
 ./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
 ./usr/share/man/cat8/ldconfig.0
diff --git a/distrib/sets/lists/man/md.sparc b/distrib/sets/lists/man/md.sparc
index 57832be5ea4..a327150c0ef 100644
--- a/distrib/sets/lists/man/md.sparc
+++ b/distrib/sets/lists/man/md.sparc
@@ -1,25 +1,6 @@
 ./usr/share/info/as.info
-./usr/share/info/as.info-1
-./usr/share/info/as.info-2
-./usr/share/info/as.info-3
-./usr/share/info/as.info-4
-./usr/share/info/as.info-5
-./usr/share/info/as.info-6
-./usr/share/info/as.info-7
-./usr/share/info/as.info-8
-./usr/share/info/as.info-9
 ./usr/share/info/binutils.info
-./usr/share/info/binutils.info-1
-./usr/share/info/binutils.info-2
-./usr/share/info/binutils.info-3
-./usr/share/info/gasp.info
 ./usr/share/info/ld.info
-./usr/share/info/ld.info-1
-./usr/share/info/ld.info-2
-./usr/share/info/ld.info-3
-./usr/share/info/ld.info-4
-./usr/share/info/ld.info-5
-./usr/share/info/ld.info-6
 ./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
 ./usr/share/man/cat8/ldconfig.0
diff --git a/distrib/sets/lists/man/md.sparc64 b/distrib/sets/lists/man/md.sparc64
index 57832be5ea4..a327150c0ef 100644
--- a/distrib/sets/lists/man/md.sparc64
+++ b/distrib/sets/lists/man/md.sparc64
@@ -1,25 +1,6 @@
 ./usr/share/info/as.info
-./usr/share/info/as.info-1
-./usr/share/info/as.info-2
-./usr/share/info/as.info-3
-./usr/share/info/as.info-4
-./usr/share/info/as.info-5
-./usr/share/info/as.info-6
-./usr/share/info/as.info-7
-./usr/share/info/as.info-8
-./usr/share/info/as.info-9
 ./usr/share/info/binutils.info
-./usr/share/info/binutils.info-1
-./usr/share/info/binutils.info-2
-./usr/share/info/binutils.info-3
-./usr/share/info/gasp.info
 ./usr/share/info/ld.info
-./usr/share/info/ld.info-1
-./usr/share/info/ld.info-2
-./usr/share/info/ld.info-3
-./usr/share/info/ld.info-4
-./usr/share/info/ld.info-5
-./usr/share/info/ld.info-6
 ./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
 ./usr/share/man/cat8/ldconfig.0
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 77fb2a417db..de1bd3bdbd5 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -4,13 +4,6 @@
 ./usr/share/info/amdref.info-2
 ./usr/share/info/amdref.info-3
 ./usr/share/info/bfd.info
-./usr/share/info/bfd.info-1
-./usr/share/info/bfd.info-2
-./usr/share/info/bfd.info-3
-./usr/share/info/bfd.info-4
-./usr/share/info/bfd.info-5
-./usr/share/info/bfd.info-6
-./usr/share/info/bfd.info-7
 ./usr/share/info/cpp.info
 ./usr/share/info/cpp.info-1
 ./usr/share/info/cpp.info-2
@@ -113,18 +106,7 @@
 ./usr/share/info/gccint.info-8
 ./usr/share/info/gccint.info-9
 ./usr/share/info/gdb.info
-./usr/share/info/gdb.info-1
-./usr/share/info/gdb.info-2
-./usr/share/info/gdb.info-3
-./usr/share/info/gdb.info-4
-./usr/share/info/gdb.info-5
-./usr/share/info/gdb.info-6
-./usr/share/info/gdb.info-7
-./usr/share/info/gdb.info-8
-./usr/share/info/gdb.info-9
 ./usr/share/info/gdbint.info
-./usr/share/info/gdbint.info-1
-./usr/share/info/gdbint.info-2
 ./usr/share/info/heimdal.info
 ./usr/share/info/history.info
 ./usr/share/info/info-stnd.info
@@ -133,12 +115,7 @@
 ./usr/share/info/info-stnd.info-3
 ./usr/share/info/info.info
 ./usr/share/info/libiberty.info
-./usr/share/info/mmalloc.info
 ./usr/share/info/readline.info
-./usr/share/info/stabs.info
-./usr/share/info/stabs.info-1
-./usr/share/info/stabs.info-2
-./usr/share/info/stabs.info-3
 ./usr/share/info/texinfo
 ./usr/share/info/texinfo-1
 ./usr/share/info/texinfo-10