similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/arm/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/createthread.c
rename to sysdeps/unix/sysv/linux/arm/createthread.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/fork.c
rename to sysdeps/unix/sysv/linux/arm/fork.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/arm/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/arm/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/libanl.abilist
rename to sysdeps/unix/sysv/linux/arm/libanl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/arm/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/arm/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/arm/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/arm/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/arm/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/arm/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/arm/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/arm/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/arm/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/arm/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/localplt.data
rename to sysdeps/unix/sysv/linux/arm/localplt.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
rename to sysdeps/unix/sysv/linux/arm/lowlevellock.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
rename to sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
rename to sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
rename to sysdeps/unix/sysv/linux/arm/unwind-resume.c