From f6b07b3d48eb1d28d033b2c342a8a5571dca2e18 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 12 Jun 2014 10:08:24 -0700 Subject: [PATCH] Move i386 code out of nptl/ subdirectory. --- ChangeLog | 28 ++++++++++++++++++++++ nptl/sysdeps/i386/i586/pthread_spin_trylock.S | 19 --------------- .../i386/i486/nptl}/pthread_spin_trylock.S | 0 sysdeps/i386/i586/nptl/pthread_spin_trylock.S | 1 + .../i386/i686 => sysdeps/i386/i686/nptl}/Makefile | 0 .../i386/i686/nptl}/pthread_spin_trylock.S | 2 +- .../i386/i686 => sysdeps/i386/i686/nptl}/tls.h | 2 +- {nptl/sysdeps/i386 => sysdeps/i386/nptl}/Makefile | 0 .../i386 => sysdeps/i386/nptl}/pthread_spin_init.c | 0 .../i386 => sysdeps/i386/nptl}/pthread_spin_lock.S | 0 .../i386/nptl}/pthread_spin_unlock.S | 0 .../i386 => sysdeps/i386/nptl}/pthreaddef.h | 0 .../i386 => sysdeps/i386/nptl}/tcb-offsets.sym | 0 {nptl/sysdeps/i386 => sysdeps/i386/nptl}/tls.h | 0 sysdeps/x86_64/nptl/pthread_spin_init.c | 2 +- 15 files changed, 32 insertions(+), 22 deletions(-) delete mode 100644 nptl/sysdeps/i386/i586/pthread_spin_trylock.S rename {nptl/sysdeps/i386/i486 => sysdeps/i386/i486/nptl}/pthread_spin_trylock.S (100%) create mode 100644 sysdeps/i386/i586/nptl/pthread_spin_trylock.S rename {nptl/sysdeps/i386/i686 => sysdeps/i386/i686/nptl}/Makefile (100%) rename {nptl/sysdeps/i386/i686 => sysdeps/i386/i686/nptl}/pthread_spin_trylock.S (93%) rename {nptl/sysdeps/i386/i686 => sysdeps/i386/i686/nptl}/tls.h (98%) rename {nptl/sysdeps/i386 => sysdeps/i386/nptl}/Makefile (100%) rename {nptl/sysdeps/i386 => sysdeps/i386/nptl}/pthread_spin_init.c (100%) rename {nptl/sysdeps/i386 => sysdeps/i386/nptl}/pthread_spin_lock.S (100%) rename {nptl/sysdeps/i386 => sysdeps/i386/nptl}/pthread_spin_unlock.S (100%) rename {nptl/sysdeps/i386 => sysdeps/i386/nptl}/pthreaddef.h (100%) rename {nptl/sysdeps/i386 => sysdeps/i386/nptl}/tcb-offsets.sym (100%) rename {nptl/sysdeps/i386 => sysdeps/i386/nptl}/tls.h (100%) diff --git a/ChangeLog b/ChangeLog index 606a889..b3097e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,33 @@ 2014-06-12 Roland McGrath + * 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. + * sysdeps/sh/Makefile [$(subdir) = csu] (gen-as-const-headers): Add tcb-offsets.sym. * nptl/sysdeps/sh/Makefile: File removed. 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 -- 2.7.4