From 3f25366c3b89ac0573906b80f32e017091d007ea Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Sun, 5 Feb 2006 05:56:00 +0000 Subject: Get rid of versioning and shared library compatibility code. We want to start with as clean of a slate as possible. Whip me, beat me, make me shrink the code. --- .../sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c | 35 ++-------------------- 1 file changed, 2 insertions(+), 33 deletions(-) (limited to 'libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c') diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c index 3c795e37e..b6d6b3d55 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c @@ -21,35 +21,6 @@ #include #include #include "pthreadP.h" -#include -#if defined SHARED && SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_3_4) - -/* These functions are not declared anywhere since they shouldn't be - used at another place but here. */ -extern void __novmx__libc_siglongjmp (sigjmp_buf env, int val) - __attribute__ ((noreturn)); -extern void __novmx__libc_longjmp (sigjmp_buf env, int val) - __attribute__ ((noreturn)); - - -void __novmx_siglongjmp (sigjmp_buf env, int val) -{ - __novmx__libc_siglongjmp (env, val); -} - -void __novmx_longjmp (jmp_buf env, int val) -{ - __novmx__libc_longjmp (env, val); -} - -# if __WORDSIZE == 64 -symbol_version (__novmx_longjmp,longjmp,GLIBC_2.3); -symbol_version (__novmx_siglongjmp,siglongjmp,GLIBC_2.3); -# else -symbol_version (__novmx_longjmp,longjmp,GLIBC_2.0); -symbol_version (__novmx_siglongjmp,siglongjmp,GLIBC_2.0); -# endif -#endif /* defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)) */ void __vmx_longjmp (jmp_buf env, int val) @@ -62,7 +33,5 @@ __vmx_siglongjmp (jmp_buf env, int val) { __libc_siglongjmp (env, val); } - -versioned_symbol (libc, __vmx_longjmp, longjmp, GLIBC_2_3_4); -versioned_symbol (libc, __vmx_siglongjmp, siglongjmp, GLIBC_2_3_4); - +weak_alias(__vmx_longjmp, longjmp) +weak_alias(__vmx_siglongjmp, siglongjmp) -- cgit v1.2.3