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
