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

31 files changed, 70 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index ae25794f7d..98b0eb2b32 100644
--- 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-32/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/s390/libanl.abilist
index c9755d8a33..c9755d8a33 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libanl.abilist
+++ b/sysdeps/unix/sysv/linux/s390/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data b/sysdeps/unix/sysv/linux/s390/localplt.data
index 8fb56b6086..8fb56b6086 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data
+++ b/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
index 6e2036ec01..6e2036ec01 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/c++-types.data
+++ b/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
index 4e2b582f19..4e2b582f19 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/ld.abilist
+++ b/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
index f4ca37f44b..f4ca37f44b 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libBrokenLocale.abilist
+++ b/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
index 03f2e83805..03f2e83805 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libc.abilist
+++ b/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
index 1df145f260..1df145f260 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist
+++ b/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
index 62e6b41edb..62e6b41edb 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libdl.abilist
+++ b/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
index f836c90d94..f836c90d94 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libm.abilist
+++ b/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
index 4241e2d887..4241e2d887 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libnsl.abilist
+++ b/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
index 699de0160c..699de0160c 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libpthread.abilist
+++ b/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
index f68333d4a4..f68333d4a4 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libresolv.abilist
+++ b/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
index af7df27cb3..af7df27cb3 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/librt.abilist
+++ b/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
index f33138067c..f33138067c 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libthread_db.abilist
+++ b/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
index 9dc14a5f89..9dc14a5f89 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libutil.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libutil.abilist
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
index 23c11dc41b..23c11dc41b 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/c++-types.data
+++ b/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
index 5ed0cdad73..5ed0cdad73 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/ld.abilist
+++ b/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
index b7aa242c86..b7aa242c86 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libBrokenLocale.abilist
+++ b/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
index 4576fc8d14..4576fc8d14 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libc.abilist
+++ b/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
index e3bd54f15e..e3bd54f15e 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist
+++ b/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
index d5c01a984d..d5c01a984d 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libdl.abilist
+++ b/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
index a0891ad252..a0891ad252 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libm.abilist
+++ b/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
index 7bcc733769..7bcc733769 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libnsl.abilist
+++ b/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
index 51a8a7ff60..51a8a7ff60 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libpthread.abilist
+++ b/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
index dd7837d8f6..dd7837d8f6 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libresolv.abilist
+++ b/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
index 708ba3aada..708ba3aada 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/librt.abilist
+++ b/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
index 6c99a66e32..6c99a66e32 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libthread_db.abilist
+++ b/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
index 6a839d1b1e..6a839d1b1e 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libutil.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libanl.abilist
deleted file mode 100644
index c9755d8a33..0000000000
--- a/sysdeps/unix/sysv/linux/s390/s390-64/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-64/nptl/localplt.data b/sysdeps/unix/sysv/linux/s390/s390-64/nptl/localplt.data
deleted file mode 100644
index 8fb56b6086..0000000000
--- a/sysdeps/unix/sysv/linux/s390/s390-64/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