This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
GNU C Library master sources branch roland/nptl-hppa created. glibc-2.19-690-gcca7403

From: roland at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 25 Jun 2014 21:24:28 -0000
Subject: GNU C Library master sources branch roland/nptl-hppa created. glibc-2.19-690-gcca7403
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, roland/nptl-hppa has been created
        at  cca74039209eeaa194c8dd312211fdac79d8c8cd (commit)

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=cca74039209eeaa194c8dd312211fdac79d8c8cd

commit cca74039209eeaa194c8dd312211fdac79d8c8cd
Author: Roland McGrath <roland@hack.frob.com>
Date:   Wed Jun 25 14:22:27 2014 -0700

    HPPA: Consolidate nptl/ subdirectories under linux/...

diff --git a/ChangeLog b/ChangeLog
index d094779..ae9669f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,29 @@
 2014-06-25  Roland McGrath  <roland@hack.frob.com>
 
+	* 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.
+
 	* sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h: Moved ...
 	* sysdeps/hppa/nptl/bits/pthreadtypes.h: ... here.
 	* sysdeps/unix/sysv/linux/hppa/nptl/bits/semaphore.h: Moved ...
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

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6ec716b64b7301bc0212c89880646fbe26a8188f

commit 6ec716b64b7301bc0212c89880646fbe26a8188f
Author: Roland McGrath <roland@hack.frob.com>
Date:   Wed Jun 25 11:14:59 2014 -0700

    HPPA: Move NPTL public headers to sysdeps/hppa/nptl/.

diff --git a/ChangeLog b/ChangeLog
index 8ac652f..d094779 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-06-25  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h: Moved ...
+	* sysdeps/hppa/nptl/bits/pthreadtypes.h: ... here.
+	* sysdeps/unix/sysv/linux/hppa/nptl/bits/semaphore.h: Moved ...
+	* sysdeps/hppa/nptl/bits/semaphore.h: ... here.
+
 	* sysdeps/unix/sysv/linux/hppa/clone.S: Include <tcb-offsets.h>.
 	Deconditionalize the code that was previously under [RESET_PID].
 	* sysdeps/unix/sysv/linux/hppa/nptl/clone.S: File removed.
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h b/sysdeps/hppa/nptl/bits/pthreadtypes.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h
rename to sysdeps/hppa/nptl/bits/pthreadtypes.h
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/bits/semaphore.h b/sysdeps/hppa/nptl/bits/semaphore.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/hppa/nptl/bits/semaphore.h
rename to sysdeps/hppa/nptl/bits/semaphore.h

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d90cdafe1520585d88193a7a7a7be5aa9274ac69

commit d90cdafe1520585d88193a7a7a7be5aa9274ac69
Author: Roland McGrath <roland@hack.frob.com>
Date:   Wed Jun 25 11:14:46 2014 -0700

    HPPA: Consolidate NPTL/non versions of clone

diff --git a/ChangeLog b/ChangeLog
index 4d8f13c..8ac652f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-06-25  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/unix/sysv/linux/hppa/clone.S: Include <tcb-offsets.h>.
+	Deconditionalize the code that was previously under [RESET_PID].
+	* sysdeps/unix/sysv/linux/hppa/nptl/clone.S: File removed.
+
 	* sysdeps/unix/sysv/linux/hppa/arch-fork.h: New file.
 	* sysdeps/unix/sysv/linux/hppa/nptl/fork.c: File removed.
 
diff --git a/sysdeps/unix/sysv/linux/hppa/clone.S b/sysdeps/unix/sysv/linux/hppa/clone.S
index 1a3c6c8..04f46a3 100644
--- a/sysdeps/unix/sysv/linux/hppa/clone.S
+++ b/sysdeps/unix/sysv/linux/hppa/clone.S
@@ -24,6 +24,7 @@
 #include <sysdep.h>
 #define _ERRNO_H	1
 #include <bits/errno.h>
+#include <tcb-offsets.h>
 
 /* Non-thread code calls __clone with the following parameters:
    int clone(int (*fn)(void *arg),
@@ -131,9 +132,8 @@ ENTRY(__clone)
 	ldwm	-64(%sp), %r4
 
 .LthreadStart:
-#ifdef RESET_PID
-# define CLONE_VM_BIT		23	/* 0x00000100  */
-# define CLONE_THREAD_BIT	15	/* 0x00010000  */
+#define CLONE_VM_BIT		23	/* 0x00000100  */
+#define CLONE_THREAD_BIT	15	/* 0x00010000  */
 	/* Load original clone flags.
 	   If CLONE_THREAD was passed, don't reset the PID/TID.
 	   If CLONE_VM was passed, we need to store -1 to PID/TID.
@@ -150,7 +150,6 @@ ENTRY(__clone)
 	stw	%ret0, PID_THREAD_OFFSET(%r26)
 	stw	%ret0, TID_THREAD_OFFSET(%r26)
 1:
-#endif
 	/* Load up the arguments.  */
 	ldw	-60(%sp), %arg0
 	ldw     -64(%sp), %r22
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/clone.S b/sysdeps/unix/sysv/linux/hppa/nptl/clone.S
deleted file mode 100644
index 23750b3..0000000
--- a/sysdeps/unix/sysv/linux/hppa/nptl/clone.S
+++ /dev/null
@@ -1,3 +0,0 @@
-#define RESET_PID
-#include <tcb-offsets.h>
-#include "../clone.S"

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c00a3d9e5d8ed40ca3ea40de2c6811ef78b488c5

commit c00a3d9e5d8ed40ca3ea40de2c6811ef78b488c5
Author: Roland McGrath <roland@hack.frob.com>
Date:   Wed Jun 25 11:14:30 2014 -0700

    HPPA: Convert fork.c to arch-fork.h

diff --git a/ChangeLog b/ChangeLog
index a8350cc..4d8f13c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-25  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/unix/sysv/linux/hppa/arch-fork.h: New file.
+	* sysdeps/unix/sysv/linux/hppa/nptl/fork.c: File removed.
+
 2014-06-25  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/dl-opendir.c (__ASSUME_O_CLOEXEC): Do
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/fork.c b/sysdeps/unix/sysv/linux/hppa/arch-fork.h
similarity index 89%
rename from sysdeps/unix/sysv/linux/hppa/nptl/fork.c
rename to sysdeps/unix/sysv/linux/hppa/arch-fork.h
index 3c21f5a..f4241fa 100644
--- a/sysdeps/unix/sysv/linux/hppa/nptl/fork.c
+++ b/sysdeps/unix/sysv/linux/hppa/arch-fork.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2005-2014 Free Software Foundation, Inc.
+/* ARCH_FORK definition for Linux fork implementation.  HPPA version.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -29,5 +30,3 @@
   INLINE_SYSCALL (clone, 5,						\
 		  CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD,	\
                   NULL, NULL, NULL, &THREAD_SELF->tid)
-
-#include <nptl/sysdeps/unix/sysv/linux/fork.c>

-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU C Library master sources
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]