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