diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-06-24 19:17:43 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2014-06-24 19:17:43 -0700 |
| commit | 0d749bbebad48b4c673a29af03d5c5dd151881de (patch) | |
| tree | 0248393d915b4501f300c31e2c6c21fe553f806d /sysdeps | |
| parent | 4060283decf711ed95a6c4993ffeaba39f8cd40a (diff) | |
| download | glibc-0d749bbebad48b4c673a29af03d5c5dd151881de.tar glibc-0d749bbebad48b4c673a29af03d5c5dd151881de.tar.gz glibc-0d749bbebad48b4c673a29af03d5c5dd151881de.tar.bz2 glibc-0d749bbebad48b4c673a29af03d5c5dd151881de.zip | |
x86: Consolidate unnecessary nptl/ subdirectories.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/i386/i486/pthread_spin_trylock.S (renamed from sysdeps/i386/i486/nptl/pthread_spin_trylock.S) | 0 | ||||
| -rw-r--r-- | sysdeps/i386/i586/nptl/pthread_spin_trylock.S | 1 | ||||
| -rw-r--r-- | sysdeps/i386/i586/pthread_spin_trylock.S | 1 | ||||
| -rw-r--r-- | sysdeps/i386/i686/pthread_spin_trylock.S (renamed from sysdeps/i386/i686/nptl/pthread_spin_trylock.S) | 2 | ||||
| -rw-r--r-- | sysdeps/i386/nptl/Implies | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/64/shlib-versions (renamed from sysdeps/x86_64/64/nptl/shlib-versions) | 0 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions (renamed from sysdeps/x86_64/x32/nptl/shlib-versions) | 0 | ||||
| -rw-r--r-- | sysdeps/x86/bits/pthreadtypes.h (renamed from sysdeps/x86/nptl/bits/pthreadtypes.h) | 0 | ||||
| -rw-r--r-- | sysdeps/x86/bits/semaphore.h (renamed from sysdeps/x86/nptl/bits/semaphore.h) | 0 | ||||
| -rw-r--r-- | sysdeps/x86/elide.h (renamed from sysdeps/x86/nptl/elide.h) | 0 | ||||
| -rw-r--r-- | sysdeps/x86_64/nptl/Implies | 1 |
11 files changed, 2 insertions, 4 deletions
diff --git a/sysdeps/i386/i486/nptl/pthread_spin_trylock.S b/sysdeps/i386/i486/pthread_spin_trylock.S index 0bcc0c6ede..0bcc0c6ede 100644 --- a/sysdeps/i386/i486/nptl/pthread_spin_trylock.S +++ b/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 a0c90b5913..0000000000 --- a/sysdeps/i386/i586/nptl/pthread_spin_trylock.S +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/i386/i486/nptl/pthread_spin_trylock.S> diff --git a/sysdeps/i386/i586/pthread_spin_trylock.S b/sysdeps/i386/i586/pthread_spin_trylock.S new file mode 100644 index 0000000000..0cf8b3ab70 --- /dev/null +++ b/sysdeps/i386/i586/pthread_spin_trylock.S @@ -0,0 +1 @@ +#include <sysdeps/i386/i486/pthread_spin_trylock.S> diff --git a/sysdeps/i386/i686/nptl/pthread_spin_trylock.S b/sysdeps/i386/i686/pthread_spin_trylock.S index d02f490986..79eed31752 100644 --- a/sysdeps/i386/i686/nptl/pthread_spin_trylock.S +++ b/sysdeps/i386/i686/pthread_spin_trylock.S @@ -17,4 +17,4 @@ <http://www.gnu.org/licenses/>. */ #define HAVE_CMOV 1 -#include <sysdeps/i386/i486/nptl/pthread_spin_trylock.S> +#include <sysdeps/i386/i486/pthread_spin_trylock.S> diff --git a/sysdeps/i386/nptl/Implies b/sysdeps/i386/nptl/Implies deleted file mode 100644 index e454b288aa..0000000000 --- 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 index 5093c4c18b..5093c4c18b 100644 --- a/sysdeps/x86_64/64/nptl/shlib-versions +++ b/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 index 8fcad2e566..8fcad2e566 100644 --- a/sysdeps/x86_64/x32/nptl/shlib-versions +++ b/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions diff --git a/sysdeps/x86/nptl/bits/pthreadtypes.h b/sysdeps/x86/bits/pthreadtypes.h index aad2e14c8d..aad2e14c8d 100644 --- a/sysdeps/x86/nptl/bits/pthreadtypes.h +++ b/sysdeps/x86/bits/pthreadtypes.h diff --git a/sysdeps/x86/nptl/bits/semaphore.h b/sysdeps/x86/bits/semaphore.h index 741a9e03fb..741a9e03fb 100644 --- a/sysdeps/x86/nptl/bits/semaphore.h +++ b/sysdeps/x86/bits/semaphore.h diff --git a/sysdeps/x86/nptl/elide.h b/sysdeps/x86/elide.h index 5befa53f30..5befa53f30 100644 --- a/sysdeps/x86/nptl/elide.h +++ b/sysdeps/x86/elide.h diff --git a/sysdeps/x86_64/nptl/Implies b/sysdeps/x86_64/nptl/Implies deleted file mode 100644 index e454b288aa..0000000000 --- a/sysdeps/x86_64/nptl/Implies +++ /dev/null @@ -1 +0,0 @@ -x86/nptl |