From 14642b8511ed1d6ecfd326de8688853118308082 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 11 Jun 2014 21:33:32 -0700 Subject: [PATCH] Move x86_64 code out of nptl/ subdirectory. --- ChangeLog | 31 +++++++++++++++++++ .../x86_64/64/nptl}/shlib-versions | 0 .../x86_64 => sysdeps/x86_64/nptl}/Makefile | 0 .../x86_64 => sysdeps/x86_64/nptl}/configure | 0 .../x86_64/nptl}/configure.ac | 0 .../x86_64/nptl}/pthread_spin_init.c | 0 .../x86_64/nptl}/pthread_spin_lock.S | 0 .../x86_64/nptl}/pthread_spin_trylock.S | 0 .../x86_64/nptl}/pthread_spin_unlock.S | 0 .../x86_64/nptl}/pthreaddef.h | 0 .../x86_64/nptl}/tcb-offsets.sym | 0 .../x86_64 => sysdeps/x86_64/nptl}/tls.h | 0 .../x86_64/x32/nptl}/shlib-versions | 0 .../x32 => sysdeps/x86_64/x32/nptl}/tls.h | 2 +- 14 files changed, 32 insertions(+), 1 deletion(-) rename {nptl/sysdeps/x86_64/64 => sysdeps/x86_64/64/nptl}/shlib-versions (100%) rename {nptl/sysdeps/x86_64 => sysdeps/x86_64/nptl}/Makefile (100%) rename {nptl/sysdeps/x86_64 => sysdeps/x86_64/nptl}/configure (100%) rename {nptl/sysdeps/x86_64 => sysdeps/x86_64/nptl}/configure.ac (100%) rename {nptl/sysdeps/x86_64 => sysdeps/x86_64/nptl}/pthread_spin_init.c (100%) rename {nptl/sysdeps/x86_64 => sysdeps/x86_64/nptl}/pthread_spin_lock.S (100%) rename {nptl/sysdeps/x86_64 => sysdeps/x86_64/nptl}/pthread_spin_trylock.S (100%) rename {nptl/sysdeps/x86_64 => sysdeps/x86_64/nptl}/pthread_spin_unlock.S (100%) rename {nptl/sysdeps/x86_64 => sysdeps/x86_64/nptl}/pthreaddef.h (100%) rename {nptl/sysdeps/x86_64 => sysdeps/x86_64/nptl}/tcb-offsets.sym (100%) rename {nptl/sysdeps/x86_64 => sysdeps/x86_64/nptl}/tls.h (100%) rename {nptl/sysdeps/x86_64/x32 => sysdeps/x86_64/x32/nptl}/shlib-versions (100%) rename {nptl/sysdeps/x86_64/x32 => sysdeps/x86_64/x32/nptl}/tls.h (98%) diff --git a/ChangeLog b/ChangeLog index 6ccb56eabe..2d1b5c7fbe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,34 @@ +2014-06-11 Roland McGrath + + * nptl/sysdeps/x86_64/64/shlib-versions: Moved ... + * sysdeps/x86_64/64/nptl/shlib-versions: ... here. + * nptl/sysdeps/x86_64/Makefile: Moved ... + * sysdeps/x86_64/nptl/Makefile: ... here. + * nptl/sysdeps/x86_64/configure: Moved ... + * sysdeps/x86_64/nptl/configure: ... here. + * nptl/sysdeps/x86_64/configure.ac: Moved ... + * sysdeps/x86_64/nptl/configure.ac: ... here. + * nptl/sysdeps/x86_64/pthread_spin_init.c: Moved ... + * sysdeps/x86_64/nptl/pthread_spin_init.c: ... here. + * nptl/sysdeps/x86_64/pthread_spin_lock.S: Moved ... + * sysdeps/x86_64/nptl/pthread_spin_lock.S: ... here. + * nptl/sysdeps/x86_64/pthread_spin_trylock.S: Moved ... + * sysdeps/x86_64/nptl/pthread_spin_trylock.S: ... here. + * nptl/sysdeps/x86_64/pthread_spin_unlock.S: Moved ... + * sysdeps/x86_64/nptl/pthread_spin_unlock.S: ... here. + * nptl/sysdeps/x86_64/pthreaddef.h: Moved ... + * sysdeps/x86_64/nptl/pthreaddef.h: ... here. + * nptl/sysdeps/x86_64/tcb-offsets.sym: Moved ... + * sysdeps/x86_64/nptl/tcb-offsets.sym: ... here. + * nptl/sysdeps/x86_64/tls.h: Moved ... + * sysdeps/x86_64/nptl/tls.h: ... here. + * nptl/sysdeps/x86_64/x32/shlib-versions: Moved ... + * sysdeps/x86_64/x32/nptl/shlib-versions: ... here. + * nptl/sysdeps/x86_64/x32/tls.h: Moved ... + * sysdeps/x86_64/x32/nptl/tls.h: ... here. + + * sysdeps/x86_64/x32/nptl/tls.h: Use #include_next. + 2014-06-11 Adhemerval Zanella * sysdeps/powerpc/fpu/libm-test-ulps: Update. diff --git a/nptl/sysdeps/x86_64/64/shlib-versions b/sysdeps/x86_64/64/nptl/shlib-versions similarity index 100% rename from nptl/sysdeps/x86_64/64/shlib-versions rename to sysdeps/x86_64/64/nptl/shlib-versions diff --git a/nptl/sysdeps/x86_64/Makefile b/sysdeps/x86_64/nptl/Makefile similarity index 100% rename from nptl/sysdeps/x86_64/Makefile rename to sysdeps/x86_64/nptl/Makefile diff --git a/nptl/sysdeps/x86_64/configure b/sysdeps/x86_64/nptl/configure similarity index 100% rename from nptl/sysdeps/x86_64/configure rename to sysdeps/x86_64/nptl/configure diff --git a/nptl/sysdeps/x86_64/configure.ac b/sysdeps/x86_64/nptl/configure.ac similarity index 100% rename from nptl/sysdeps/x86_64/configure.ac rename to sysdeps/x86_64/nptl/configure.ac diff --git a/nptl/sysdeps/x86_64/pthread_spin_init.c b/sysdeps/x86_64/nptl/pthread_spin_init.c similarity index 100% rename from nptl/sysdeps/x86_64/pthread_spin_init.c rename to sysdeps/x86_64/nptl/pthread_spin_init.c diff --git a/nptl/sysdeps/x86_64/pthread_spin_lock.S b/sysdeps/x86_64/nptl/pthread_spin_lock.S similarity index 100% rename from nptl/sysdeps/x86_64/pthread_spin_lock.S rename to sysdeps/x86_64/nptl/pthread_spin_lock.S diff --git a/nptl/sysdeps/x86_64/pthread_spin_trylock.S b/sysdeps/x86_64/nptl/pthread_spin_trylock.S similarity index 100% rename from nptl/sysdeps/x86_64/pthread_spin_trylock.S rename to sysdeps/x86_64/nptl/pthread_spin_trylock.S diff --git a/nptl/sysdeps/x86_64/pthread_spin_unlock.S b/sysdeps/x86_64/nptl/pthread_spin_unlock.S similarity index 100% rename from nptl/sysdeps/x86_64/pthread_spin_unlock.S rename to sysdeps/x86_64/nptl/pthread_spin_unlock.S diff --git a/nptl/sysdeps/x86_64/pthreaddef.h b/sysdeps/x86_64/nptl/pthreaddef.h similarity index 100% rename from nptl/sysdeps/x86_64/pthreaddef.h rename to sysdeps/x86_64/nptl/pthreaddef.h diff --git a/nptl/sysdeps/x86_64/tcb-offsets.sym b/sysdeps/x86_64/nptl/tcb-offsets.sym similarity index 100% rename from nptl/sysdeps/x86_64/tcb-offsets.sym rename to sysdeps/x86_64/nptl/tcb-offsets.sym diff --git a/nptl/sysdeps/x86_64/tls.h b/sysdeps/x86_64/nptl/tls.h similarity index 100% rename from nptl/sysdeps/x86_64/tls.h rename to sysdeps/x86_64/nptl/tls.h diff --git a/nptl/sysdeps/x86_64/x32/shlib-versions b/sysdeps/x86_64/x32/nptl/shlib-versions similarity index 100% rename from nptl/sysdeps/x86_64/x32/shlib-versions rename to sysdeps/x86_64/x32/nptl/shlib-versions diff --git a/nptl/sysdeps/x86_64/x32/tls.h b/sysdeps/x86_64/x32/nptl/tls.h similarity index 98% rename from nptl/sysdeps/x86_64/x32/tls.h rename to sysdeps/x86_64/x32/nptl/tls.h index 7060616a5c..bd73d3f9a1 100644 --- a/nptl/sysdeps/x86_64/x32/tls.h +++ b/sysdeps/x86_64/x32/nptl/tls.h @@ -19,7 +19,7 @@ #ifndef _X32_TLS_H #define _X32_TLS_H 1 -#include +#include_next #ifndef __ASSEMBLER__