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.21-88-gf20bfc9
- From: krebbel at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 17 Feb 2015 07:48:13 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.21-88-gf20bfc9
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 f20bfc9b5e0fb6d44378e0611f7b49182242afc2 (commit)
from 71c06b69d375afd09270a6cb2b05d7a4fab680fa (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=f20bfc9b5e0fb6d44378e0611f7b49182242afc2
commit f20bfc9b5e0fb6d44378e0611f7b49182242afc2
Author: Stefan Liebler <stli@linux.vnet.ibm.com>
Date: Tue Feb 17 08:47:49 2015 +0100
S390: Build failure due to nptl/pt-longjmp.c changes.
diff --git a/ChangeLog b/ChangeLog
index 98ddd61..00a21e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-02-17 Stefan Liebler <stli@linux.vnet.ibm.com>
+
+ * sysdeps/unix/sysv/linux/s390/pt-longjmp.c
+ (__v1longjmp): Remove versioned symbol.
+ (__v1siglongjmp): Remove alias and versioned symbol.
+ (__v2longjmp): Use DEFINE_LONGJMP instead of alias.
+ (__v2siglongjmp): Likewise.
+
2015-02-16 Torvald Riegel <triegel@redhat.com>
* sysdeps/unix/sysv/linux/ia64/lowlevellock.h: Remove file.
diff --git a/sysdeps/unix/sysv/linux/s390/pt-longjmp.c b/sysdeps/unix/sysv/linux/s390/pt-longjmp.c
index 017ea31..2ba2b58 100644
--- a/sysdeps/unix/sysv/linux/s390/pt-longjmp.c
+++ b/sysdeps/unix/sysv/linux/s390/pt-longjmp.c
@@ -20,25 +20,14 @@
#include <shlib-compat.h>
-#if defined SHARED && SHLIB_COMPAT (libpthread, GLIBC_2_19, GLIBC_2_20)
- /* we need a unique name in case of symbol versioning. */
-# define longjmp __v1longjmp
-#endif /* defined SHARED && SHLIB_COMPAT (libpthread, GLIBC_2_19, GLIBC_2_20)) */
-
#include <nptl/pt-longjmp.c>
-#if defined SHARED && SHLIB_COMPAT (libpthread, GLIBC_2_19, GLIBC_2_20)
+#if SHLIB_COMPAT (libpthread, GLIBC_2_19, GLIBC_2_20)
/* In glibc release 2.19 new versions of longjmp-functions were introduced,
but were reverted before 2.20. Thus both versions are the same function. */
-# undef longjmp
-
-strong_alias (__v1longjmp, __v2longjmp)
-versioned_symbol (libpthread, __v1longjmp, longjmp, GLIBC_2_0);
+DEFINE_LONGJMP (__v2longjmp)
compat_symbol (libpthread, __v2longjmp, longjmp, GLIBC_2_19);
-
-weak_alias (siglongjmp, __v1siglongjmp)
-weak_alias (siglongjmp, __v2siglongjmp)
-versioned_symbol (libpthread, __v1siglongjmp, siglongjmp, GLIBC_2_0);
+DEFINE_LONGJMP (__v2siglongjmp)
compat_symbol (libpthread, __v2siglongjmp, siglongjmp, GLIBC_2_19);
-#endif /* defined SHARED && SHLIB_COMPAT (libpthread, GLIBC_2_19, GLIBC_2_20)) */
+#endif /* SHLIB_COMPAT (libpthread, GLIBC_2_19, GLIBC_2_20)) */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++++++
sysdeps/unix/sysv/linux/s390/pt-longjmp.c | 19 ++++---------------
2 files changed, 12 insertions(+), 15 deletions(-)
hooks/post-receive
--
GNU C Library master sources