This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] s390x: Add hidden definition for __sigsetjmp

Hi Florian,

See the small comment below. Otherwise this patch is okay.

Thanks.

On 11/14/2016 03:57 PM, Florian Weimer wrote:

2016-11-14  Florian Weimer  <fweimer@redhat.com>

	* sysdeps/s390/s390-64/setjmp.S (NEED_COMPAT_SYMBOLS): New macro.
	(libc_hidden_def): Remove redefinition.
	(__sigsetjmp): Add hidden definition.
	* sysdeps/s390/s390-32/setjmp.S (NEED_COMPAT_SYMBOLS): New macro.
	(libc_hidden_def): Remove redefinition.
	(__sigsetjmp): Add hidden definition.

diff --git a/sysdeps/s390/s390-32/setjmp.S b/sysdeps/s390/s390-32/setjmp.S
index dbacb0f..c460b5e 100644
--- a/sysdeps/s390/s390-32/setjmp.S
+++ b/sysdeps/s390/s390-32/setjmp.S
@@ -24,17 +24,15 @@
 #include <shlib-compat.h>
 #include <stap-probe.h>

-#if !IS_IN (rtld)
-# if defined SHARED &&  SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)
-	/* we need a unique name in case of symbol versioning.  */
-#  define setjmp __v1setjmp
-#  define _setjmp __v1_setjmp
-#  define __sigsetjmp __v1__sigsetjmp
-
-#  undef libc_hidden_def
-#  define libc_hidden_def(name) strong_alias(_setjmp, __GI__setjmp)
-# endif /* if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)  */
-#endif /* !IS_IN (rtld)  */
+#if !IS_IN (rtld) && defined SHARED &&  SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)

This line is too long and there are two spaces between && and SHLIB_COMPAT.
The same applies to sysdeps/s390/s390-64/setjmp.S.
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]