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.24-422-gb365289
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 29 Nov 2016 10:11:34 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.24-422-gb365289
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 b36528936449d2e800db8833869d108a20653c96 (commit)
via 76388b236a7089f6ee5dc0a566caa518132f16bd (commit)
from f11e220d2dde732121da05df25f6aeda0c52e3c9 (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=b36528936449d2e800db8833869d108a20653c96
commit b36528936449d2e800db8833869d108a20653c96
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue Nov 29 10:16:35 2016 +0100
powerpc: Add hidden definition for __sigsetjmp
There already is a hidden prototype for __sigsetjmp, but the
architecture-specific definition was missing.
diff --git a/ChangeLog b/ChangeLog
index a35e3f9..7a70c49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2016-11-29 Florian Weimer <fweimer@redhat.com>
+ * sysdeps/powerpc/powerpc64/setjmp-common.S (__GI___sigsetjmp):
+ Define.
+ * sysdeps/powerpc/powerpc32/setjmp.S (__sigsetjmp): Add hidden
+ definition.
+
+2016-11-29 Florian Weimer <fweimer@redhat.com>
+
* sysdeps/powerpc/powerpc32/fpu/__longjmp.S (__longjmp): Remove
version and turn into strong alias. Remove compat symbol.
diff --git a/sysdeps/powerpc/powerpc32/fpu/setjmp.S b/sysdeps/powerpc/powerpc32/fpu/setjmp.S
index 6a4016c..de6cdcf 100644
--- a/sysdeps/powerpc/powerpc32/fpu/setjmp.S
+++ b/sysdeps/powerpc/powerpc32/fpu/setjmp.S
@@ -32,6 +32,7 @@ versioned_symbol (libc, __vmx__sigsetjmp, __sigsetjmp, GLIBC_2_3_4)
# define __sigsetjmp_symbol __vmx__sigsetjmp
# define __sigjmp_save_symbol __vmx__sigjmp_save
# include "setjmp-common.S"
+libc_hidden_ver (__vmx__sigsetjmp, __sigsetjmp)
# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)
# define __NO_VMX__
diff --git a/sysdeps/powerpc/powerpc32/setjmp.S b/sysdeps/powerpc/powerpc32/setjmp.S
index 88f7f82..285d40c 100644
--- a/sysdeps/powerpc/powerpc32/setjmp.S
+++ b/sysdeps/powerpc/powerpc32/setjmp.S
@@ -31,6 +31,7 @@ versioned_symbol (libc, __vmx__sigsetjmp, __sigsetjmp, GLIBC_2_3_4)
# define __sigsetjmp_symbol __vmx__sigsetjmp
# define __sigjmp_save_symbol __vmx__sigjmp_save
# include "setjmp-common.S"
+libc_hidden_ver (__vmx__sigsetjmp, __sigsetjmp)
# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)
# define __NO_VMX__
diff --git a/sysdeps/powerpc/powerpc64/setjmp-common.S b/sysdeps/powerpc/powerpc64/setjmp-common.S
index 83361f5..b5de49e 100644
--- a/sysdeps/powerpc/powerpc64/setjmp-common.S
+++ b/sysdeps/powerpc/powerpc64/setjmp-common.S
@@ -232,3 +232,14 @@ L(no_vmx):
blr
#endif
END (__sigsetjmp_symbol)
+
+#if defined SHARED && !IS_IN (rtld) && !defined __NO_VMX__
+/* When called from within libc we need a special version of __sigsetjmp
+ that saves r2 since the call won't go via a plt call stub. See
+ bugz #269. */
+ENTRY (__GI___sigsetjmp)
+ std r2,FRAME_TOC_SAVE(r1) /* Save the callers TOC in the save area. */
+ CALL_MCOUNT 1
+ b JUMPTARGET (GLUE(__sigsetjmp_symbol,_ent))
+END (__GI___sigsetjmp)
+#endif
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=76388b236a7089f6ee5dc0a566caa518132f16bd
commit 76388b236a7089f6ee5dc0a566caa518132f16bd
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue Nov 29 10:08:06 2016 +0100
powerpc: Remove unintended __longjmp symbol from ABI
The __longjmp symbol was left in accidentally. It is not exported
through a Versions file, but through a .symver assembler directive.
The corresponding exported symbol was removed from the non-fpu
powerpc64 targets in commit 9b9ef823581ecee546653d6ac3fd335f7b79faca.
diff --git a/ChangeLog b/ChangeLog
index 2d19645..a35e3f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2016-11-29 Florian Weimer <fweimer@redhat.com>
+
+ * sysdeps/powerpc/powerpc32/fpu/__longjmp.S (__longjmp): Remove
+ version and turn into strong alias. Remove compat symbol.
+
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+ (__longjmp): Remove.
+
2016-11-29 Joseph Myers <joseph@codesourcery.com>
* bits/fp-fast.h: New file.
diff --git a/sysdeps/powerpc/powerpc32/fpu/__longjmp.S b/sysdeps/powerpc/powerpc32/fpu/__longjmp.S
index 529e095..c233b88 100644
--- a/sysdeps/powerpc/powerpc32/fpu/__longjmp.S
+++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp.S
@@ -26,15 +26,13 @@
# include "__longjmp-common.S"
#else /* IS_IN (libc) */
-/* Build a versioned object for libc. */
-versioned_symbol (libc, __vmx__longjmp, __longjmp, GLIBC_2_3_4);
+strong_alias (__vmx__longjmp, __longjmp)
# define __longjmp_symbol __vmx__longjmp
# include "__longjmp-common.S"
# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)
# define __NO_VMX__
# undef JB_SIZE
-compat_symbol (libc, __novmx__longjmp, __longjmp, GLIBC_2_0);
# undef __longjmp_symbol
# define __longjmp_symbol __novmx__longjmp
# include "__longjmp-common.S"
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index 4b0cde8..4ba3146 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -2112,7 +2112,6 @@ GLIBC_2.3.4 GLIBC_2.3.4 A
GLIBC_2.3.4 __chk_fail F
GLIBC_2.3.4 __fprintf_chk F
GLIBC_2.3.4 __gets_chk F
-GLIBC_2.3.4 __longjmp F
GLIBC_2.3.4 __memcpy_chk F
GLIBC_2.3.4 __memmove_chk F
GLIBC_2.3.4 __mempcpy_chk F
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 15 +++++++++++++++
sysdeps/powerpc/powerpc32/fpu/__longjmp.S | 4 +---
sysdeps/powerpc/powerpc32/fpu/setjmp.S | 1 +
sysdeps/powerpc/powerpc32/setjmp.S | 1 +
sysdeps/powerpc/powerpc64/setjmp-common.S | 11 +++++++++++
.../sysv/linux/powerpc/powerpc32/fpu/libc.abilist | 1 -
6 files changed, 29 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources