This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.19-469-g82aab97
- From: rth at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 25 May 2014 15:59:31 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-469-g82aab97
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, master has been updated
via 82aab97cbf74d03ff7eab70f918548e14fe0a370 (commit)
from 900e445fad9bf301a42c0d0008cce504ad94050e (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=82aab97cbf74d03ff7eab70f918548e14fe0a370
commit 82aab97cbf74d03ff7eab70f918548e14fe0a370
Author: Richard Henderson <rth@twiddle.net>
Date: Sun May 25 09:04:54 2014 -0700
alpha: Do non-default symbols in pt-vfork.S
diff --git a/ChangeLog b/ChangeLog
index 271e31d..a126a4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-25 Richard Henderson <rth@twiddle.net>
+
+ * sysdeps/unix/sysv/linux/alpha/vfork.S (vfork, __vfork): Only
+ define if !NOT_IN_libc.
+ * sysdeps/unix/sysv/linux/alpha/pt-vfork.S (vfork, __vfork): Only
+ define with non-default symbol versions.
+
2014-05-23 Richard Henderson <rth@twiddle.net>
* nptl/pt-vfork.c (vfork_resolve): Rename from vfork_ifunc.
diff --git a/sysdeps/unix/sysv/linux/alpha/pt-vfork.S b/sysdeps/unix/sysv/linux/alpha/pt-vfork.S
index 1d13736..18bf338 100644
--- a/sysdeps/unix/sysv/linux/alpha/pt-vfork.S
+++ b/sysdeps/unix/sysv/linux/alpha/pt-vfork.S
@@ -32,3 +32,12 @@
#include <vfork.S>
#endif
+
+#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_20)
+compat_symbol (libpthread, __libc_vfork, vfork, GLIBC_2_0);
+#endif
+
+#if SHLIB_COMPAT (libpthread, GLIBC_2_1_2, GLIBC_2_20)
+strong_alias (__libc_vfork, __vfork_compat)
+compat_symbol (libpthread, __vfork_compat, __vfork, GLIBC_2_1_2);
+#endif
diff --git a/sysdeps/unix/sysv/linux/alpha/vfork.S b/sysdeps/unix/sysv/linux/alpha/vfork.S
index 0507d35..befcd78 100644
--- a/sysdeps/unix/sysv/linux/alpha/vfork.S
+++ b/sysdeps/unix/sysv/linux/alpha/vfork.S
@@ -18,7 +18,7 @@
#include <sysdep.h>
#include <tcb-offsets.h>
-ENTRY(__vfork)
+ENTRY(__libc_vfork)
PSEUDO_PROLOGUE
/* Load the thread pointer value in A1 across the vfork. */
@@ -47,11 +47,10 @@ ENTRY(__vfork)
bne a3, SYSCALL_ERROR_LABEL
ret
-PSEUDO_END (__vfork)
-libc_hidden_def (__vfork)
-
-weak_alias (__vfork, vfork)
+PSEUDO_END (__libc_vfork)
#if !NOT_IN_libc
-strong_alias (__vfork, __libc_vfork)
+weak_alias (__libc_vfork, vfork)
+strong_alias (__libc_vfork, __vfork)
+libc_hidden_def (__vfork)
#endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
sysdeps/unix/sysv/linux/alpha/pt-vfork.S | 9 +++++++++
sysdeps/unix/sysv/linux/alpha/vfork.S | 11 +++++------
3 files changed, 21 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources