From patchwork Thu Jun 12 17:11:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 1470 Received: (qmail 17879 invoked by alias); 12 Jun 2014 17:11:30 -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 17860 invoked by uid 89); 12 Jun 2014 17:11:29 -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] Move i386 code out of nptl/ subdirectory. Message-Id: <20140612171123.D00CE2C39C1@topped-with-meat.com> Date: Thu, 12 Jun 2014 10:11:23 -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=kkOqn5L4No4A:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=20KFwNOVAAAA:8 a=mDV3o1hIAAAA:8 a=K9SH-fIeum2x5L_zk4EA:9 a=CjuIK1q_8ugA:10 a=jEp0ucaQiEUA:10 Verified no code changes on i686-linux-gnu. Make sure to re-run configure (e.g. ./config.status --recheck), as sysdeps selection has changed, and nuke nptl/ from your build directory. Thanks, Roland * nptl/sysdeps/i386/i486/pthread_spin_trylock.S: Moved ... * sysdeps/i386/i486/nptl/pthread_spin_trylock.S: ... here. * nptl/sysdeps/i386/i586/pthread_spin_trylock.S: Moved ... * sysdeps/i386/i586/nptl/pthread_spin_trylock.S: ... here. Update #include target. * nptl/sysdeps/i386/i686/Makefile: Moved ... * sysdeps/i386/i686/nptl/Makefile: ... here. * nptl/sysdeps/i386/i686/pthread_spin_trylock.S: Moved ... * sysdeps/i386/i686/nptl/pthread_spin_trylock.S: ... here. Update #include target. * nptl/sysdeps/i386/i686/tls.h: Moved ... * sysdeps/i386/i686/nptl/tls.h: ... here. Use #include_next. * nptl/sysdeps/i386/Makefile: Moved ... * sysdeps/i386/nptl/Makefile: ... here. * nptl/sysdeps/i386/pthread_spin_init.c: Moved ... * sysdeps/i386/nptl/pthread_spin_init.c: ... here. * sysdeps/x86_64/nptl/pthread_spin_init.c: Update #include target. * nptl/sysdeps/i386/pthread_spin_lock.S: Moved ... * sysdeps/i386/nptl/pthread_spin_lock.S: ... here. * nptl/sysdeps/i386/pthread_spin_unlock.S: Moved ... * sysdeps/i386/nptl/pthread_spin_unlock.S: ... here. * nptl/sysdeps/i386/pthreaddef.h: Moved ... * sysdeps/i386/nptl/pthreaddef.h: ... here. * nptl/sysdeps/i386/tcb-offsets.sym: Moved ... * sysdeps/i386/nptl/tcb-offsets.sym: ... here. * nptl/sysdeps/i386/tls.h: Moved ... * sysdeps/i386/nptl/tls.h: ... here. diff --git a/nptl/sysdeps/i386/i586/pthread_spin_trylock.S b/nptl/sysdeps/i386/i586/pthread_spin_trylock.S deleted file mode 100644 index 9afe82a..0000000 --- a/nptl/sysdeps/i386/i586/pthread_spin_trylock.S +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright (C) 2002-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 2002. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include "../i486/pthread_spin_trylock.S" diff --git a/nptl/sysdeps/i386/i486/pthread_spin_trylock.S b/sysdeps/i386/i486/nptl/pthread_spin_trylock.S similarity index 100% rename from nptl/sysdeps/i386/i486/pthread_spin_trylock.S rename to sysdeps/i386/i486/nptl/pthread_spin_trylock.S diff --git a/sysdeps/i386/i586/nptl/pthread_spin_trylock.S b/sysdeps/i386/i586/nptl/pthread_spin_trylock.S new file mode 100644 index 0000000..a0c90b5 --- /dev/null +++ b/sysdeps/i386/i586/nptl/pthread_spin_trylock.S @@ -0,0 +1 @@ +#include diff --git a/nptl/sysdeps/i386/i686/Makefile b/sysdeps/i386/i686/nptl/Makefile similarity index 100% rename from nptl/sysdeps/i386/i686/Makefile rename to sysdeps/i386/i686/nptl/Makefile diff --git a/nptl/sysdeps/i386/i686/pthread_spin_trylock.S b/sysdeps/i386/i686/nptl/pthread_spin_trylock.S similarity index 93% rename from nptl/sysdeps/i386/i686/pthread_spin_trylock.S rename to sysdeps/i386/i686/nptl/pthread_spin_trylock.S index 0ad3d11..d02f490 100644 --- a/nptl/sysdeps/i386/i686/pthread_spin_trylock.S +++ b/sysdeps/i386/i686/nptl/pthread_spin_trylock.S @@ -17,4 +17,4 @@ . */ #define HAVE_CMOV 1 -#include "../i486/pthread_spin_trylock.S" +#include diff --git a/nptl/sysdeps/i386/i686/tls.h b/sysdeps/i386/i686/nptl/tls.h similarity index 98% rename from nptl/sysdeps/i386/i686/tls.h rename to sysdeps/i386/i686/nptl/tls.h index 60bf9e1..71e769e 100644 --- a/nptl/sysdeps/i386/i686/tls.h +++ b/sysdeps/i386/i686/nptl/tls.h @@ -30,6 +30,6 @@ /* Get the full set of definitions. */ -#include "../tls.h" +#include_next #endif /* tls.h */ diff --git a/nptl/sysdeps/i386/Makefile b/sysdeps/i386/nptl/Makefile similarity index 100% rename from nptl/sysdeps/i386/Makefile rename to sysdeps/i386/nptl/Makefile diff --git a/nptl/sysdeps/i386/pthread_spin_init.c b/sysdeps/i386/nptl/pthread_spin_init.c similarity index 100% rename from nptl/sysdeps/i386/pthread_spin_init.c rename to sysdeps/i386/nptl/pthread_spin_init.c diff --git a/nptl/sysdeps/i386/pthread_spin_lock.S b/sysdeps/i386/nptl/pthread_spin_lock.S similarity index 100% rename from nptl/sysdeps/i386/pthread_spin_lock.S rename to sysdeps/i386/nptl/pthread_spin_lock.S diff --git a/nptl/sysdeps/i386/pthread_spin_unlock.S b/sysdeps/i386/nptl/pthread_spin_unlock.S similarity index 100% rename from nptl/sysdeps/i386/pthread_spin_unlock.S rename to sysdeps/i386/nptl/pthread_spin_unlock.S diff --git a/nptl/sysdeps/i386/pthreaddef.h b/sysdeps/i386/nptl/pthreaddef.h similarity index 100% rename from nptl/sysdeps/i386/pthreaddef.h rename to sysdeps/i386/nptl/pthreaddef.h diff --git a/nptl/sysdeps/i386/tcb-offsets.sym b/sysdeps/i386/nptl/tcb-offsets.sym similarity index 100% rename from nptl/sysdeps/i386/tcb-offsets.sym rename to sysdeps/i386/nptl/tcb-offsets.sym diff --git a/nptl/sysdeps/i386/tls.h b/sysdeps/i386/nptl/tls.h similarity index 100% rename from nptl/sysdeps/i386/tls.h rename to sysdeps/i386/nptl/tls.h diff --git a/sysdeps/x86_64/nptl/pthread_spin_init.c b/sysdeps/x86_64/nptl/pthread_spin_init.c index 5569620..f249c6f 100644 --- a/sysdeps/x86_64/nptl/pthread_spin_init.c +++ b/sysdeps/x86_64/nptl/pthread_spin_init.c @@ -1 +1 @@ -#include "../i386/pthread_spin_init.c" +#include