From patchwork Wed Jun 25 23:34:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 1753 Received: (qmail 10996 invoked by alias); 25 Jun 2014 23:34:48 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 10986 invoked by uid 89); 25 Jun 2014 23:34:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [PATCH roland/nptl-mips] MIPS: Consolidate nptl/ subdirectories under linux/... Message-Id: <20140625233444.319C32C39C5@topped-with-meat.com> Date: Wed, 25 Jun 2014 16:34:44 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=2Om1pmWlVg0A:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=5RoEZJMtI1Mo0e0XMbkA:9 a=CjuIK1q_8ugA:10 Not tested, but this should not change anything. Thanks, Roland * sysdeps/unix/sysv/linux/mips/mips32/nptl/c++-types.data: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/c++-types.data: ... here. * sysdeps/unix/sysv/linux/mips/mips32/fpu/nptl/libc.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/ld.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/ld.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libBrokenLocale.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libBrokenLocale.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libanl.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libanl.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libcidn.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libcidn.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libcrypt.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libdl.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libdl.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libm.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libm.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libnsl.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libnsl.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_compat.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libnss_compat.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_db.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libnss_db.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_dns.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libnss_dns.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_files.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libnss_files.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_hesiod.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libnss_hesiod.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nis.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libnss_nis.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nisplus.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libnss_nisplus.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libpthread.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libresolv.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/librt.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/librt.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libthread_db.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libthread_db.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nptl/libutil.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/libutil.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips32/nofpu/nptl/libc.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/c++-types.data: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n32/c++-types.data: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/ld.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n32/ld.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libBrokenLocale.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n32/libBrokenLocale.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libanl.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n32/libanl.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libc.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n32/libcrypt.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libdl.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n32/libdl.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libm.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n32/libm.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libnsl.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n32/libnsl.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libpthread.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n32/libpthread.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libresolv.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/librt.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libthread_db.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n32/libthread_db.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libutil.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n32/libutil.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/c++-types.data: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n64/c++-types.data: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/ld.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libBrokenLocale.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n64/libBrokenLocale.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libanl.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n64/libanl.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libc.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n64/libcrypt.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libdl.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n64/libdl.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libm.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n64/libm.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libnsl.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n64/libnsl.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libpthread.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n64/libpthread.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libresolv.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/librt.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libthread_db.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n64/libthread_db.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libutil.abilist: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/n64/libutil.abilist: ... here. * sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h: Moved ... * sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h: ... here. diff --git a/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h b/sysdeps/unix/sysv/linux/mips/lowlevellock.h similarity index 100% rename from sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h rename to sysdeps/unix/sysv/linux/mips/lowlevellock.h diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/c++-types.data b/sysdeps/unix/sysv/linux/mips/mips32/c++-types.data similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/c++-types.data rename to sysdeps/unix/sysv/linux/mips/mips32/c++-types.data diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/nptl/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/fpu/nptl/libc.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/ld.abilist b/sysdeps/unix/sysv/linux/mips/mips32/ld.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/ld.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/ld.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libBrokenLocale.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libBrokenLocale.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libBrokenLocale.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libanl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libanl.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libanl.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcidn.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libcidn.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libcidn.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libcidn.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libcrypt.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libcrypt.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libdl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libdl.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libdl.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libm.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libm.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libm.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libm.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnsl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnsl.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libnsl.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_compat.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_compat.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_compat.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_compat.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_db.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_db.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_db.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_db.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_dns.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_dns.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_dns.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_dns.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_files.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_files.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_files.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_files.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_hesiod.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_hesiod.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_hesiod.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_hesiod.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nis.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_nis.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nis.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_nis.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nisplus.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libnss_nisplus.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libnss_nisplus.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libnss_nisplus.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libpthread.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libresolv.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libresolv.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/librt.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/librt.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libthread_db.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libthread_db.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libthread_db.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libutil.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nptl/libutil.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/libutil.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/nptl/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips32/nofpu/nptl/libc.abilist rename to sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/c++-types.data b/sysdeps/unix/sysv/linux/mips/mips64/n32/c++-types.data similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/c++-types.data rename to sysdeps/unix/sysv/linux/mips/mips64/n32/c++-types.data diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/ld.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/ld.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/ld.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n32/ld.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libBrokenLocale.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libBrokenLocale.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libBrokenLocale.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libanl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libanl.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libanl.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libc.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libcrypt.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libcrypt.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libdl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libdl.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libdl.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libm.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libm.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libm.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libm.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libnsl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libnsl.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libnsl.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libpthread.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libpthread.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libpthread.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libresolv.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libresolv.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/librt.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libthread_db.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libthread_db.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libthread_db.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libutil.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libutil.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n32/libutil.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/c++-types.data b/sysdeps/unix/sysv/linux/mips/mips64/n64/c++-types.data similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/c++-types.data rename to sysdeps/unix/sysv/linux/mips/mips64/n64/c++-types.data diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/ld.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/ld.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n64/ld.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libBrokenLocale.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libBrokenLocale.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libBrokenLocale.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libanl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libanl.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libanl.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libc.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libcrypt.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libcrypt.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libdl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libdl.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libdl.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libm.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libm.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libm.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libm.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libnsl.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libnsl.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libnsl.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libpthread.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libpthread.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libpthread.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libresolv.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libresolv.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/librt.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libthread_db.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libthread_db.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libthread_db.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libutil.abilist similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libutil.abilist rename to sysdeps/unix/sysv/linux/mips/mips64/n64/libutil.abilist diff --git a/sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h similarity index 100% rename from sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h rename to sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h diff --git a/sysdeps/unix/sysv/linux/mips/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h similarity index 100% rename from sysdeps/unix/sysv/linux/mips/nptl/sysdep-cancel.h rename to sysdeps/unix/sysv/linux/mips/sysdep-cancel.h