From a5d87b3db4f40a0f07e41f1986ac7f330743a0e7 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 14 May 2014 15:45:23 -0700 Subject: [PATCH] x86: Move abilist files out of nptl/ subdirectories. --- ChangeLog | 90 +++++++++++++++++++ .../sysv/linux/i386/{nptl => }/c++-types.data | 0 .../sysv/linux/i386/{nptl => }/ld.abilist | 0 .../i386/{nptl => }/libBrokenLocale.abilist | 0 .../sysv/linux/i386/{nptl => }/libanl.abilist | 0 .../sysv/linux/i386/{nptl => }/libc.abilist | 0 .../linux/i386/{nptl => }/libcrypt.abilist | 0 .../sysv/linux/i386/{nptl => }/libdl.abilist | 0 .../sysv/linux/i386/{nptl => }/libm.abilist | 0 .../sysv/linux/i386/{nptl => }/libnsl.abilist | 0 .../linux/i386/{nptl => }/libpthread.abilist | 0 .../linux/i386/{nptl => }/libresolv.abilist | 0 .../sysv/linux/i386/{nptl => }/librt.abilist | 0 .../i386/{nptl => }/libthread_db.abilist | 0 .../linux/i386/{nptl => }/libutil.abilist | 0 .../sysv/linux/i386/{nptl => }/localplt.data | 0 .../linux/x86_64/64/{nptl => }/c++-types.data | 0 .../linux/x86_64/64/{nptl => }/ld.abilist | 0 .../64/{nptl => }/libBrokenLocale.abilist | 0 .../linux/x86_64/64/{nptl => }/libanl.abilist | 0 .../linux/x86_64/64/{nptl => }/libc.abilist | 0 .../x86_64/64/{nptl => }/libcrypt.abilist | 0 .../linux/x86_64/64/{nptl => }/libdl.abilist | 0 .../linux/x86_64/64/{nptl => }/libm.abilist | 0 .../linux/x86_64/64/{nptl => }/libnsl.abilist | 0 .../x86_64/64/{nptl => }/libpthread.abilist | 0 .../x86_64/64/{nptl => }/libresolv.abilist | 0 .../linux/x86_64/64/{nptl => }/librt.abilist | 0 .../x86_64/64/{nptl => }/libthread_db.abilist | 0 .../x86_64/64/{nptl => }/libutil.abilist | 0 .../x86_64/x32/{nptl => }/c++-types.data | 0 .../linux/x86_64/x32/{nptl => }/ld.abilist | 0 .../x32/{nptl => }/libBrokenLocale.abilist | 0 .../x86_64/x32/{nptl => }/libanl.abilist | 0 .../linux/x86_64/x32/{nptl => }/libc.abilist | 0 .../x86_64/x32/{nptl => }/libcrypt.abilist | 0 .../linux/x86_64/x32/{nptl => }/libdl.abilist | 0 .../linux/x86_64/x32/{nptl => }/libm.abilist | 0 .../x86_64/x32/{nptl => }/libnsl.abilist | 0 .../x86_64/x32/{nptl => }/libpthread.abilist | 0 .../x86_64/x32/{nptl => }/libresolv.abilist | 0 .../linux/x86_64/x32/{nptl => }/librt.abilist | 0 .../x32/{nptl => }/libthread_db.abilist | 0 .../x86_64/x32/{nptl => }/libutil.abilist | 0 44 files changed, 90 insertions(+) rename sysdeps/unix/sysv/linux/i386/{nptl => }/c++-types.data (100%) rename sysdeps/unix/sysv/linux/i386/{nptl => }/ld.abilist (100%) rename sysdeps/unix/sysv/linux/i386/{nptl => }/libBrokenLocale.abilist (100%) rename sysdeps/unix/sysv/linux/i386/{nptl => }/libanl.abilist (100%) rename sysdeps/unix/sysv/linux/i386/{nptl => }/libc.abilist (100%) rename sysdeps/unix/sysv/linux/i386/{nptl => }/libcrypt.abilist (100%) rename sysdeps/unix/sysv/linux/i386/{nptl => }/libdl.abilist (100%) rename sysdeps/unix/sysv/linux/i386/{nptl => }/libm.abilist (100%) rename sysdeps/unix/sysv/linux/i386/{nptl => }/libnsl.abilist (100%) rename sysdeps/unix/sysv/linux/i386/{nptl => }/libpthread.abilist (100%) rename sysdeps/unix/sysv/linux/i386/{nptl => }/libresolv.abilist (100%) rename sysdeps/unix/sysv/linux/i386/{nptl => }/librt.abilist (100%) rename sysdeps/unix/sysv/linux/i386/{nptl => }/libthread_db.abilist (100%) rename sysdeps/unix/sysv/linux/i386/{nptl => }/libutil.abilist (100%) rename sysdeps/unix/sysv/linux/i386/{nptl => }/localplt.data (100%) rename sysdeps/unix/sysv/linux/x86_64/64/{nptl => }/c++-types.data (100%) rename sysdeps/unix/sysv/linux/x86_64/64/{nptl => }/ld.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/64/{nptl => }/libBrokenLocale.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/64/{nptl => }/libanl.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/64/{nptl => }/libc.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/64/{nptl => }/libcrypt.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/64/{nptl => }/libdl.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/64/{nptl => }/libm.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/64/{nptl => }/libnsl.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/64/{nptl => }/libpthread.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/64/{nptl => }/libresolv.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/64/{nptl => }/librt.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/64/{nptl => }/libthread_db.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/64/{nptl => }/libutil.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/x32/{nptl => }/c++-types.data (100%) rename sysdeps/unix/sysv/linux/x86_64/x32/{nptl => }/ld.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/x32/{nptl => }/libBrokenLocale.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/x32/{nptl => }/libanl.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/x32/{nptl => }/libc.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/x32/{nptl => }/libcrypt.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/x32/{nptl => }/libdl.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/x32/{nptl => }/libm.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/x32/{nptl => }/libnsl.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/x32/{nptl => }/libpthread.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/x32/{nptl => }/libresolv.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/x32/{nptl => }/librt.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/x32/{nptl => }/libthread_db.abilist (100%) rename sysdeps/unix/sysv/linux/x86_64/x32/{nptl => }/libutil.abilist (100%) diff --git a/ChangeLog b/ChangeLog index b6f05608e3..fc822fe9a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,95 @@ 2014-05-14 Roland McGrath + * sysdeps/unix/sysv/linux/i386/nptl/c++-types.data: Moved ... + * sysdeps/unix/sysv/linux/i386/c++-types.data: ... here. + * sysdeps/unix/sysv/linux/i386/nptl/ld.abilist: Moved ... + * sysdeps/unix/sysv/linux/i386/ld.abilist: ... here. + * sysdeps/unix/sysv/linux/i386/nptl/libBrokenLocale.abilist: Moved ... + * sysdeps/unix/sysv/linux/i386/libBrokenLocale.abilist: ... here. + * sysdeps/unix/sysv/linux/i386/nptl/libanl.abilist: Moved ... + * sysdeps/unix/sysv/linux/i386/libanl.abilist: ... here. + * sysdeps/unix/sysv/linux/i386/nptl/libc.abilist: Moved ... + * sysdeps/unix/sysv/linux/i386/libc.abilist: ... here. + * sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist: Moved ... + * sysdeps/unix/sysv/linux/i386/libcrypt.abilist: ... here. + * sysdeps/unix/sysv/linux/i386/nptl/libdl.abilist: Moved ... + * sysdeps/unix/sysv/linux/i386/libdl.abilist: ... here. + * sysdeps/unix/sysv/linux/i386/nptl/libm.abilist: Moved ... + * sysdeps/unix/sysv/linux/i386/libm.abilist: ... here. + * sysdeps/unix/sysv/linux/i386/nptl/libnsl.abilist: Moved ... + * sysdeps/unix/sysv/linux/i386/libnsl.abilist: ... here. + * sysdeps/unix/sysv/linux/i386/nptl/libpthread.abilist: Moved ... + * sysdeps/unix/sysv/linux/i386/libpthread.abilist: ... here. + * sysdeps/unix/sysv/linux/i386/nptl/libresolv.abilist: Moved ... + * sysdeps/unix/sysv/linux/i386/libresolv.abilist: ... here. + * sysdeps/unix/sysv/linux/i386/nptl/librt.abilist: Moved ... + * sysdeps/unix/sysv/linux/i386/librt.abilist: ... here. + * sysdeps/unix/sysv/linux/i386/nptl/libthread_db.abilist: Moved ... + * sysdeps/unix/sysv/linux/i386/libthread_db.abilist: ... here. + * sysdeps/unix/sysv/linux/i386/nptl/libutil.abilist: Moved ... + * sysdeps/unix/sysv/linux/i386/libutil.abilist: ... here. + * sysdeps/unix/sysv/linux/i386/nptl/localplt.data: Moved ... + * sysdeps/unix/sysv/linux/i386/localplt.data: ... here. + * sysdeps/unix/sysv/linux/x86_64/64/nptl/c++-types.data: Moved ... + * sysdeps/unix/sysv/linux/x86_64/64/c++-types.data: ... here. + * sysdeps/unix/sysv/linux/x86_64/64/nptl/ld.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/64/ld.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/64/nptl/libBrokenLocale.abilist: + Moved ... + * sysdeps/unix/sysv/linux/x86_64/64/libBrokenLocale.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/64/nptl/libanl.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/64/libanl.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/64/nptl/libc.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/64/libc.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/64/libcrypt.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/64/nptl/libdl.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/64/libdl.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/64/nptl/libm.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/64/libm.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/64/nptl/libnsl.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/64/libnsl.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/64/nptl/libpthread.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/64/nptl/libresolv.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/64/nptl/librt.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/64/librt.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/64/nptl/libthread_db.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/64/libthread_db.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/64/nptl/libutil.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/64/libutil.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/x32/nptl/c++-types.data: Moved ... + * sysdeps/unix/sysv/linux/x86_64/x32/c++-types.data: ... here. + * sysdeps/unix/sysv/linux/x86_64/x32/nptl/ld.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/x32/ld.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libBrokenLocale.abilist: + Moved ... + * sysdeps/unix/sysv/linux/x86_64/x32/libBrokenLocale.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libanl.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/x32/libanl.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libc.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/x32/libcrypt.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libdl.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/x32/libdl.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libm.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/x32/libm.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libnsl.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/x32/libnsl.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libpthread.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libresolv.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/x32/nptl/librt.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libthread_db.abilist: + Moved ... + * sysdeps/unix/sysv/linux/x86_64/x32/libthread_db.abilist: ... here. + * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libutil.abilist: Moved ... + * sysdeps/unix/sysv/linux/x86_64/x32/libutil.abilist: ... here. + * nptl/sysdeps/unix/sysv/linux/x86/Makefile: File removed. * sysdeps/unix/sysv/linux/x86/Makefile [$(subdir) = nptl] (libpthread-sysdep_routines): Add elision-related stuff here instead. diff --git a/sysdeps/unix/sysv/linux/i386/nptl/c++-types.data b/sysdeps/unix/sysv/linux/i386/c++-types.data similarity index 100% rename from sysdeps/unix/sysv/linux/i386/nptl/c++-types.data rename to sysdeps/unix/sysv/linux/i386/c++-types.data diff --git a/sysdeps/unix/sysv/linux/i386/nptl/ld.abilist b/sysdeps/unix/sysv/linux/i386/ld.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/i386/nptl/ld.abilist rename to sysdeps/unix/sysv/linux/i386/ld.abilist diff --git a/sysdeps/unix/sysv/linux/i386/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/i386/libBrokenLocale.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/i386/nptl/libBrokenLocale.abilist rename to sysdeps/unix/sysv/linux/i386/libBrokenLocale.abilist diff --git a/sysdeps/unix/sysv/linux/i386/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/i386/libanl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/i386/nptl/libanl.abilist rename to sysdeps/unix/sysv/linux/i386/libanl.abilist diff --git a/sysdeps/unix/sysv/linux/i386/nptl/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/i386/nptl/libc.abilist rename to sysdeps/unix/sysv/linux/i386/libc.abilist diff --git a/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/i386/libcrypt.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist rename to sysdeps/unix/sysv/linux/i386/libcrypt.abilist diff --git a/sysdeps/unix/sysv/linux/i386/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/i386/libdl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/i386/nptl/libdl.abilist rename to sysdeps/unix/sysv/linux/i386/libdl.abilist diff --git a/sysdeps/unix/sysv/linux/i386/nptl/libm.abilist b/sysdeps/unix/sysv/linux/i386/libm.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/i386/nptl/libm.abilist rename to sysdeps/unix/sysv/linux/i386/libm.abilist diff --git a/sysdeps/unix/sysv/linux/i386/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/i386/libnsl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/i386/nptl/libnsl.abilist rename to sysdeps/unix/sysv/linux/i386/libnsl.abilist diff --git a/sysdeps/unix/sysv/linux/i386/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/i386/nptl/libpthread.abilist rename to sysdeps/unix/sysv/linux/i386/libpthread.abilist diff --git a/sysdeps/unix/sysv/linux/i386/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/i386/libresolv.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/i386/nptl/libresolv.abilist rename to sysdeps/unix/sysv/linux/i386/libresolv.abilist diff --git a/sysdeps/unix/sysv/linux/i386/nptl/librt.abilist b/sysdeps/unix/sysv/linux/i386/librt.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/i386/nptl/librt.abilist rename to sysdeps/unix/sysv/linux/i386/librt.abilist diff --git a/sysdeps/unix/sysv/linux/i386/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/i386/libthread_db.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/i386/nptl/libthread_db.abilist rename to sysdeps/unix/sysv/linux/i386/libthread_db.abilist diff --git a/sysdeps/unix/sysv/linux/i386/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/i386/libutil.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/i386/nptl/libutil.abilist rename to sysdeps/unix/sysv/linux/i386/libutil.abilist diff --git a/sysdeps/unix/sysv/linux/i386/nptl/localplt.data b/sysdeps/unix/sysv/linux/i386/localplt.data similarity index 100% rename from sysdeps/unix/sysv/linux/i386/nptl/localplt.data rename to sysdeps/unix/sysv/linux/i386/localplt.data diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/c++-types.data b/sysdeps/unix/sysv/linux/x86_64/64/c++-types.data similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/64/nptl/c++-types.data rename to sysdeps/unix/sysv/linux/x86_64/64/c++-types.data diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/ld.abilist b/sysdeps/unix/sysv/linux/x86_64/64/ld.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/64/nptl/ld.abilist rename to sysdeps/unix/sysv/linux/x86_64/64/ld.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libBrokenLocale.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/64/nptl/libBrokenLocale.abilist rename to sysdeps/unix/sysv/linux/x86_64/64/libBrokenLocale.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libanl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/64/nptl/libanl.abilist rename to sysdeps/unix/sysv/linux/x86_64/64/libanl.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/64/nptl/libc.abilist rename to sysdeps/unix/sysv/linux/x86_64/64/libc.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libcrypt.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist rename to sysdeps/unix/sysv/linux/x86_64/64/libcrypt.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libdl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/64/nptl/libdl.abilist rename to sysdeps/unix/sysv/linux/x86_64/64/libdl.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libm.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libm.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/64/nptl/libm.abilist rename to sysdeps/unix/sysv/linux/x86_64/64/libm.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libnsl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/64/nptl/libnsl.abilist rename to sysdeps/unix/sysv/linux/x86_64/64/libnsl.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/64/nptl/libpthread.abilist rename to sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/64/nptl/libresolv.abilist rename to sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/librt.abilist b/sysdeps/unix/sysv/linux/x86_64/64/librt.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/64/nptl/librt.abilist rename to sysdeps/unix/sysv/linux/x86_64/64/librt.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libthread_db.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/64/nptl/libthread_db.abilist rename to sysdeps/unix/sysv/linux/x86_64/64/libthread_db.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/64/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libutil.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/64/nptl/libutil.abilist rename to sysdeps/unix/sysv/linux/x86_64/64/libutil.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/nptl/c++-types.data b/sysdeps/unix/sysv/linux/x86_64/x32/c++-types.data similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/x32/nptl/c++-types.data rename to sysdeps/unix/sysv/linux/x86_64/x32/c++-types.data diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/nptl/ld.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/ld.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/x32/nptl/ld.abilist rename to sysdeps/unix/sysv/linux/x86_64/x32/ld.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libBrokenLocale.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/x32/nptl/libBrokenLocale.abilist rename to sysdeps/unix/sysv/linux/x86_64/x32/libBrokenLocale.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libanl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/x32/nptl/libanl.abilist rename to sysdeps/unix/sysv/linux/x86_64/x32/libanl.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/x32/nptl/libc.abilist rename to sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libcrypt.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist rename to sysdeps/unix/sysv/linux/x86_64/x32/libcrypt.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libdl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/x32/nptl/libdl.abilist rename to sysdeps/unix/sysv/linux/x86_64/x32/libdl.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libm.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libm.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/x32/nptl/libm.abilist rename to sysdeps/unix/sysv/linux/x86_64/x32/libm.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libnsl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/x32/nptl/libnsl.abilist rename to sysdeps/unix/sysv/linux/x86_64/x32/libnsl.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/x32/nptl/libpthread.abilist rename to sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/x32/nptl/libresolv.abilist rename to sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/nptl/librt.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/x32/nptl/librt.abilist rename to sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libthread_db.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/x32/nptl/libthread_db.abilist rename to sysdeps/unix/sysv/linux/x86_64/x32/libthread_db.abilist diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libutil.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/x86_64/x32/nptl/libutil.abilist rename to sysdeps/unix/sysv/linux/x86_64/x32/libutil.abilist