similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/bits/pthreadtypes.h
rename to sysdeps/aarch64/nptl/bits/pthreadtypes.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/bits/semaphore.h
rename to sysdeps/aarch64/nptl/bits/semaphore.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/bits/local_lim.h
rename to sysdeps/unix/sysv/linux/aarch64/bits/local_lim.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/aarch64/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/aarch64/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libanl.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libanl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/aarch64/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/localplt.data
rename to sysdeps/unix/sysv/linux/aarch64/localplt.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h
rename to sysdeps/unix/sysv/linux/aarch64/lowlevellock.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
rename to sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h