This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch roland/nptl-mips updated. glibc-2.19-688-g4e0bf36
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 25 Jun 2014 22:00:29 -0000
- Subject: GNU C Library master sources branch roland/nptl-mips updated. glibc-2.19-688-g4e0bf36
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-mips has been updated
via 4e0bf36832be396e003869e28c7a39718fa380a8 (commit)
from 7c1c1d8ec3a7aefd568a4e12825e0679e3dad5de (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4e0bf36832be396e003869e28c7a39718fa380a8
commit 4e0bf36832be396e003869e28c7a39718fa380a8
Author: Roland McGrath <roland@hack.frob.com>
Date: Wed Jun 25 14:59:08 2014 -0700
MIPS: Consolidate NPTL/non versions of vfork
diff --git a/ChangeLog b/ChangeLog
index 975cff7..dd61776 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-06-25 Roland McGrath <roland@hack.frob.com>
+ * sysdeps/unix/sysv/linux/mips/vfork.S: Incorporate
+ SAVE_PID and RESTORE_PID blocks from nptl/pt-vfork.S.
+ * sysdeps/unix/sysv/linux/mips/nptl/vfork.S: File removed.
+ * sysdeps/unix/sysv/linux/mips/nptl/pt-vfork.S: File removed.
+
* sysdeps/unix/sysv/linux/mips/clone.S: Deconditionalize the code
that was previously under [RESET_PID].
* sysdeps/unix/sysv/linux/mips/nptl/clone.S: File removed.
diff --git a/sysdeps/unix/sysv/linux/mips/nptl/pt-vfork.S b/sysdeps/unix/sysv/linux/mips/nptl/pt-vfork.S
deleted file mode 100644
index 85c55c9..0000000
--- a/sysdeps/unix/sysv/linux/mips/nptl/pt-vfork.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/* 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
- 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 <tls.h>
-
-/* Save the PID value. */
-#define SAVE_PID \
- READ_THREAD_POINTER(v1); /* Get the thread pointer. */ \
- lw a2, PID_OFFSET(v1); /* Load the saved PID. */ \
- subu a2, $0, a2; /* Negate it. */ \
- sw a2, PID_OFFSET(v1); /* Store the temporary PID. */
-
-/* Restore the old PID value in the parent. */
-#define RESTORE_PID \
- beqz v0, 1f; /* If we are the parent... */ \
- READ_THREAD_POINTER(v1); /* Get the thread pointer. */ \
- lw a2, PID_OFFSET(v1); /* Load the saved PID. */ \
- subu a2, $0, a2; /* Re-negate it. */ \
- sw a2, PID_OFFSET(v1); /* Restore the PID. */ \
-1:
-
-#include <sysdeps/unix/sysv/linux/mips/vfork.S>
diff --git a/sysdeps/unix/sysv/linux/mips/nptl/vfork.S b/sysdeps/unix/sysv/linux/mips/nptl/vfork.S
deleted file mode 100644
index 7f1068c..0000000
--- a/sysdeps/unix/sysv/linux/mips/nptl/vfork.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/* 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
- 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 <tls.h>
-
-/* Save the PID value. */
-#define SAVE_PID \
- READ_THREAD_POINTER(v1); /* Get the thread pointer. */ \
- lw a2, PID_OFFSET(v1); /* Load the saved PID. */ \
- subu a2, $0, a2; /* Negate it. */ \
- bnez a2, 1f; /* If it was zero... */ \
- lui a2, 0x8000; /* use 0x80000000 instead. */ \
-1: sw a2, PID_OFFSET(v1); /* Store the temporary PID. */
-
-/* Restore the old PID value in the parent. */
-#define RESTORE_PID \
- beqz v0, 1f; /* If we are the parent... */ \
- READ_THREAD_POINTER(v1); /* Get the thread pointer. */ \
- lw a2, PID_OFFSET(v1); /* Load the saved PID. */ \
- subu a2, $0, a2; /* Re-negate it. */ \
- lui a0, 0x8000; /* Load 0x80000000... */ \
- bne a2, a0, 2f; /* ... compare against it... */ \
- li a2, 0; /* ... use 0 instead. */ \
-2: sw a2, PID_OFFSET(v1); /* Restore the PID. */ \
-1:
-
-#include <sysdeps/unix/sysv/linux/mips/vfork.S>
diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S
index 0913d6b..80c362d 100644
--- a/sysdeps/unix/sysv/linux/mips/vfork.S
+++ b/sysdeps/unix/sysv/linux/mips/vfork.S
@@ -21,14 +21,7 @@
#include <sysdep.h>
#include <asm/unistd.h>
#include <sgidefs.h>
-
-#ifndef SAVE_PID
-#define SAVE_PID
-#endif
-
-#ifndef RESTORE_PID
-#define RESTORE_PID
-#endif
+#include <tls.h>
/* int vfork() */
@@ -67,7 +60,13 @@ NESTED(__vfork,FRAMESZ,sp)
PTR_ADDU sp, FRAMESZ
cfi_adjust_cfa_offset (-FRAMESZ)
- SAVE_PID
+ /* Save the PID value. */
+ READ_THREAD_POINTER(v1) /* Get the thread pointer. */
+ lw a2, PID_OFFSET(v1) /* Load the saved PID. */
+ subu a2, $0, a2 /* Negate it. */
+ bnez a2, 1f /* If it was zero... */
+ lui a2, 0x8000 /* use 0x80000000 instead. */
+1: sw a2, PID_OFFSET(v1) /* Store the temporary PID. */
li a0, 0x4112 /* CLONE_VM | CLONE_VFORK | SIGCHLD */
move a1, sp
@@ -76,7 +75,16 @@ NESTED(__vfork,FRAMESZ,sp)
li v0,__NR_clone
syscall
- RESTORE_PID
+ /* Restore the old PID value in the parent. */
+ beqz v0, 1f /* If we are the parent... */
+ READ_THREAD_POINTER(v1) /* Get the thread pointer. */
+ lw a2, PID_OFFSET(v1) /* Load the saved PID. */
+ subu a2, $0, a2 /* Re-negate it. */
+ lui a0, 0x8000 /* Load 0x80000000... */
+ bne a2, a0, 2f /* ... compare against it... */
+ li a2, 0 /* ... use 0 instead. */
+2: sw a2, PID_OFFSET(v1) /* Restore the PID. */
+1:
cfi_remember_state
bnez a3,L(error)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++
sysdeps/unix/sysv/linux/mips/nptl/pt-vfork.S | 36 ----------------------
sysdeps/unix/sysv/linux/mips/nptl/vfork.S | 41 --------------------------
sysdeps/unix/sysv/linux/mips/vfork.S | 28 +++++++++++------
4 files changed, 23 insertions(+), 87 deletions(-)
delete mode 100644 sysdeps/unix/sysv/linux/mips/nptl/pt-vfork.S
delete mode 100644 sysdeps/unix/sysv/linux/mips/nptl/vfork.S
hooks/post-receive
--
GNU C Library master sources