mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

S390: Build failure due to nptl/pt-longjmp.c changes.

Browse Source
This commit is contained in:
Stefan Liebler 2015-02-17 08:47:49 +01:00 committed by Andreas Krebbel
parent 71c06b69d3
commit f20bfc9b5e
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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.

19
sysdeps/unix/sysv/linux/s390/pt-longjmp.c
View File

@ -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)) */