about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-11-29 10:08:06 +0100
committerFlorian Weimer <fweimer@redhat.com>2016-11-29 10:08:07 +0100
commit76388b236a7089f6ee5dc0a566caa518132f16bd (patch)
tree7458bceecf97b439d82e413ba87ea09739c74bde
parentf11e220d2dde732121da05df25f6aeda0c52e3c9 (diff)
downloadglibc-76388b236a7089f6ee5dc0a566caa518132f16bd.tar.gz
glibc-76388b236a7089f6ee5dc0a566caa518132f16bd.tar.xz
glibc-76388b236a7089f6ee5dc0a566caa518132f16bd.zip
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.
-rw-r--r--ChangeLog8
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/__longjmp.S4
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist1
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d1964573f..a35e3f9b71 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 529e0956cc..c233b8812e 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 4b0cde8faf..4ba3146902 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