Move i386 code out of nptl/ subdirectory.

This commit is contained in:
Roland McGrath 2014-06-12 10:08:24 -07:00
parent 45262aeedf
commit f6b07b3d48
15 changed files with 32 additions and 22 deletions

View File

@ -1,5 +1,33 @@
2014-06-12 Roland McGrath <roland@hack.frob.com>
* 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.

View File

@ -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 <drepper@redhat.com>, 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
<http://www.gnu.org/licenses/>. */
#include "../i486/pthread_spin_trylock.S"

View File

@ -0,0 +1 @@
#include <sysdeps/i386/i486/nptl/pthread_spin_trylock.S>

View File

@ -17,4 +17,4 @@
<http://www.gnu.org/licenses/>. */
#define HAVE_CMOV 1
#include "../i486/pthread_spin_trylock.S"
#include <sysdeps/i386/i486/nptl/pthread_spin_trylock.S>

View File

@ -30,6 +30,6 @@
/* Get the full set of definitions. */
#include "../tls.h"
#include_next <tls.h>
#endif /* tls.h */

View File

@ -1 +1 @@
#include "../i386/pthread_spin_init.c"
#include <sysdeps/i386/nptl/pthread_spin_init.c>