diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/c++-types.data b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/ld.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libanl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libanl.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libm.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/localplt.data b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/localplt.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/localplt.data
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/localplt.data
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/c++-types.data b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/ld.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libanl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libanl.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libm.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/localplt.data b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/localplt.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/localplt.data
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/localplt.data
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/c++-types.data b/sysdeps/unix/sysv/linux/powerpc/powerpc64/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/ld-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/ld-le.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/ld-le.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/ld-le.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/ld.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libBrokenLocale-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libBrokenLocale-le.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libBrokenLocale-le.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libBrokenLocale-le.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libanl-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libanl-le.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libanl-le.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libanl-le.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libanl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libanl.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libc-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libc-le.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libcrypt-le.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt-le.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libcrypt-le.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libdl-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libdl-le.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libdl-le.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libdl-le.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libm-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libm-le.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libm-le.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libm-le.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libm.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libnsl-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libnsl-le.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libnsl-le.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libnsl-le.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libpthread-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libpthread-le.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libpthread-le.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libpthread-le.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libresolv-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libresolv-le.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libresolv-le.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libresolv-le.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/librt-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/librt-le.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/librt-le.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/librt-le.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libthread_db-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libthread_db-le.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libthread_db-le.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libthread_db-le.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libutil-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libutil-le.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libutil-le.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libutil-le.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/localplt.data b/sysdeps/unix/sysv/linux/powerpc/powerpc64/localplt.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/localplt.data
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/localplt.data
