diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-01-03 17:51:28 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-01-03 17:51:28 +0000 |
| commit | f71e9a28759c1f5d6e8dc0baced440e72507b433 (patch) | |
| tree | d1ef7f1f84de67d0446b60c04f10a47c84ac1ddc /libc/sysdeps/powerpc/powerpc32/fpu/setjmp.S | |
| parent | 036dfd44bcc8ed8e97dcd9c763f61d3b59796941 (diff) | |
| download | eglibc2-f71e9a28759c1f5d6e8dc0baced440e72507b433.tar.gz | |
Merge changes between r24468 and r24941 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@24942 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/powerpc/powerpc32/fpu/setjmp.S')
| -rw-r--r-- | libc/sysdeps/powerpc/powerpc32/fpu/setjmp.S | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libc/sysdeps/powerpc/powerpc32/fpu/setjmp.S b/libc/sysdeps/powerpc/powerpc32/fpu/setjmp.S index 92acff1e6..333f707da 100644 --- a/libc/sysdeps/powerpc/powerpc32/fpu/setjmp.S +++ b/libc/sysdeps/powerpc/powerpc32/fpu/setjmp.S @@ -1,5 +1,5 @@ /* non altivec (old) version of setjmp for PowerPC. - Copyright (C) 1995-2013 Free Software Foundation, Inc. + Copyright (C) 1995-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,23 +22,25 @@ #if defined NOT_IN_libc /* Build a non-versioned object for rtld-*. */ +# define __sigsetjmp_symbol __sigsetjmp +# define __sigjmp_save_symbol __sigjmp_save # include "setjmp-common.S" #else /* !NOT_IN_libc */ /* Build a versioned object for libc. */ versioned_symbol (libc, __vmx__sigsetjmp, __sigsetjmp, GLIBC_2_3_4) -# define __sigsetjmp __vmx__sigsetjmp -# define __sigjmp_save __vmx__sigjmp_save +# define __sigsetjmp_symbol __vmx__sigsetjmp +# define __sigjmp_save_symbol __vmx__sigjmp_save # include "setjmp-common.S" # if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4) # define __NO_VMX__ -# undef __sigsetjmp -# undef __sigjmp_save +# undef __sigsetjmp_symbol +# undef __sigjmp_save_symbol # undef JB_SIZE compat_symbol (libc, __novmx__sigsetjmp, __sigsetjmp, GLIBC_2_0) -# define __sigsetjmp __novmx__sigsetjmp -# define __sigjmp_save __novmx__sigjmp_save +# define __sigsetjmp_symbol __novmx__sigsetjmp +# define __sigjmp_save_symbol __novmx__sigjmp_save # include "setjmp-common.S" # endif #endif /* !NOT_IN_libc */ |