deleted file mode 100644
@@ -1 +0,0 @@
-unix/sysv/linux/x86
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
rename to sysdeps/unix/sysv/linux/x86_64/cancellation.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/libc-cancellation.S
rename to sysdeps/unix/sysv/linux/x86_64/libc-cancellation.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S
rename to sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/librt-cancellation.S
rename to sysdeps/unix/sysv/linux/x86_64/librt-cancellation.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
rename to sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
rename to sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S
rename to sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S
rename to sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
rename to sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
rename to sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
rename to sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
rename to sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S
rename to sysdeps/unix/sysv/linux/x86_64/pthread_once.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
rename to sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
rename to sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
rename to sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S
rename to sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
rename to sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
similarity index 86%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c
rename to sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c
@@ -11,4 +11,4 @@
header.vgetcpu_cache[1]))); \
} while (0)
-#include "../pthread_setaffinity.c"
+#include <sysdeps/unix/sysv/linux/pthread_setaffinity.c>
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/sem_post.S
rename to sysdeps/unix/sysv/linux/x86_64/sem_post.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
rename to sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S
rename to sysdeps/unix/sysv/linux/x86_64/sem_trywait.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S
rename to sysdeps/unix/sysv/linux/x86_64/sem_wait.S
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
rename to sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h