From 0d749bbebad48b4c673a29af03d5c5dd151881de Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 24 Jun 2014 19:17:43 -0700 Subject: [PATCH] x86: Consolidate unnecessary nptl/ subdirectories. --- ChangeLog | 23 +++++++++++++++++++ .../i486/{nptl => }/pthread_spin_trylock.S | 0 sysdeps/i386/i586/nptl/pthread_spin_trylock.S | 1 - sysdeps/i386/i586/pthread_spin_trylock.S | 1 + .../i686/{nptl => }/pthread_spin_trylock.S | 2 +- sysdeps/i386/nptl/Implies | 1 - .../sysv/linux/x86_64/64}/shlib-versions | 0 .../sysv/linux/x86_64/x32}/shlib-versions | 0 sysdeps/x86/{nptl => }/bits/pthreadtypes.h | 0 sysdeps/x86/{nptl => }/bits/semaphore.h | 0 sysdeps/x86/{nptl => }/elide.h | 0 sysdeps/x86_64/nptl/Implies | 1 - 12 files changed, 25 insertions(+), 4 deletions(-) rename sysdeps/i386/i486/{nptl => }/pthread_spin_trylock.S (100%) delete mode 100644 sysdeps/i386/i586/nptl/pthread_spin_trylock.S create mode 100644 sysdeps/i386/i586/pthread_spin_trylock.S rename sysdeps/i386/i686/{nptl => }/pthread_spin_trylock.S (93%) delete mode 100644 sysdeps/i386/nptl/Implies rename sysdeps/{x86_64/64/nptl => unix/sysv/linux/x86_64/64}/shlib-versions (100%) rename sysdeps/{x86_64/x32/nptl => unix/sysv/linux/x86_64/x32}/shlib-versions (100%) rename sysdeps/x86/{nptl => }/bits/pthreadtypes.h (100%) rename sysdeps/x86/{nptl => }/bits/semaphore.h (100%) rename sysdeps/x86/{nptl => }/elide.h (100%) delete mode 100644 sysdeps/x86_64/nptl/Implies diff --git a/ChangeLog b/ChangeLog index ce6c4d8f24..d95375372c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2014-06-24 Roland McGrath + + * sysdeps/i386/i486/nptl/pthread_spin_trylock.S: Moved ... + * sysdeps/i386/i486/pthread_spin_trylock.S: ... here. + * sysdeps/i386/i586/nptl/pthread_spin_trylock.S: Moved ... + * sysdeps/i386/i586/pthread_spin_trylock.S: ... here. + Update #include. + * sysdeps/i386/i686/nptl/pthread_spin_trylock.S: Moved ... + * sysdeps/i386/i686/pthread_spin_trylock.S: ... here. + Update #include. + * sysdeps/x86_64/64/nptl/shlib-versions: Moved ... + * sysdeps/unix/sysv/linux/x86_64/64/shlib-versions: ... here. + * sysdeps/x86_64/x32/nptl/shlib-versions: Moved ... + * sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions: ... here. + * sysdeps/x86/nptl/bits/pthreadtypes.h: Moved ... + * sysdeps/x86/bits/pthreadtypes.h: ... here. + * sysdeps/x86/nptl/bits/semaphore.h: Moved ... + * sysdeps/x86/bits/semaphore.h: ... here. + * sysdeps/x86/nptl/elide.h: Moved ... + * sysdeps/x86/elide.h: ... here. + * sysdeps/x86_64/nptl/Implies: File removed. + * sysdeps/i386/nptl/Implies: File removed. + 2014-06-24 Joseph Myers [BZ #16539] diff --git a/sysdeps/i386/i486/nptl/pthread_spin_trylock.S b/sysdeps/i386/i486/pthread_spin_trylock.S similarity index 100% rename from sysdeps/i386/i486/nptl/pthread_spin_trylock.S rename to 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 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 diff --git a/sysdeps/i386/i686/nptl/pthread_spin_trylock.S b/sysdeps/i386/i686/pthread_spin_trylock.S similarity index 93% rename from sysdeps/i386/i686/nptl/pthread_spin_trylock.S rename to 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 @@ . */ #define HAVE_CMOV 1 -#include +#include 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 similarity index 100% rename from sysdeps/x86_64/64/nptl/shlib-versions rename to 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 similarity index 100% rename from sysdeps/x86_64/x32/nptl/shlib-versions rename to sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions diff --git a/sysdeps/x86/nptl/bits/pthreadtypes.h b/sysdeps/x86/bits/pthreadtypes.h similarity index 100% rename from sysdeps/x86/nptl/bits/pthreadtypes.h rename to sysdeps/x86/bits/pthreadtypes.h diff --git a/sysdeps/x86/nptl/bits/semaphore.h b/sysdeps/x86/bits/semaphore.h similarity index 100% rename from sysdeps/x86/nptl/bits/semaphore.h rename to sysdeps/x86/bits/semaphore.h diff --git a/sysdeps/x86/nptl/elide.h b/sysdeps/x86/elide.h similarity index 100% rename from sysdeps/x86/nptl/elide.h rename to 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