diff options
author | Alan Modra <amodra@gmail.com> | 2013-08-17 18:35:40 +0930 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2013-10-04 10:38:28 +0930 |
commit | 9b874b2f1eb2550e39d3e9c38772e64a767e9de2 (patch) | |
tree | be8e92294d137841bf6130e63f823f51d41f91a9 /sysdeps/powerpc/powerpc32/bsd-_setjmp.S | |
parent | be1e5d311342e08ae1f8013342df27b7ded2c156 (diff) | |
download | glibc-9b874b2f1eb2550e39d3e9c38772e64a767e9de2.tar.gz glibc-9b874b2f1eb2550e39d3e9c38772e64a767e9de2.tar.xz glibc-9b874b2f1eb2550e39d3e9c38772e64a767e9de2.zip |
PowerPC ugly symbol versioning
http://sourceware.org/ml/libc-alpha/2013-08/msg00090.html This patch fixes symbol versioning in setjmp/longjmp. The existing code uses raw versions, which results in wrong symbol versioning when you want to build glibc with a base version of 2.19 for LE. Note that the merging the 64-bit and 32-bit versions in novmx-lonjmp.c and pt-longjmp.c doesn't result in GLIBC_2.0 versions for 64-bit, due to the base in shlib_versions. * sysdeps/powerpc/longjmp.c: Use proper symbol versioning macros. * sysdeps/powerpc/novmx-longjmp.c: Likewise. * sysdeps/powerpc/powerpc32/bsd-_setjmp.S: Likewise. * sysdeps/powerpc/powerpc32/bsd-setjmp.S: Likewise. * sysdeps/powerpc/powerpc32/fpu/__longjmp.S: Likewise. * sysdeps/powerpc/powerpc32/fpu/setjmp.S: Likewise. * sysdeps/powerpc/powerpc32/mcount.c: Likewise. * sysdeps/powerpc/powerpc32/setjmp.S: Likewise. * sysdeps/powerpc/powerpc64/setjmp.S: Likewise. * nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c: Likewise.
Diffstat (limited to 'sysdeps/powerpc/powerpc32/bsd-_setjmp.S')
-rw-r--r-- | sysdeps/powerpc/powerpc32/bsd-_setjmp.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/powerpc/powerpc32/bsd-_setjmp.S b/sysdeps/powerpc/powerpc32/bsd-_setjmp.S index 95e8a5aa10..ad2b5ffdb0 100644 --- a/sysdeps/powerpc/powerpc32/bsd-_setjmp.S +++ b/sysdeps/powerpc/powerpc32/bsd-_setjmp.S @@ -30,7 +30,7 @@ libc_hidden_def (_setjmp) /* Build a versioned object for libc. */ # if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4) -symbol_version (__novmx_setjmp,_setjmp,GLIBC_2.0); +compat_symbol (libc, __novmx_setjmp, _setjmp, GLIBC_2_0); ENTRY (__novmx_setjmp) li r4,0 /* Set second argument to 0. */ @@ -39,7 +39,7 @@ END (__novmx_setjmp) libc_hidden_def (__novmx_setjmp) # endif /* defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4) */ -default_symbol_version (__vmx_setjmp,_setjmp,GLIBC_2.3.4) +versioned_symbol (libc, __vmx_setjmp, _setjmp, GLIBC_2_3_4) /* __GI__setjmp prototype is needed for ntpl i.e. _setjmp is defined as a libc_hidden_proto & is used in sysdeps/generic/libc-start.c if HAVE_CLEANUP_JMP_BUF is defined */ |