diff --git a/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h b/sysdeps/unix/sysv/linux/mips/lowlevellock.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h
rename to sysdeps/unix/sysv/linux/mips/lowlevellock.h
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/c++-types.data b/sysdeps/unix/sysv/linux/mips/mips32/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/mips/mips32/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/nptl/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/fpu/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/ld.abilist b/sysdeps/unix/sysv/linux/mips/mips32/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libanl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libanl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcidn.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libcidn.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libcidn.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libcidn.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libm.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_compat.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_compat.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_compat.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_compat.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_db.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_db.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_db.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_dns.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_dns.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_dns.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_dns.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_files.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_files.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_files.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_files.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_hesiod.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_hesiod.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_hesiod.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_hesiod.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nis.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_nis.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nis.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_nis.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nisplus.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_nisplus.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nisplus.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_nisplus.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/nptl/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips32/nofpu/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/c++-types.data b/sysdeps/unix/sysv/linux/mips/mips64/n32/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/ld.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libanl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libanl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libm.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/c++-types.data b/sysdeps/unix/sysv/linux/mips/mips64/n64/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/ld.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libanl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libanl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libm.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h
rename to sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
diff --git a/sysdeps/unix/sysv/linux/mips/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/mips/nptl/sysdep-cancel.h
rename to sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
