From 15bed4728f909c81e735ae09b23170d12a3c0b06 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 23 Jun 2014 09:24:18 -0700 Subject: [PATCH] m68k: Consolidate nptl/ subdirectories under linux/... --- ChangeLog | 77 ++++++++++++++++++++++ .../sysv/linux => }/m68k/nptl/bits/pthreadtypes.h | 0 .../sysv/linux => }/m68k/nptl/bits/semaphore.h | 0 .../unix/sysv/linux/m68k/{nptl => }/c++-types.data | 0 .../linux/m68k/coldfire/{nptl => }/bits/atomic.h | 0 .../sysv/linux/m68k/coldfire/{nptl => }/ld.abilist | 0 .../coldfire/{nptl => }/libBrokenLocale.abilist | 0 .../linux/m68k/coldfire/{nptl => }/libanl.abilist | 0 .../linux/m68k/coldfire/{nptl => }/libc.abilist | 0 .../m68k/coldfire/{nptl => }/libcrypt.abilist | 0 .../linux/m68k/coldfire/{nptl => }/libdl.abilist | 0 .../linux/m68k/coldfire/{nptl => }/libm.abilist | 0 .../linux/m68k/coldfire/{nptl => }/libnsl.abilist | 0 .../m68k/coldfire/{nptl => }/libpthread.abilist | 0 .../m68k/coldfire/{nptl => }/libresolv.abilist | 0 .../linux/m68k/coldfire/{nptl => }/librt.abilist | 0 .../m68k/coldfire/{nptl => }/libthread_db.abilist | 0 .../linux/m68k/coldfire/{nptl => }/libutil.abilist | 0 .../unix/sysv/linux/m68k/{nptl => }/localplt.data | 0 .../unix/sysv/linux/m68k/{nptl => }/lowlevellock.h | 0 .../sysv/linux/m68k/m680x0/{nptl => }/ld.abilist | 0 .../m68k/m680x0/{nptl => }/libBrokenLocale.abilist | 0 .../linux/m68k/m680x0/{nptl => }/libanl.abilist | 0 .../sysv/linux/m68k/m680x0/{nptl => }/libc.abilist | 0 .../linux/m68k/m680x0/{nptl => }/libcrypt.abilist | 0 .../linux/m68k/m680x0/{nptl => }/libdl.abilist | 0 .../sysv/linux/m68k/m680x0/{nptl => }/libm.abilist | 0 .../linux/m68k/m680x0/{nptl => }/libnsl.abilist | 0 .../m68k/m680x0/{nptl => }/libpthread.abilist | 0 .../linux/m68k/m680x0/{nptl => }/libresolv.abilist | 0 .../linux/m68k/m680x0/{nptl => }/librt.abilist | 0 .../m68k/m680x0/{nptl => }/libthread_db.abilist | 0 .../linux/m68k/m680x0/{nptl => }/libutil.abilist | 0 .../sysv/linux/m68k/{nptl => }/sysdep-cancel.h | 0 34 files changed, 77 insertions(+) rename sysdeps/{unix/sysv/linux => }/m68k/nptl/bits/pthreadtypes.h (100%) rename sysdeps/{unix/sysv/linux => }/m68k/nptl/bits/semaphore.h (100%) rename sysdeps/unix/sysv/linux/m68k/{nptl => }/c++-types.data (100%) rename sysdeps/unix/sysv/linux/m68k/coldfire/{nptl => }/bits/atomic.h (100%) rename sysdeps/unix/sysv/linux/m68k/coldfire/{nptl => }/ld.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/coldfire/{nptl => }/libBrokenLocale.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/coldfire/{nptl => }/libanl.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/coldfire/{nptl => }/libc.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/coldfire/{nptl => }/libcrypt.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/coldfire/{nptl => }/libdl.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/coldfire/{nptl => }/libm.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/coldfire/{nptl => }/libnsl.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/coldfire/{nptl => }/libpthread.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/coldfire/{nptl => }/libresolv.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/coldfire/{nptl => }/librt.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/coldfire/{nptl => }/libthread_db.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/coldfire/{nptl => }/libutil.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/{nptl => }/localplt.data (100%) rename sysdeps/unix/sysv/linux/m68k/{nptl => }/lowlevellock.h (100%) rename sysdeps/unix/sysv/linux/m68k/m680x0/{nptl => }/ld.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/m680x0/{nptl => }/libBrokenLocale.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/m680x0/{nptl => }/libanl.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/m680x0/{nptl => }/libc.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/m680x0/{nptl => }/libcrypt.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/m680x0/{nptl => }/libdl.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/m680x0/{nptl => }/libm.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/m680x0/{nptl => }/libnsl.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/m680x0/{nptl => }/libpthread.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/m680x0/{nptl => }/libresolv.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/m680x0/{nptl => }/librt.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/m680x0/{nptl => }/libthread_db.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/m680x0/{nptl => }/libutil.abilist (100%) rename sysdeps/unix/sysv/linux/m68k/{nptl => }/sysdep-cancel.h (100%) diff --git a/ChangeLog b/ChangeLog index 71f8660..54d90c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,82 @@ 2014-06-23 Roland McGrath + * sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h: Moved ... + * sysdeps/m68k/nptl/bits/pthreadtypes.h: ... here. + * sysdeps/unix/sysv/linux/m68k/nptl/bits/semaphore.h: Moved ... + * sysdeps/m68k/nptl/bits/semaphore.h: ... here. + * sysdeps/unix/sysv/linux/m68k/nptl/c++-types.data: Moved ... + * sysdeps/unix/sysv/linux/m68k/c++-types.data: ... here. + * sysdeps/unix/sysv/linux/m68k/coldfire/nptl/bits/atomic.h: Moved ... + * sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h: ... here. + * sysdeps/unix/sysv/linux/m68k/coldfire/nptl/ld.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/coldfire/ld.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libBrokenLocale.abilist: + Moved ... + * sysdeps/unix/sysv/linux/m68k/coldfire/libBrokenLocale.abilist: + ... here. + * sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libanl.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/coldfire/libanl.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libc.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist: + Moved ... + * sysdeps/unix/sysv/linux/m68k/coldfire/libcrypt.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libdl.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/coldfire/libdl.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libm.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/coldfire/libm.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libnsl.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/coldfire/libnsl.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libpthread.abilist: + Moved ... + * sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libresolv.abilist: + Moved ... + * sysdeps/unix/sysv/linux/m68k/coldfire/libresolv.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/coldfire/nptl/librt.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libthread_db.abilist: + Moved ... + * sysdeps/unix/sysv/linux/m68k/coldfire/libthread_db.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libutil.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/coldfire/libutil.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/nptl/localplt.data: Moved ... + * sysdeps/unix/sysv/linux/m68k/localplt.data: ... here. + * sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h: Moved ... + * sysdeps/unix/sysv/linux/m68k/lowlevellock.h: ... here. + * sysdeps/unix/sysv/linux/m68k/m680x0/nptl/ld.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/m680x0/ld.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libBrokenLocale.abilist: + Moved ... + * sysdeps/unix/sysv/linux/m68k/m680x0/libBrokenLocale.abilist: + ... here. + * sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libanl.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/m680x0/libanl.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libc.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/m680x0/libcrypt.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libdl.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/m680x0/libdl.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libm.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/m680x0/libm.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libnsl.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/m680x0/libnsl.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libpthread.abilist: + Moved ... + * sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libresolv.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/m680x0/libresolv.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/m680x0/nptl/librt.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libthread_db.abilist: + Moved ... + * sysdeps/unix/sysv/linux/m68k/m680x0/libthread_db.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libutil.abilist: Moved ... + * sysdeps/unix/sysv/linux/m68k/m680x0/libutil.abilist: ... here. + * sysdeps/unix/sysv/linux/m68k/nptl/sysdep-cancel.h: Moved ... + * sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h: ... here. + * sysdeps/unix/sysv/linux/sh/nptl/c++-types.data: Moved ... * sysdeps/unix/sysv/linux/sh/c++-types.data: ... here. * sysdeps/unix/sysv/linux/sh/nptl/ld.abilist: Moved ... 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 -- 2.7.4