diff mbox

[roland/nptl-hppa] HPPA: Consolidate nptl/ subdirectories under linux/...

Message ID 20140625212600.5F24C2C39C5@topped-with-meat.com
State Committed
Headers show

Commit Message

Roland McGrath June 25, 2014, 9:26 p.m. UTC
Not tested, but this should not change anything.


Thanks,
Roland


	* sysdeps/unix/sysv/linux/hppa/nptl/libc-lowlevellock.c: File removed.
	* sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: Moved ...
	* sysdeps/unix/sysv/linux/hppa/lowlevellock.h: ... here.
	* sysdeps/unix/sysv/linux/hppa/nptl/pt-vfork.S: Moved ...
	* sysdeps/unix/sysv/linux/hppa/pt-vfork.S: ... here.
	* sysdeps/unix/sysv/linux/hppa/nptl/pthread.h: Moved ...
	* sysdeps/unix/sysv/linux/hppa/pthread.h: ... here.
	* sysdeps/unix/sysv/linux/hppa/nptl/pthreadP.h: Moved ...
	* sysdeps/unix/sysv/linux/hppa/pthreadP.h: ... here.
	* sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_broadcast.c: Moved ...
	* sysdeps/unix/sysv/linux/hppa/pthread_cond_broadcast.c: ... here.
	* sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_destroy.c: Moved ...
	* sysdeps/unix/sysv/linux/hppa/pthread_cond_destroy.c: ... here.
	* sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_init.c: Moved ...
	* sysdeps/unix/sysv/linux/hppa/pthread_cond_init.c: ... here.
	* sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_signal.c: Moved ...
	* sysdeps/unix/sysv/linux/hppa/pthread_cond_signal.c: ... here.
	* sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_timedwait.c: Moved ...
	* sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c: ... here.
	* sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_wait.c: Moved ...
	* sysdeps/unix/sysv/linux/hppa/pthread_cond_wait.c: ... here.
	* sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h: Moved ...
	* sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h: ... here.
diff mbox

Patch

diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h b/sysdeps/unix/sysv/linux/hppa/lowlevellock.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
rename to sysdeps/unix/sysv/linux/hppa/lowlevellock.h
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/libc-lowlevellock.c b/sysdeps/unix/sysv/linux/hppa/nptl/libc-lowlevellock.c
deleted file mode 100644
index 8f50fed..0000000
--- a/sysdeps/unix/sysv/linux/hppa/nptl/libc-lowlevellock.c
+++ /dev/null
@@ -1,20 +0,0 @@ 
-/* low level locking for pthread library.  Generic futex-using version.
-   Copyright (C) 2003-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Paul Mackerras <paulus@au.ibm.com>, 2003.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include "lowlevellock.c"
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/pt-vfork.S b/sysdeps/unix/sysv/linux/hppa/pt-vfork.S
similarity index 100%
rename from sysdeps/unix/sysv/linux/hppa/nptl/pt-vfork.S
rename to sysdeps/unix/sysv/linux/hppa/pt-vfork.S
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/pthread.h b/sysdeps/unix/sysv/linux/hppa/pthread.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/hppa/nptl/pthread.h
rename to sysdeps/unix/sysv/linux/hppa/pthread.h
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/pthreadP.h b/sysdeps/unix/sysv/linux/hppa/pthreadP.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/hppa/nptl/pthreadP.h
rename to sysdeps/unix/sysv/linux/hppa/pthreadP.h
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_broadcast.c b/sysdeps/unix/sysv/linux/hppa/pthread_cond_broadcast.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_broadcast.c
rename to sysdeps/unix/sysv/linux/hppa/pthread_cond_broadcast.c
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_destroy.c b/sysdeps/unix/sysv/linux/hppa/pthread_cond_destroy.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_destroy.c
rename to sysdeps/unix/sysv/linux/hppa/pthread_cond_destroy.c
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_init.c b/sysdeps/unix/sysv/linux/hppa/pthread_cond_init.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_init.c
rename to sysdeps/unix/sysv/linux/hppa/pthread_cond_init.c
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_signal.c b/sysdeps/unix/sysv/linux/hppa/pthread_cond_signal.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_signal.c
rename to sysdeps/unix/sysv/linux/hppa/pthread_cond_signal.c
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_timedwait.c b/sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_timedwait.c
rename to sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_wait.c b/sysdeps/unix/sysv/linux/hppa/pthread_cond_wait.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/hppa/nptl/pthread_cond_wait.c
rename to sysdeps/unix/sysv/linux/hppa/pthread_cond_wait.c
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
rename to sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h