similarity index 100%
rename from nptl/sysdeps/x86_64/64/shlib-versions
rename to sysdeps/x86_64/64/nptl/shlib-versions
similarity index 100%
rename from nptl/sysdeps/x86_64/Makefile
rename to sysdeps/x86_64/nptl/Makefile
similarity index 100%
rename from nptl/sysdeps/x86_64/configure
rename to sysdeps/x86_64/nptl/configure
similarity index 100%
rename from nptl/sysdeps/x86_64/configure.ac
rename to sysdeps/x86_64/nptl/configure.ac
similarity index 100%
rename from nptl/sysdeps/x86_64/pthread_spin_init.c
rename to sysdeps/x86_64/nptl/pthread_spin_init.c
similarity index 100%
rename from nptl/sysdeps/x86_64/pthread_spin_lock.S
rename to sysdeps/x86_64/nptl/pthread_spin_lock.S
similarity index 100%
rename from nptl/sysdeps/x86_64/pthread_spin_trylock.S
rename to sysdeps/x86_64/nptl/pthread_spin_trylock.S
similarity index 100%
rename from nptl/sysdeps/x86_64/pthread_spin_unlock.S
rename to sysdeps/x86_64/nptl/pthread_spin_unlock.S
similarity index 100%
rename from nptl/sysdeps/x86_64/pthreaddef.h
rename to sysdeps/x86_64/nptl/pthreaddef.h
similarity index 100%
rename from nptl/sysdeps/x86_64/tcb-offsets.sym
rename to sysdeps/x86_64/nptl/tcb-offsets.sym
similarity index 100%
rename from nptl/sysdeps/x86_64/tls.h
rename to sysdeps/x86_64/nptl/tls.h
similarity index 100%
rename from nptl/sysdeps/x86_64/x32/shlib-versions
rename to sysdeps/x86_64/x32/nptl/shlib-versions
similarity index 98%
rename from nptl/sysdeps/x86_64/x32/tls.h
rename to 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__