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-s390 created. glibc-2.19-687-gc6916c1
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 25 Jun 2014 18:30:53 -0000
- Subject: GNU C Library master sources branch roland/nptl-s390 created. glibc-2.19-687-gc6916c1
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-s390 has been created
at c6916c1cbbe86cfba87a1a4cf5e3647f3e3fedd9 (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c6916c1cbbe86cfba87a1a4cf5e3647f3e3fedd9
commit c6916c1cbbe86cfba87a1a4cf5e3647f3e3fedd9
Author: Roland McGrath <roland@hack.frob.com>
Date: Wed Jun 25 11:25:34 2014 -0700
Move remaining S390 code out of nptl/.
diff --git a/ChangeLog b/ChangeLog
index 25bbef6..7148ca6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,59 @@
2014-06-25 Roland McGrath <roland@hack.frob.com>
+ * nptl/sysdeps/unix/sysv/linux/s390/Makefile: File removed, contents
+ folded into ...
+ * sysdeps/unix/sysv/linux/s390/Makefile [$(subdir) = nptl]: ... here.
+ * sysdeps/unix/sysv/linux/s390/Versions
+ (libpthread: GLIBC_2.19): New version set.
+ * nptl/sysdeps/unix/sysv/linux/s390/Versions: File removed.
+ * sysdeps/unix/sysv/linux/s390/s390-64/Versions
+ (librt: GLIBC_2.3.3): New version set.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/Versions: File removed.
+ * nptl/sysdeps/unix/sysv/linux/s390/elision-conf.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/elision-conf.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/elision-conf.h: Moved ...
+ * sysdeps/unix/sysv/linux/s390/elision-conf.h: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/elision-lock.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/elision-lock.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/elision-timed.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/elision-timed.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/elision-trylock.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/elision-trylock.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/elision-unlock.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/elision-unlock.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/force-elision.h: Moved ...
+ * sysdeps/unix/sysv/linux/s390/force-elision.h: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/jmp-unwind.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h: Moved ...
+ * sysdeps/unix/sysv/linux/s390/lowlevellock.h: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/pt-longjmp.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/pt-longjmp.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/pthread_once.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/pthread_once.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h: Moved ...
+ * sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h: Moved ...
+ * sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c: ... here.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c: Moved ...
+ * sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c: ... here.
+
* nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: Moved ...
* sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: ... here.
(__libc_vfork): Define the function under this name.
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/Makefile b/nptl/sysdeps/unix/sysv/linux/s390/Makefile
deleted file mode 100644
index 269832f..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-ifeq ($(enable-lock-elision),yes)
-libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \
- elision-trylock
-
-elision-CFLAGS = -mhtm
-CFLAGS-elision-lock.c = $(elision-CFLAGS)
-CFLAGS-elision-timed.c = $(elision-CFLAGS)
-CFLAGS-elision-trylock.c = $(elision-CFLAGS)
-CFLAGS-elision-unlock.c = $(elision-CFLAGS)
-endif
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/Versions b/nptl/sysdeps/unix/sysv/linux/s390/Versions
deleted file mode 100644
index 58632f4..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/Versions
+++ /dev/null
@@ -1,5 +0,0 @@
-libpthread {
- GLIBC_2.19 {
- longjmp; siglongjmp;
- }
-}
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/Versions b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/Versions
deleted file mode 100644
index 3b111dd..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/Versions
+++ /dev/null
@@ -1,7 +0,0 @@
-librt {
- GLIBC_2.3.3 {
- # Changed timer_t.
- timer_create; timer_delete; timer_getoverrun; timer_gettime;
- timer_settime;
- }
-}
diff --git a/sysdeps/unix/sysv/linux/s390/Makefile b/sysdeps/unix/sysv/linux/s390/Makefile
index f91179d..768f926 100644
--- a/sysdeps/unix/sysv/linux/s390/Makefile
+++ b/sysdeps/unix/sysv/linux/s390/Makefile
@@ -22,3 +22,16 @@ ifeq (yes,$(build-shared))
sysdep_routines += v1-longjmp_chk
endif
endif
+
+ifeq ($(subdir),nptl)
+ifeq ($(enable-lock-elision),yes)
+libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \
+ elision-trylock
+
+elision-CFLAGS = -mhtm
+CFLAGS-elision-lock.c = $(elision-CFLAGS)
+CFLAGS-elision-timed.c = $(elision-CFLAGS)
+CFLAGS-elision-trylock.c = $(elision-CFLAGS)
+CFLAGS-elision-unlock.c = $(elision-CFLAGS)
+endif
+endif
diff --git a/sysdeps/unix/sysv/linux/s390/Versions b/sysdeps/unix/sysv/linux/s390/Versions
index f71a6bd..55518a7 100644
--- a/sysdeps/unix/sysv/linux/s390/Versions
+++ b/sysdeps/unix/sysv/linux/s390/Versions
@@ -8,3 +8,9 @@ libc {
__vdso_clock_getres;
}
}
+
+libpthread {
+ GLIBC_2.19 {
+ longjmp; siglongjmp;
+ }
+}
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-conf.c b/sysdeps/unix/sysv/linux/s390/elision-conf.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/elision-conf.c
rename to sysdeps/unix/sysv/linux/s390/elision-conf.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-conf.h b/sysdeps/unix/sysv/linux/s390/elision-conf.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/elision-conf.h
rename to sysdeps/unix/sysv/linux/s390/elision-conf.h
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-lock.c b/sysdeps/unix/sysv/linux/s390/elision-lock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/elision-lock.c
rename to sysdeps/unix/sysv/linux/s390/elision-lock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-timed.c b/sysdeps/unix/sysv/linux/s390/elision-timed.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/elision-timed.c
rename to sysdeps/unix/sysv/linux/s390/elision-timed.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-trylock.c b/sysdeps/unix/sysv/linux/s390/elision-trylock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/elision-trylock.c
rename to sysdeps/unix/sysv/linux/s390/elision-trylock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/elision-unlock.c b/sysdeps/unix/sysv/linux/s390/elision-unlock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/elision-unlock.c
rename to sysdeps/unix/sysv/linux/s390/elision-unlock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/force-elision.h b/sysdeps/unix/sysv/linux/s390/force-elision.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/force-elision.h
rename to sysdeps/unix/sysv/linux/s390/force-elision.h
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c b/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
rename to sysdeps/unix/sysv/linux/s390/jmp-unwind.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h b/sysdeps/unix/sysv/linux/s390/lowlevellock.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h
rename to sysdeps/unix/sysv/linux/s390/lowlevellock.h
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pt-longjmp.c b/sysdeps/unix/sysv/linux/s390/pt-longjmp.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/pt-longjmp.c
rename to sysdeps/unix/sysv/linux/s390/pt-longjmp.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c b/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c
rename to sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c b/sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c
rename to sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c b/sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c
rename to sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c b/sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c
rename to sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/pthread_once.c b/sysdeps/unix/sysv/linux/s390/pthread_once.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/pthread_once.c
rename to sysdeps/unix/sysv/linux/s390/pthread_once.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
rename to sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/Versions b/sysdeps/unix/sysv/linux/s390/s390-64/Versions
index 83092db..3f4d960 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/Versions
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/Versions
@@ -5,3 +5,11 @@ libc {
__frame_state_for; __register_frame_info_table;
}
}
+
+librt {
+ GLIBC_2.3.3 {
+ # Changed timer_t.
+ timer_create; timer_delete; timer_getoverrun; timer_gettime;
+ timer_settime;
+ }
+}
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
rename to sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c b/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c
rename to sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c b/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c
rename to sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c b/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c
rename to sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c b/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c
rename to sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c b/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c
rename to sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d66f4c0a61e775e5a1f63ceb61f1f03ea8308d4b
commit d66f4c0a61e775e5a1f63ceb61f1f03ea8308d4b
Author: Roland McGrath <roland@hack.frob.com>
Date: Mon Jun 23 11:27:31 2014 -0700
S390: Consolidate NPTL/non versions of vfork
diff --git a/ChangeLog b/ChangeLog
index ee99cf9..25bbef6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
2014-06-25 Roland McGrath <roland@hack.frob.com>
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: Moved ...
+ * sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: ... here.
+ (__libc_vfork): Define the function under this name.
+ [!NOT_IN_libc] (__vfork): Make this an alias.
+ [!NOT_IN_libc] (vfork): Conditionalize the weak_alias.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S: Moved ...
+ * sysdeps/unix/sysv/linux/s390/s390-64/vfork.S: ... here.
+ (__libc_vfork): Define the function under this name.
+ [!NOT_IN_libc] (__vfork): Make this an alias.
+ [!NOT_IN_libc] (vfork): Conditionalize the weak_alias.
+ * sysdeps/unix/sysv/linux/s390/pt-vfork.S: New file.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-vfork.S: File removed.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S: File removed.
+ * sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list: Remove vfork.
+ * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
+
* sysdeps/unix/sysv/linux/s390/s390-32/clone.S: Deconditionalize the
code that was previously under [RESET_PID].
* sysdeps/unix/sysv/linux/s390/s390-64/clone.S: Likewise.
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-vfork.S
deleted file mode 100644
index 4908562..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-vfork.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Martin Schwidefsky <schwidefsky@de.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 <sysdep.h>
-#define _ERRNO_H 1
-#include <bits/errno.h>
-#include <bits/wordsize.h>
-#include <tcb-offsets.h>
-
-/* Clone the calling process, but without copying the whole address space.
- The calling process is suspended until the new process exits or is
- replaced by a call to `execve'. Return -1 for errors, 0 to the new process,
- and the process ID of the new process to the old process. */
-
-ENTRY (__vfork)
- ear %r4,%a0
- l %r3,PID(%r4)
- lcr %r1,%r3
- st %r1,PID(%r4)
-
- /* Do vfork system call. */
- svc SYS_ify (vfork)
-
- ltr %r2,%r2
- je 1f
- st %r3,PID(%r4)
-1:
- /* Check for error. */
- lhi %r4,-4095
- clr %r2,%r4
- jnl SYSCALL_ERROR_LABEL
-
- /* Normal return. */
- br %r14
-PSEUDO_END(__vfork)
-
-weak_alias (__vfork, vfork)
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S
deleted file mode 100644
index 589209d..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Martin Schwidefsky <schwidefsky@de.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 <sysdep.h>
-#define _ERRNO_H 1
-#include <bits/errno.h>
-#include <bits/wordsize.h>
-#include <tcb-offsets.h>
-
-/* Clone the calling process, but without copying the whole address space.
- The calling process is suspended until the new process exits or is
- replaced by a call to `execve'. Return -1 for errors, 0 to the new process,
- and the process ID of the new process to the old process. */
-
-ENTRY (__vfork)
-
- ear %r4,%a0
- sllg %r4,%r4,32
- ear %r4,%a1
- l %r3,PID(%r4)
- lcr %r1,%r3
- st %r1,PID(%r4)
-
- /* Do vfork system call. */
- svc SYS_ify (vfork)
-
- ltgr %r2,%r2
- je 1f
- st %r3,PID(%r4)
-1:
- /* Check for error. */
- lghi %r4,-4095
- clgr %r2,%r4
- jgnl SYSCALL_ERROR_LABEL
-
- /* Normal return. */
- br %r14
-PSEUDO_END(__vfork)
-
-weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/sysv/linux/s390/pt-vfork.S b/sysdeps/unix/sysv/linux/s390/pt-vfork.S
new file mode 100644
index 0000000..65cc382
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/pt-vfork.S
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/alpha/pt-vfork.S>
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
index e946d33..ce9f210 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list
@@ -2,7 +2,6 @@
oldgetrlimit EXTRA getrlimit i:ip __old_getrlimit getrlimit@GLIBC_2.0
oldsetrlimit EXTRA setrlimit i:ip __old_setrlimit setrlimit@GLIBC_2.0
-vfork - vfork 0 __vfork vfork
prlimit64 EXTRA prlimit64 i:iipp prlimit64
fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S b/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S
similarity index 91%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S
rename to sysdeps/unix/sysv/linux/s390/s390-32/vfork.S
index 45411ba..290e464 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S
@@ -27,7 +27,7 @@
replaced by a call to `execve'. Return -1 for errors, 0 to the new process,
and the process ID of the new process to the old process. */
-ENTRY (__vfork)
+ENTRY (__libc_vfork)
ear %r4,%a0
lhi %r1,1
icm %r3,15,PID(%r4)
@@ -50,6 +50,10 @@ ENTRY (__vfork)
/* Normal return. */
br %r14
-PSEUDO_END(__vfork)
+PSEUDO_END (__libc_vfork)
+
+#if !NOT_IN_libc
+weak_alias (__libc_vfork, vfork)
+strong_alias (__libc_vfork, __vfork)
libc_hidden_def (__vfork)
-weak_alias (__vfork, vfork)
+#endif
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
index b826c5d..5b8c102 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
@@ -1,7 +1,5 @@
# File name Caller Syscall name # args Strong name Weak names
-vfork - vfork 0 __vfork vfork
-
# semaphore and shm system calls
msgctl - msgctl i:iip __msgctl msgctl
msgget - msgget i:ii __msgget msgget
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S b/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S
similarity index 91%
rename from nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S
rename to sysdeps/unix/sysv/linux/s390/s390-64/vfork.S
index 205e893..7de1bb0 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S
@@ -27,8 +27,7 @@
replaced by a call to `execve'. Return -1 for errors, 0 to the new process,
and the process ID of the new process to the old process. */
-ENTRY (__vfork)
-
+ENTRY (__libc_vfork)
ear %r4,%a0
sllg %r4,%r4,32
ear %r4,%a1
@@ -52,6 +51,10 @@ ENTRY (__vfork)
/* Normal return. */
br %r14
-PSEUDO_END(__vfork)
+PSEUDO_END (__libc_vfork)
+
+#if !NOT_IN_libc
+weak_alias (__libc_vfork, vfork)
+strong_alias (__libc_vfork, __vfork)
libc_hidden_def (__vfork)
-weak_alias (__vfork, vfork)
+#endif
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=592ceabff477fbde3a6481b91b10e7364f6e40e3
commit 592ceabff477fbde3a6481b91b10e7364f6e40e3
Author: Roland McGrath <roland@hack.frob.com>
Date: Wed Jun 25 11:22:20 2014 -0700
S390: Consolidate NPTL/non versions of clone
diff --git a/ChangeLog b/ChangeLog
index e1be998..ee99cf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-06-25 Roland McGrath <roland@hack.frob.com>
+
+ * sysdeps/unix/sysv/linux/s390/s390-32/clone.S: Deconditionalize the
+ code that was previously under [RESET_PID].
+ * sysdeps/unix/sysv/linux/s390/s390-64/clone.S: Likewise.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S: File removed.
+ * nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S: File removed.
+
2014-06-25 Joseph Myers <joseph@codesourcery.com>
* nptl/createthread.c: Don't include kernel-features.h.
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S
deleted file mode 100644
index 675a997..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/clone.S
+++ /dev/null
@@ -1,9 +0,0 @@
-/* We want an #include_next, but we are the main source file.
- So, #include ourselves and in that incarnation we can use #include_next. */
-#ifndef INCLUDED_SELF
-# define INCLUDED_SELF
-# include <clone.S>
-#else
-# define RESET_PID
-# include_next <clone.S>
-#endif
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S
deleted file mode 100644
index 675a997..0000000
--- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/clone.S
+++ /dev/null
@@ -1,9 +0,0 @@
-/* We want an #include_next, but we are the main source file.
- So, #include ourselves and in that incarnation we can use #include_next. */
-#ifndef INCLUDED_SELF
-# define INCLUDED_SELF
-# include <clone.S>
-#else
-# define RESET_PID
-# include_next <clone.S>
-#endif
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S
index f26c229..a5e1980 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S
@@ -54,7 +54,6 @@ error:
PSEUDO_END (__clone)
thread_start:
-#ifdef RESET_PID
tmh %r3,1 /* CLONE_THREAD == 0x00010000 */
jne 1f
lhi %r2,-1
@@ -65,7 +64,6 @@ thread_start:
st %r2,PID(%r3)
st %r2,TID(%r3)
1:
-#endif
/* fn is in gpr 1, arg in gpr 0 */
lr %r2,%r0 /* set first parameter to void *arg */
ahi %r15,-96 /* make room on the stack for the save area */
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S
index ee501b5..27ddf1f 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S
@@ -55,7 +55,6 @@ error:
PSEUDO_END (__clone)
thread_start:
-#ifdef RESET_PID
tmh %r3,1 /* CLONE_THREAD == 0x00010000 */
jne 1f
lhi %r2,-1
@@ -68,7 +67,6 @@ thread_start:
st %r2,PID(%r3)
st %r2,TID(%r3)
1:
-#endif
/* fn is in gpr 1, arg in gpr 0 */
lgr %r2,%r0 /* set first parameter to void *arg */
aghi %r15,-160 /* make room on the stack for the save area */
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources