| Message ID | 20140625214457.9B7DE2C39D4@topped-with-meat.com |
|---|---|
| State | New |
| Headers | show |
OK. Testsuite passes as before on s390/s390x. libanl.abilist and localplt.data moved from s390-32 to s390-64 and vice versa, because both versions are each identical. Should the changelog be adjusted in order to reflect a s390-32|64 to s390-32|64 move? Thanks. On 06/25/2014 11:44 PM, Roland McGrath wrote: > Not tested, but this should not change anything. > > > Thanks, > Roland > > > * 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-64/nptl/libanl.abilist: Moved ... > * sysdeps/unix/sysv/linux/s390/s390-32/libanl.abilist: ... here. > * 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-64/nptl/localplt.data: Moved ... > * sysdeps/unix/sysv/linux/s390/s390-32/localplt.data: ... here. > * 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-32/nptl/libanl.abilist: Moved ... > * sysdeps/unix/sysv/linux/s390/s390-64/libanl.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. > * sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data: Moved ... > * sysdeps/unix/sysv/linux/s390/s390-64/localplt.data: ... here. > > 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-64/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libanl.abilist > similarity index 100% > rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libanl.abilist > rename to sysdeps/unix/sysv/linux/s390/s390-32/libanl.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-64/nptl/localplt.data b/sysdeps/unix/sysv/linux/s390/s390-32/localplt.data > similarity index 100% > rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/localplt.data > rename to sysdeps/unix/sysv/linux/s390/s390-32/localplt.data > 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-32/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libanl.abilist > similarity index 100% > rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libanl.abilist > rename to sysdeps/unix/sysv/linux/s390/s390-64/libanl.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 > diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data b/sysdeps/unix/sysv/linux/s390/s390-64/localplt.data > similarity index 100% > rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data > rename to sysdeps/unix/sysv/linux/s390/s390-64/localplt.data >
> libanl.abilist and localplt.data moved from s390-32 to s390-64 and vice > versa, because both versions are each identical. Should the changelog be > adjusted in order to reflect a s390-32|64 to s390-32|64 move? Unless you see a reason not to, I'll just consolidate the identical files in the s390/ directory instead of having two copies. Thanks, Roland
I've committed all the changes on the branch now. For this last one, I consolidated the identical files into the common s390/ directory. Thanks, Roland
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-64/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libanl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/libanl.abilist rename to sysdeps/unix/sysv/linux/s390/s390-32/libanl.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-64/nptl/localplt.data b/sysdeps/unix/sysv/linux/s390/s390-32/localplt.data similarity index 100% rename from sysdeps/unix/sysv/linux/s390/s390-64/nptl/localplt.data rename to sysdeps/unix/sysv/linux/s390/s390-32/localplt.data 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-32/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libanl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/libanl.abilist rename to sysdeps/unix/sysv/linux/s390/s390-64/libanl.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 diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data b/sysdeps/unix/sysv/linux/s390/s390-64/localplt.data similarity index 100% rename from sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data rename to sysdeps/unix/sysv/linux/s390/s390-64/localplt.data