S390: Consolidate nptl/ subdirectories under linux/...

diff --git a/ChangeLog b/ChangeLog
index ae25794..98b0eb2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,75 @@
 2014-06-26  Roland McGrath  <roland@hack.frob.com>
 
+       * sysdeps/unix/sysv/linux/s390/s390-32/nptl/c++-types.data: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-32/c++-types.data: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-32/nptl/ld.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-32/ld.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-32/nptl/libBrokenLocale.abilist:
+       Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-32/libBrokenLocale.abilist:
+       ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-32/nptl/libanl.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/libanl.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-64/nptl/libanl.abilist:
+       Identical file removed.
+       * sysdeps/unix/sysv/linux/s390/s390-32/nptl/libc.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-32/libcrypt.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-32/nptl/libdl.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-32/libdl.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-32/nptl/libm.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-32/libm.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-32/nptl/libnsl.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-32/libnsl.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-32/nptl/libpthread.abilist:
+       Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-32/nptl/libresolv.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-32/nptl/librt.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-32/nptl/libthread_db.abilist:
+       Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-32/libthread_db.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-32/nptl/libutil.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-32/libutil.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data: Moved ...
+       * sysdeps/unix/sysv/linux/s390/localplt.data: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-64/nptl/localplt.data:
+       Identical file removed.
+       * sysdeps/unix/sysv/linux/s390/s390-64/nptl/c++-types.data: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-64/c++-types.data: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-64/nptl/ld.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-64/ld.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-64/nptl/libBrokenLocale.abilist:
+       Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-64/libBrokenLocale.abilist:
+       ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-64/nptl/libc.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-64/libcrypt.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-64/nptl/libdl.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-64/libdl.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-64/nptl/libm.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-64/libm.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-64/nptl/libnsl.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-64/libnsl.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-64/nptl/libpthread.abilist:
+       Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-64/nptl/libresolv.abilist:
+       Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-64/nptl/librt.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-64/nptl/libthread_db.abilist:
+       Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-64/libthread_db.abilist: ... here.
+       * sysdeps/unix/sysv/linux/s390/s390-64/nptl/libutil.abilist: Moved ...
+       * sysdeps/unix/sysv/linux/s390/s390-64/libutil.abilist: ... here.
+
        * nptl/sysdeps/unix/sysv/linux/s390/Makefile: File removed, contents
        folded into ...
        * sysdeps/unix/sysv/linux/s390/Makefile [$(subdir) = nptl]: ... here.

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/s390/libanl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libanl.abilist
rename to sysdeps/unix/sysv/linux/s390/libanl.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/localplt.data b/sysdeps/unix/sysv/linux/s390/localplt.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/localplt.data
rename to sysdeps/unix/sysv/linux/s390/localplt.data

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/c++-types.data b/sysdeps/unix/sysv/linux/s390/s390-32/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/s390/s390-32/c++-types.data

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/ld.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/ld.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libBrokenLocale.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libcrypt.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libdl.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libm.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libm.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libnsl.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/librt.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libthread_db.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-32/libutil.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libanl.abilist
deleted file mode 100644 (file)
index c9755d8..0000000
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libanl.abilist
+++ /dev/null
@@ -1,6 +0,0 @@
-GLIBC_2.2.3
- GLIBC_2.2.3 A
- gai_cancel F
- gai_error F
- gai_suspend F
- getaddrinfo_a F

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data b/sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data
deleted file mode 100644 (file)
index 8fb56b6..0000000
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data
+++ /dev/null
@@ -1,7 +0,0 @@
-libc.so: _Unwind_Find_FDE
-libc.so: calloc
-libc.so: free
-libc.so: malloc
-libc.so: memalign
-libc.so: realloc
-libm.so: matherr

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/c++-types.data b/sysdeps/unix/sysv/linux/s390/s390-64/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/s390/s390-64/c++-types.data

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/ld.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/ld.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libBrokenLocale.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libcrypt.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libdl.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libm.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libm.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libnsl.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/librt.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libthread_db.abilist

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/s390/s390-64/libutil.abilist