From patchwork Thu Jun 12 04:38:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 1461 Received: (qmail 483 invoked by alias); 12 Jun 2014 04:38:36 -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 468 invoked by uid 89); 12 Jun 2014 04:38:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.3 required=5.0 tests=AWL, BAYES_00, URIBL_BLACK autolearn=no version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] Move x86_64 code out of nptl/ subdirectory. Message-Id: <20140612043830.D691B2C39BF@topped-with-meat.com> Date: Wed, 11 Jun 2014 21:38:30 -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=Mg9a82aorFwA:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=0GLjvk633iXYXQjHgLcA:9 a=CjuIK1q_8ugA:10 You're likely to need to nuke your nptl/ build subdirectory (or just do a fully clean build) after updating to this. Verified no code changes on x86_64-linux-gnu. I checked for possibly affected #include's and the x32 tls.h (itself moved here) was the only one I found. I didn't attempt an x32 build, but I'm pretty sure #include_next will do the right thing here. Thanks, Roland 2014-06-11 Roland McGrath * nptl/sysdeps/x86_64/64/shlib-versions: Moved ... * sysdeps/x86_64/64/nptl/shlib-versions: ... here. * nptl/sysdeps/x86_64/Makefile: Moved ... * sysdeps/x86_64/nptl/Makefile: ... here. * nptl/sysdeps/x86_64/configure: Moved ... * sysdeps/x86_64/nptl/configure: ... here. * nptl/sysdeps/x86_64/configure.ac: Moved ... * sysdeps/x86_64/nptl/configure.ac: ... here. * nptl/sysdeps/x86_64/pthread_spin_init.c: Moved ... * sysdeps/x86_64/nptl/pthread_spin_init.c: ... here. * nptl/sysdeps/x86_64/pthread_spin_lock.S: Moved ... * sysdeps/x86_64/nptl/pthread_spin_lock.S: ... here. * nptl/sysdeps/x86_64/pthread_spin_trylock.S: Moved ... * sysdeps/x86_64/nptl/pthread_spin_trylock.S: ... here. * nptl/sysdeps/x86_64/pthread_spin_unlock.S: Moved ... * sysdeps/x86_64/nptl/pthread_spin_unlock.S: ... here. * nptl/sysdeps/x86_64/pthreaddef.h: Moved ... * sysdeps/x86_64/nptl/pthreaddef.h: ... here. * nptl/sysdeps/x86_64/tcb-offsets.sym: Moved ... * sysdeps/x86_64/nptl/tcb-offsets.sym: ... here. * nptl/sysdeps/x86_64/tls.h: Moved ... * sysdeps/x86_64/nptl/tls.h: ... here. * nptl/sysdeps/x86_64/x32/shlib-versions: Moved ... * sysdeps/x86_64/x32/nptl/shlib-versions: ... here. * nptl/sysdeps/x86_64/x32/tls.h: Moved ... * sysdeps/x86_64/x32/nptl/tls.h: ... here. * sysdeps/x86_64/x32/nptl/tls.h: Use #include_next. diff --git a/nptl/sysdeps/x86_64/64/shlib-versions b/sysdeps/x86_64/64/nptl/shlib-versions similarity index 100% rename from nptl/sysdeps/x86_64/64/shlib-versions rename to sysdeps/x86_64/64/nptl/shlib-versions diff --git a/nptl/sysdeps/x86_64/Makefile b/sysdeps/x86_64/nptl/Makefile similarity index 100% rename from nptl/sysdeps/x86_64/Makefile rename to sysdeps/x86_64/nptl/Makefile diff --git a/nptl/sysdeps/x86_64/configure b/sysdeps/x86_64/nptl/configure similarity index 100% rename from nptl/sysdeps/x86_64/configure rename to sysdeps/x86_64/nptl/configure diff --git a/nptl/sysdeps/x86_64/configure.ac b/sysdeps/x86_64/nptl/configure.ac similarity index 100% rename from nptl/sysdeps/x86_64/configure.ac rename to sysdeps/x86_64/nptl/configure.ac diff --git a/nptl/sysdeps/x86_64/pthread_spin_init.c b/sysdeps/x86_64/nptl/pthread_spin_init.c similarity index 100% rename from nptl/sysdeps/x86_64/pthread_spin_init.c rename to sysdeps/x86_64/nptl/pthread_spin_init.c diff --git a/nptl/sysdeps/x86_64/pthread_spin_lock.S b/sysdeps/x86_64/nptl/pthread_spin_lock.S similarity index 100% rename from nptl/sysdeps/x86_64/pthread_spin_lock.S rename to sysdeps/x86_64/nptl/pthread_spin_lock.S diff --git a/nptl/sysdeps/x86_64/pthread_spin_trylock.S b/sysdeps/x86_64/nptl/pthread_spin_trylock.S similarity index 100% rename from nptl/sysdeps/x86_64/pthread_spin_trylock.S rename to sysdeps/x86_64/nptl/pthread_spin_trylock.S diff --git a/nptl/sysdeps/x86_64/pthread_spin_unlock.S b/sysdeps/x86_64/nptl/pthread_spin_unlock.S similarity index 100% rename from nptl/sysdeps/x86_64/pthread_spin_unlock.S rename to sysdeps/x86_64/nptl/pthread_spin_unlock.S diff --git a/nptl/sysdeps/x86_64/pthreaddef.h b/sysdeps/x86_64/nptl/pthreaddef.h similarity index 100% rename from nptl/sysdeps/x86_64/pthreaddef.h rename to sysdeps/x86_64/nptl/pthreaddef.h diff --git a/nptl/sysdeps/x86_64/tcb-offsets.sym b/sysdeps/x86_64/nptl/tcb-offsets.sym similarity index 100% rename from nptl/sysdeps/x86_64/tcb-offsets.sym rename to sysdeps/x86_64/nptl/tcb-offsets.sym diff --git a/nptl/sysdeps/x86_64/tls.h b/sysdeps/x86_64/nptl/tls.h similarity index 100% rename from nptl/sysdeps/x86_64/tls.h rename to sysdeps/x86_64/nptl/tls.h diff --git a/nptl/sysdeps/x86_64/x32/shlib-versions b/sysdeps/x86_64/x32/nptl/shlib-versions similarity index 100% rename from nptl/sysdeps/x86_64/x32/shlib-versions rename to sysdeps/x86_64/x32/nptl/shlib-versions diff --git a/nptl/sysdeps/x86_64/x32/tls.h b/sysdeps/x86_64/x32/nptl/tls.h similarity index 98% rename from nptl/sysdeps/x86_64/x32/tls.h rename to sysdeps/x86_64/x32/nptl/tls.h index 7060616..bd73d3f 100644 --- a/nptl/sysdeps/x86_64/x32/tls.h +++ b/sysdeps/x86_64/x32/nptl/tls.h @@ -19,7 +19,7 @@ #ifndef _X32_TLS_H #define _X32_TLS_H 1 -#include +#include_next #ifndef __ASSEMBLER__