From patchwork Wed Jun 25 02:40:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 1710 Received: (qmail 15713 invoked by alias); 25 Jun 2014 02:40: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 15678 invoked by uid 89); 25 Jun 2014 02:40:44 -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: [COMMITTED PATCH] x86: Consolidate unnecessary nptl/ subdirectories. Message-Id: <20140625024038.281692C3A25@topped-with-meat.com> Date: Tue, 24 Jun 2014 19:40:38 -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=aYCIoWBBby4A:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=mDV3o1hIAAAA:8 a=JdtqOoXI2qq6pz6xkBkA:9 a=CjuIK1q_8ugA:10 Verified no code changes on x86_64-linux-gnu and i686-linux-gnu. Thanks, Roland 2014-06-24 Roland McGrath * sysdeps/i386/i486/nptl/pthread_spin_trylock.S: Moved ... * sysdeps/i386/i486/pthread_spin_trylock.S: ... here. * sysdeps/i386/i586/nptl/pthread_spin_trylock.S: Moved ... * sysdeps/i386/i586/pthread_spin_trylock.S: ... here. Update #include. * sysdeps/i386/i686/nptl/pthread_spin_trylock.S: Moved ... * sysdeps/i386/i686/pthread_spin_trylock.S: ... here. Update #include. * sysdeps/x86_64/64/nptl/shlib-versions: Moved ... * sysdeps/unix/sysv/linux/x86_64/64/shlib-versions: ... here. * sysdeps/x86_64/x32/nptl/shlib-versions: Moved ... * sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions: ... here. * sysdeps/x86/nptl/bits/pthreadtypes.h: Moved ... * sysdeps/x86/bits/pthreadtypes.h: ... here. * sysdeps/x86/nptl/bits/semaphore.h: Moved ... * sysdeps/x86/bits/semaphore.h: ... here. * sysdeps/x86/nptl/elide.h: Moved ... * sysdeps/x86/elide.h: ... here. * sysdeps/x86_64/nptl/Implies: File removed. * sysdeps/i386/nptl/Implies: File removed. diff --git a/sysdeps/i386/i486/nptl/pthread_spin_trylock.S b/sysdeps/i386/i486/pthread_spin_trylock.S similarity index 100% rename from sysdeps/i386/i486/nptl/pthread_spin_trylock.S rename to sysdeps/i386/i486/pthread_spin_trylock.S diff --git a/sysdeps/i386/i586/nptl/pthread_spin_trylock.S b/sysdeps/i386/i586/nptl/pthread_spin_trylock.S deleted file mode 100644 index a0c90b5..0000000 --- a/sysdeps/i386/i586/nptl/pthread_spin_trylock.S +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/i386/i586/pthread_spin_trylock.S b/sysdeps/i386/i586/pthread_spin_trylock.S new file mode 100644 index 0000000..0cf8b3a --- /dev/null +++ b/sysdeps/i386/i586/pthread_spin_trylock.S @@ -0,0 +1 @@ +#include diff --git a/sysdeps/i386/i686/nptl/pthread_spin_trylock.S b/sysdeps/i386/i686/pthread_spin_trylock.S similarity index 93% rename from sysdeps/i386/i686/nptl/pthread_spin_trylock.S rename to sysdeps/i386/i686/pthread_spin_trylock.S index d02f490..79eed31 100644 --- a/sysdeps/i386/i686/nptl/pthread_spin_trylock.S +++ b/sysdeps/i386/i686/pthread_spin_trylock.S @@ -17,4 +17,4 @@ . */ #define HAVE_CMOV 1 -#include +#include diff --git a/sysdeps/i386/nptl/Implies b/sysdeps/i386/nptl/Implies deleted file mode 100644 index e454b28..0000000 --- a/sysdeps/i386/nptl/Implies +++ /dev/null @@ -1 +0,0 @@ -x86/nptl diff --git a/sysdeps/x86_64/64/nptl/shlib-versions b/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions similarity index 100% rename from sysdeps/x86_64/64/nptl/shlib-versions rename to sysdeps/unix/sysv/linux/x86_64/64/shlib-versions diff --git a/sysdeps/x86_64/x32/nptl/shlib-versions b/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions similarity index 100% rename from sysdeps/x86_64/x32/nptl/shlib-versions rename to sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions diff --git a/sysdeps/x86/nptl/bits/pthreadtypes.h b/sysdeps/x86/bits/pthreadtypes.h similarity index 100% rename from sysdeps/x86/nptl/bits/pthreadtypes.h rename to sysdeps/x86/bits/pthreadtypes.h diff --git a/sysdeps/x86/nptl/bits/semaphore.h b/sysdeps/x86/bits/semaphore.h similarity index 100% rename from sysdeps/x86/nptl/bits/semaphore.h rename to sysdeps/x86/bits/semaphore.h diff --git a/sysdeps/x86/nptl/elide.h b/sysdeps/x86/elide.h similarity index 100% rename from sysdeps/x86/nptl/elide.h rename to sysdeps/x86/elide.h diff --git a/sysdeps/x86_64/nptl/Implies b/sysdeps/x86_64/nptl/Implies deleted file mode 100644 index e454b28..0000000 --- a/sysdeps/x86_64/nptl/Implies +++ /dev/null @@ -1 +0,0 @@ -x86/nptl