From f20bfc9b5e0fb6d44378e0611f7b49182242afc2 Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Tue, 17 Feb 2015 08:47:49 +0100 Subject: S390: Build failure due to nptl/pt-longjmp.c changes. --- sysdeps/unix/sysv/linux/s390/pt-longjmp.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'sysdeps/unix/sysv/linux/s390') diff --git a/sysdeps/unix/sysv/linux/s390/pt-longjmp.c b/sysdeps/unix/sysv/linux/s390/pt-longjmp.c index 017ea31f82..2ba2b5805f 100644 --- a/sysdeps/unix/sysv/linux/s390/pt-longjmp.c +++ b/sysdeps/unix/sysv/linux/s390/pt-longjmp.c @@ -20,25 +20,14 @@ #include -#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 -#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)) */ -- cgit v1.2.3