deleted file mode 100644
@@ -1,3 +0,0 @@
-libpthread-sysdep_routines += init-arch
-libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \
- elision-trylock
@@ -16,3 +16,9 @@ abi-x32-ld-soname := ld-linux-x32.so.2
ifeq ($(subdir),misc)
sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h sys/io.h
endif
+
+ifeq ($(subdir),nptl)
+libpthread-sysdep_routines += init-arch
+libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \
+ elision-trylock
+endif
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c
rename to sysdeps/unix/sysv/linux/x86/elision-conf.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86/elision-conf.h
rename to sysdeps/unix/sysv/linux/x86/elision-conf.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86/elision-lock.c
rename to sysdeps/unix/sysv/linux/x86/elision-lock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86/elision-timed.c
rename to sysdeps/unix/sysv/linux/x86/elision-timed.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86/elision-trylock.c
rename to sysdeps/unix/sysv/linux/x86/elision-trylock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86/elision-unlock.c
rename to sysdeps/unix/sysv/linux/x86/elision-unlock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86/force-elision.h
rename to sysdeps/unix/sysv/linux/x86/force-elision.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86/hle.h
rename to sysdeps/unix/sysv/linux/x86/hle.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86/init-arch.c
rename to sysdeps/unix/sysv/linux/x86/init-arch.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86/init-arch.h
rename to sysdeps/unix/sysv/linux/x86/init-arch.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c
rename to sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c
rename to sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c
rename to sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c
rename to sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c