|
 |
ce426f |
# commit 9b874b2f1eb2550e39d3e9c38772e64a767e9de2
|
|
|
ce426f |
# Author: Alan Modra <amodra@gmail.com>
|
|
|
ce426f |
# Date: Sat Aug 17 18:35:40 2013 +0930
|
|
|
ce426f |
#
|
|
|
ce426f |
# PowerPC ugly symbol versioning
|
|
|
ce426f |
# http://sourceware.org/ml/libc-alpha/2013-08/msg00090.html
|
|
|
ce426f |
#
|
|
|
ce426f |
# This patch fixes symbol versioning in setjmp/longjmp. The existing
|
|
|
ce426f |
# code uses raw versions, which results in wrong symbol versioning when
|
|
|
ce426f |
# you want to build glibc with a base version of 2.19 for LE.
|
|
|
ce426f |
#
|
|
|
ce426f |
# Note that the merging the 64-bit and 32-bit versions in novmx-lonjmp.c
|
|
|
ce426f |
# and pt-longjmp.c doesn't result in GLIBC_2.0 versions for 64-bit, due
|
|
|
ce426f |
# to the base in shlib_versions.
|
|
|
ce426f |
#
|
|
|
ce426f |
# * sysdeps/powerpc/longjmp.c: Use proper symbol versioning macros.
|
|
|
ce426f |
# * sysdeps/powerpc/novmx-longjmp.c: Likewise.
|
|
|
ce426f |
# * sysdeps/powerpc/powerpc32/bsd-_setjmp.S: Likewise.
|
|
|
ce426f |
# * sysdeps/powerpc/powerpc32/bsd-setjmp.S: Likewise.
|
|
|
ce426f |
# * sysdeps/powerpc/powerpc32/fpu/__longjmp.S: Likewise.
|
|
|
ce426f |
# * sysdeps/powerpc/powerpc32/fpu/setjmp.S: Likewise.
|
|
|
ce426f |
# * sysdeps/powerpc/powerpc32/mcount.c: Likewise.
|
|
|
ce426f |
# * sysdeps/powerpc/powerpc32/setjmp.S: Likewise.
|
|
|
ce426f |
# * sysdeps/powerpc/powerpc64/setjmp.S: Likewise.
|
|
|
ce426f |
# * nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c: Likewise.
|
|
|
ce426f |
#
|
|
|
ce426f |
diff -urN glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c
|
|
|
ce426f |
--- glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c 2014-05-27 23:22:12.000000000 -0500
|
|
|
ce426f |
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c 2014-05-27 23:23:44.000000000 -0500
|
|
|
ce426f |
@@ -41,13 +41,8 @@
|
|
|
ce426f |
__novmx__libc_longjmp (env, val);
|
|
|
ce426f |
}
|
|
|
ce426f |
|
|
|
ce426f |
-# if __WORDSIZE == 64
|
|
|
ce426f |
-symbol_version (__novmx_longjmp,longjmp,GLIBC_2.3);
|
|
|
ce426f |
-symbol_version (__novmx_siglongjmp,siglongjmp,GLIBC_2.3);
|
|
|
ce426f |
-# else
|
|
|
ce426f |
-symbol_version (__novmx_longjmp,longjmp,GLIBC_2.0);
|
|
|
ce426f |
-symbol_version (__novmx_siglongjmp,siglongjmp,GLIBC_2.0);
|
|
|
ce426f |
-# endif
|
|
|
ce426f |
+compat_symbol (libpthread, __novmx_longjmp, longjmp, GLIBC_2_0);
|
|
|
ce426f |
+compat_symbol (libpthread, __novmx_siglongjmp, siglongjmp, GLIBC_2_0);
|
|
|
ce426f |
#endif /* defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)) */
|
|
|
ce426f |
|
|
|
ce426f |
void
|
|
|
ce426f |
@@ -62,5 +57,5 @@
|
|
|
ce426f |
__libc_siglongjmp (env, val);
|
|
|
ce426f |
}
|
|
|
ce426f |
|
|
|
ce426f |
-versioned_symbol (libc, __vmx_longjmp, longjmp, GLIBC_2_3_4);
|
|
|
ce426f |
-versioned_symbol (libc, __vmx_siglongjmp, siglongjmp, GLIBC_2_3_4);
|
|
|
ce426f |
+versioned_symbol (libpthread, __vmx_longjmp, longjmp, GLIBC_2_3_4);
|
|
|
ce426f |
+versioned_symbol (libpthread, __vmx_siglongjmp, siglongjmp, GLIBC_2_3_4);
|
|
|
ce426f |
diff -urN glibc-2.17-c758a686/sysdeps/powerpc/longjmp.c glibc-2.17-c758a686/sysdeps/powerpc/longjmp.c
|
|
|
ce426f |
--- glibc-2.17-c758a686/sysdeps/powerpc/longjmp.c 2014-05-27 23:22:10.000000000 -0500
|
|
|
ce426f |
+++ glibc-2.17-c758a686/sysdeps/powerpc/longjmp.c 2014-05-27 23:22:12.000000000 -0500
|
|
|
ce426f |
@@ -56,6 +56,6 @@
|
|
|
ce426f |
|
|
|
ce426f |
default_symbol_version (__vmx__libc_longjmp, __libc_longjmp, GLIBC_PRIVATE);
|
|
|
ce426f |
default_symbol_version (__vmx__libc_siglongjmp, __libc_siglongjmp, GLIBC_PRIVATE);
|
|
|
ce426f |
-default_symbol_version (__vmx_longjmp, _longjmp, GLIBC_2.3.4);
|
|
|
ce426f |
-default_symbol_version (__vmxlongjmp, longjmp, GLIBC_2.3.4);
|
|
|
ce426f |
-default_symbol_version (__vmxsiglongjmp, siglongjmp, GLIBC_2.3.4);
|
|
|
ce426f |
+versioned_symbol (libc, __vmx_longjmp, _longjmp, GLIBC_2_3_4);
|
|
|
ce426f |
+versioned_symbol (libc, __vmxlongjmp, longjmp, GLIBC_2_3_4);
|
|
|
ce426f |
+versioned_symbol (libc, __vmxsiglongjmp, siglongjmp, GLIBC_2_3_4);
|
|
|
ce426f |
diff -urN glibc-2.17-c758a686/sysdeps/powerpc/novmx-longjmp.c glibc-2.17-c758a686/sysdeps/powerpc/novmx-longjmp.c
|
|
|
ce426f |
--- glibc-2.17-c758a686/sysdeps/powerpc/novmx-longjmp.c 2014-05-27 23:22:10.000000000 -0500
|
|
|
ce426f |
+++ glibc-2.17-c758a686/sysdeps/powerpc/novmx-longjmp.c 2014-05-27 23:22:12.000000000 -0500
|
|
|
ce426f |
@@ -51,13 +51,7 @@
|
|
|
ce426f |
weak_alias (__novmx__libc_siglongjmp, __novmxlongjmp)
|
|
|
ce426f |
weak_alias (__novmx__libc_siglongjmp, __novmxsiglongjmp)
|
|
|
ce426f |
|
|
|
ce426f |
-# if __WORDSIZE == 64
|
|
|
ce426f |
-symbol_version (__novmx_longjmp,_longjmp,GLIBC_2.3);
|
|
|
ce426f |
-symbol_version (__novmxlongjmp,longjmp,GLIBC_2.3);
|
|
|
ce426f |
-symbol_version (__novmxsiglongjmp,siglongjmp,GLIBC_2.3);
|
|
|
ce426f |
-# else
|
|
|
ce426f |
-symbol_version (__novmx_longjmp,_longjmp,GLIBC_2.0);
|
|
|
ce426f |
-symbol_version (__novmxlongjmp,longjmp,GLIBC_2.0);
|
|
|
ce426f |
-symbol_version (__novmxsiglongjmp,siglongjmp,GLIBC_2.0);
|
|
|
ce426f |
-# endif
|
|
|
ce426f |
+compat_symbol (libc, __novmx_longjmp, _longjmp, GLIBC_2_0);
|
|
|
ce426f |
+compat_symbol (libc, __novmxlongjmp, longjmp, GLIBC_2_0);
|
|
|
ce426f |
+compat_symbol (libc, __novmxsiglongjmp, siglongjmp, GLIBC_2_0);
|
|
|
ce426f |
#endif /* defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)) */
|
|
|
ce426f |
diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-_setjmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-_setjmp.S
|
|
|
ce426f |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-_setjmp.S 2014-05-27 23:22:10.000000000 -0500
|
|
|
ce426f |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-_setjmp.S 2014-05-27 23:22:12.000000000 -0500
|
|
|
ce426f |
@@ -32,7 +32,7 @@
|
|
|
ce426f |
/* Build a versioned object for libc. */
|
|
|
ce426f |
|
|
|
ce426f |
# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)
|
|
|
ce426f |
-symbol_version (__novmx_setjmp,_setjmp,GLIBC_2.0);
|
|
|
ce426f |
+compat_symbol (libc, __novmx_setjmp, _setjmp, GLIBC_2_0);
|
|
|
ce426f |
|
|
|
ce426f |
ENTRY (BP_SYM (__novmx_setjmp))
|
|
|
ce426f |
li r4,0 /* Set second argument to 0. */
|
|
|
ce426f |
@@ -41,7 +41,7 @@
|
|
|
ce426f |
libc_hidden_def (__novmx_setjmp)
|
|
|
ce426f |
# endif /* defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4) */
|
|
|
ce426f |
|
|
|
ce426f |
-default_symbol_version (__vmx_setjmp,_setjmp,GLIBC_2.3.4)
|
|
|
ce426f |
+versioned_symbol (libc, __vmx_setjmp, _setjmp, GLIBC_2_3_4)
|
|
|
ce426f |
/* __GI__setjmp prototype is needed for ntpl i.e. _setjmp is defined
|
|
|
ce426f |
as a libc_hidden_proto & is used in sysdeps/generic/libc-start.c
|
|
|
ce426f |
if HAVE_CLEANUP_JMP_BUF is defined */
|
|
|
ce426f |
diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-setjmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-setjmp.S
|
|
|
ce426f |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-setjmp.S 2014-05-27 23:22:10.000000000 -0500
|
|
|
ce426f |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bsd-setjmp.S 2014-05-27 23:22:12.000000000 -0500
|
|
|
ce426f |
@@ -27,7 +27,7 @@
|
|
|
ce426f |
b __novmx__sigsetjmp@local
|
|
|
ce426f |
END (__novmxsetjmp)
|
|
|
ce426f |
strong_alias (__novmxsetjmp, __novmx__setjmp)
|
|
|
ce426f |
-symbol_version (__novmxsetjmp, setjmp, GLIBC_2.0)
|
|
|
ce426f |
+compat_symbol (libc, __novmxsetjmp, setjmp, GLIBC_2_0)
|
|
|
ce426f |
|
|
|
ce426f |
#endif /* defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4) ) */
|
|
|
ce426f |
|
|
|
ce426f |
@@ -37,4 +37,4 @@
|
|
|
ce426f |
END (__vmxsetjmp)
|
|
|
ce426f |
strong_alias (__vmxsetjmp, __vmx__setjmp)
|
|
|
ce426f |
strong_alias (__vmx__setjmp, __setjmp)
|
|
|
ce426f |
-default_symbol_version (__vmxsetjmp,setjmp,GLIBC_2.3.4)
|
|
|
ce426f |
+versioned_symbol (libc, __vmxsetjmp, setjmp, GLIBC_2_3_4)
|
|
|
ce426f |
diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp.S
|
|
|
ce426f |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp.S 2014-05-27 23:22:10.000000000 -0500
|
|
|
ce426f |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp.S 2014-05-27 23:22:12.000000000 -0500
|
|
|
ce426f |
@@ -26,14 +26,14 @@
|
|
|
ce426f |
|
|
|
ce426f |
#else /* !NOT_IN_libc */
|
|
|
ce426f |
/* Build a versioned object for libc. */
|
|
|
ce426f |
-default_symbol_version (__vmx__longjmp,__longjmp,GLIBC_2.3.4);
|
|
|
ce426f |
+versioned_symbol (libc, __vmx__longjmp, __longjmp, GLIBC_2_3_4);
|
|
|
ce426f |
# define __longjmp __vmx__longjmp
|
|
|
ce426f |
# include "__longjmp-common.S"
|
|
|
ce426f |
|
|
|
ce426f |
# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)
|
|
|
ce426f |
# define __NO_VMX__
|
|
|
ce426f |
# undef JB_SIZE
|
|
|
ce426f |
-symbol_version (__novmx__longjmp,__longjmp,GLIBC_2.0);
|
|
|
ce426f |
+compat_symbol (libc, __novmx__longjmp, __longjmp, GLIBC_2_0);
|
|
|
ce426f |
# undef __longjmp
|
|
|
ce426f |
# define __longjmp __novmx__longjmp
|
|
|
ce426f |
# include "__longjmp-common.S"
|
|
|
ce426f |
diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp.S
|
|
|
ce426f |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp.S 2014-05-27 23:22:10.000000000 -0500
|
|
|
ce426f |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp.S 2014-05-27 23:22:12.000000000 -0500
|
|
|
ce426f |
@@ -26,7 +26,7 @@
|
|
|
ce426f |
|
|
|
ce426f |
#else /* !NOT_IN_libc */
|
|
|
ce426f |
/* Build a versioned object for libc. */
|
|
|
ce426f |
-default_symbol_version (__vmx__sigsetjmp,__sigsetjmp,GLIBC_2.3.4)
|
|
|
ce426f |
+versioned_symbol (libc, __vmx__sigsetjmp, __sigsetjmp, GLIBC_2_3_4)
|
|
|
ce426f |
# define __sigsetjmp __vmx__sigsetjmp
|
|
|
ce426f |
# define __sigjmp_save __vmx__sigjmp_save
|
|
|
ce426f |
# include "setjmp-common.S"
|
|
|
ce426f |
@@ -36,7 +36,7 @@
|
|
|
ce426f |
# undef __sigsetjmp
|
|
|
ce426f |
# undef __sigjmp_save
|
|
|
ce426f |
# undef JB_SIZE
|
|
|
ce426f |
-symbol_version (__novmx__sigsetjmp,__sigsetjmp,GLIBC_2.0)
|
|
|
ce426f |
+compat_symbol (libc, __novmx__sigsetjmp, __sigsetjmp, GLIBC_2_0)
|
|
|
ce426f |
# define __sigsetjmp __novmx__sigsetjmp
|
|
|
ce426f |
# define __sigjmp_save __novmx__sigjmp_save
|
|
|
ce426f |
# include "setjmp-common.S"
|
|
|
ce426f |
diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/mcount.c glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/mcount.c
|
|
|
ce426f |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/mcount.c 2014-05-27 23:22:10.000000000 -0500
|
|
|
ce426f |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/mcount.c 2014-05-27 23:22:12.000000000 -0500
|
|
|
ce426f |
@@ -9,7 +9,7 @@
|
|
|
ce426f |
/* __mcount_internal was added in glibc 2.15 with version GLIBC_PRIVATE,
|
|
|
ce426f |
but it should have been put in version GLIBC_2.15. Mark the
|
|
|
ce426f |
GLIBC_PRIVATE version obsolete and add it to GLIBC_2.16 instead. */
|
|
|
ce426f |
-default_symbol_version (___mcount_internal, __mcount_internal, GLIBC_2.16);
|
|
|
ce426f |
+versioned_symbol (libc, ___mcount_internal, __mcount_internal, GLIBC_2_16);
|
|
|
ce426f |
|
|
|
ce426f |
#if SHLIB_COMPAT (libc, GLIBC_2_15, GLIBC_2_16)
|
|
|
ce426f |
strong_alias (___mcount_internal, ___mcount_internal_private);
|
|
|
ce426f |
diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/setjmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/setjmp.S
|
|
|
ce426f |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/setjmp.S 2014-05-27 23:22:10.000000000 -0500
|
|
|
ce426f |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/setjmp.S 2014-05-27 23:22:12.000000000 -0500
|
|
|
ce426f |
@@ -25,7 +25,7 @@
|
|
|
ce426f |
|
|
|
ce426f |
#else /* !NOT_IN_libc */
|
|
|
ce426f |
/* Build a versioned object for libc. */
|
|
|
ce426f |
-default_symbol_version (__vmx__sigsetjmp,__sigsetjmp,GLIBC_2.3.4)
|
|
|
ce426f |
+versioned_symbol (libc, __vmx__sigsetjmp, __sigsetjmp, GLIBC_2_3_4)
|
|
|
ce426f |
# define __sigsetjmp __vmx__sigsetjmp
|
|
|
ce426f |
# define __sigjmp_save __vmx__sigjmp_save
|
|
|
ce426f |
# include "setjmp-common.S"
|
|
|
ce426f |
@@ -35,7 +35,7 @@
|
|
|
ce426f |
# undef __sigsetjmp
|
|
|
ce426f |
# undef __sigjmp_save
|
|
|
ce426f |
# undef JB_SIZE
|
|
|
ce426f |
-symbol_version (__novmx__sigsetjmp,__sigsetjmp,GLIBC_2.0)
|
|
|
ce426f |
+compat_symbol (libc, __novmx__sigsetjmp, __sigsetjmp, GLIBC_2_0)
|
|
|
ce426f |
# define __sigsetjmp __novmx__sigsetjmp
|
|
|
ce426f |
# define __sigjmp_save __novmx__sigjmp_save
|
|
|
ce426f |
# include "setjmp-common.S"
|
|
|
ce426f |
diff -urN glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp.S glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp.S
|
|
|
ce426f |
--- glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp.S 2014-05-27 23:22:10.000000000 -0500
|
|
|
ce426f |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp.S 2014-05-27 23:22:12.000000000 -0500
|
|
|
ce426f |
@@ -26,9 +26,9 @@
|
|
|
ce426f |
|
|
|
ce426f |
#else /* !NOT_IN_libc */
|
|
|
ce426f |
/* Build a versioned object for libc. */
|
|
|
ce426f |
-default_symbol_version (__vmxsetjmp, setjmp, GLIBC_2.3.4)
|
|
|
ce426f |
-default_symbol_version (__vmx_setjmp,_setjmp,GLIBC_2.3.4)
|
|
|
ce426f |
-default_symbol_version (__vmx__sigsetjmp,__sigsetjmp,GLIBC_2.3.4)
|
|
|
ce426f |
+versioned_symbol (libc, __vmxsetjmp, setjmp, GLIBC_2_3_4)
|
|
|
ce426f |
+versioned_symbol (libc, __vmx_setjmp, _setjmp, GLIBC_2_3_4)
|
|
|
ce426f |
+versioned_symbol (libc, __vmx__sigsetjmp, __sigsetjmp, GLIBC_2_3_4)
|
|
|
ce426f |
# define setjmp __vmxsetjmp
|
|
|
ce426f |
# define _setjmp __vmx_setjmp
|
|
|
ce426f |
# define __sigsetjmp __vmx__sigsetjmp
|
|
|
ce426f |
@@ -44,9 +44,9 @@
|
|
|
ce426f |
# undef __sigjmp_save
|
|
|
ce426f |
# undef JB_SIZE
|
|
|
ce426f |
# define __NO_VMX__
|
|
|
ce426f |
-symbol_version (__novmxsetjmp, setjmp, GLIBC_2.3)
|
|
|
ce426f |
-symbol_version (__novmx_setjmp,_setjmp,GLIBC_2.3);
|
|
|
ce426f |
-symbol_version (__novmx__sigsetjmp,__sigsetjmp,GLIBC_2.3)
|
|
|
ce426f |
+compat_symbol (libc, __novmxsetjmp, setjmp, GLIBC_2_3)
|
|
|
ce426f |
+compat_symbol (libc, __novmx_setjmp,_setjmp, GLIBC_2_3);
|
|
|
ce426f |
+compat_symbol (libc, __novmx__sigsetjmp,__sigsetjmp, GLIBC_2_3)
|
|
|
ce426f |
# define setjmp __novmxsetjmp
|
|
|
ce426f |
# define _setjmp __novmx_setjmp
|
|
|
ce426f |
# define __sigsetjmp __novmx__sigsetjmp
|