[COMMITTED] Move x86_64 code out of nptl/ subdirectory.
diff mbox

Message ID 20140612043830.D691B2C39BF@topped-with-meat.com
State New
Headers show

Commit Message

Roland McGrath June 12, 2014, 4:38 a.m. UTC
You're likely to need to nuke your nptl/ build subdirectory (or just do a
fully clean build) after updating to this.

Verified no code changes on x86_64-linux-gnu.
I checked for possibly affected #include's and the x32 tls.h
(itself moved here) was the only one I found.  I didn't attempt
an x32 build, but I'm pretty sure #include_next will do the right
thing here.


Thanks,
Roland


2014-06-11  Roland McGrath  <roland@hack.frob.com>

	* 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.

Patch
diff mbox

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 7060616..bd73d3f 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 <sysdeps/x86_64/tls.h>
+#include_next <tls.h>
 
 #ifndef __ASSEMBLER__