deleted file mode 100644
@@ -1 +0,0 @@
-hppa.*-.*-linux.* libpthread=0 GLIBC_2.2
@@ -1,9 +1 @@
-hppa.*-.*-.* libm=6 GLIBC_2.2
-
-hppa.*-.*-.* libc=6 GLIBC_2.2
-
-hppa.*-.*-.* ld=ld.so.1 GLIBC_2.2
-
-hppa-.*-.* libBrokenLocale=1 GLIBC_2.2
-
hppa.*-.*-.* libgcc_s=4
deleted file mode 100644
@@ -1 +0,0 @@
-ia64.*-.*-linux.* libpthread=0 GLIBC_2.2
deleted file mode 100644
@@ -1 +0,0 @@
-mips.*-.*-linux.* libpthread=0 GLIBC_2.0 GLIBC_2.2
similarity index 100%
rename from sysdeps/aarch64/shlib-versions
rename to sysdeps/unix/sysv/linux/aarch64/shlib-versions
similarity index 100%
rename from sysdeps/alpha/shlib-versions
rename to sysdeps/unix/sysv/linux/alpha/shlib-versions
similarity index 100%
rename from sysdeps/arm/shlib-versions
rename to sysdeps/unix/sysv/linux/arm/shlib-versions
new file mode 100644
@@ -0,0 +1,9 @@
+hppa.*-.*-.* libm=6 GLIBC_2.2
+
+hppa.*-.*-.* libc=6 GLIBC_2.2
+
+hppa.*-.*-.* ld=ld.so.1 GLIBC_2.2
+
+hppa-.*-.* libBrokenLocale=1 GLIBC_2.2
+
+hppa.*-.*-linux.* libpthread=0 GLIBC_2.2
similarity index 79%
rename from sysdeps/ia64/shlib-versions
rename to sysdeps/unix/sysv/linux/ia64/shlib-versions
@@ -4,3 +4,5 @@ ia64-.*-linux.* libm=6.1 GLIBC_2.2
ia64-.*-linux.* ld=ld-linux-ia64.so.2 GLIBC_2.2
ia64-.*-.* libBrokenLocale=1 GLIBC_2.2
+
+ia64.*-.*-linux.* libpthread=0 GLIBC_2.2
similarity index 100%
rename from sysdeps/m68k/coldfire/shlib-versions
rename to sysdeps/unix/sysv/linux/m68k/coldfire/shlib-versions
similarity index 100%
rename from sysdeps/microblaze/shlib-versions
rename to sysdeps/unix/sysv/linux/microblaze/shlib-versions
similarity index 94%
rename from sysdeps/mips/shlib-versions
rename to sysdeps/unix/sysv/linux/mips/shlib-versions
@@ -23,3 +23,5 @@ mips.*-.*-linux.* libnss_hesiod=2 GLIBC_2.0 GLIBC_2.2
mips.*-.*-linux.* libnsl=1 GLIBC_2.0 GLIBC_2.2
mips.*-.*-linux.* librt=1 GLIBC_2.0 GLIBC_2.2
+
+mips.*-.*-linux.* libpthread=0 GLIBC_2.0 GLIBC_2.2
similarity index 100%
rename from sysdeps/tile/shlib-versions
rename to sysdeps/unix/sysv/linux/tile/shlib-versions
@@ -1,3 +1,4 @@
# Configuration DEFAULT Earliest symbol set
# ------------- --------------- ------------------------------
+x86_64-.*-linux.* DEFAULT GLIBC_2.2.5
x86_64-.*-linux.* libpthread=0 GLIBC_2.2.5
@@ -1,3 +1,4 @@
# Configuration DEFAULT Earliest symbol set
# ------------- --------------- ------------------------------
+x86_64-.*-linux.* DEFAULT GLIBC_2.16
x86_64-.*-linux.* libpthread=0 GLIBC_2.16
deleted file mode 100644
@@ -1,3 +0,0 @@
-# Configuration DEFAULT Earliest symbol set
-# ------------- --------------- ------------------------------
-x86_64-.*-linux.* DEFAULT GLIBC_2.2.5
deleted file mode 100644
@@ -1,3 +0,0 @@
-# Configuration DEFAULT Earliest symbol set
-# ------------- --------------- ------------------------------
-x86_64-.*-linux.* DEFAULT GLIBC_2.16