diff options
author | Andreas Schwab <schwab@redhat.com> | 2009-08-24 10:15:51 +0200 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2009-08-24 10:15:51 +0200 |
commit | 255acd161cc2d7752a4e79234dcba5d929c3e0a4 (patch) | |
tree | 94c1d111cce2137ee948ff0e9d735f7a3643ef78 /sysdeps/powerpc/powerpc32 | |
parent | 593eff0f9e5bed517e0a8434507ee9f3f4d45b87 (diff) | |
parent | a0e25a886a9128b280b4c05bc9c6dd12377ea868 (diff) |
Merge commit 'origin/master' into fedora/master
Conflicts:
sysdeps/powerpc/powerpc64/____longjmp_chk.S
sysdeps/unix/sysv/linux/powerpc/powerpc64/____longjmp_chk.S
Diffstat (limited to 'sysdeps/powerpc/powerpc32')
-rw-r--r-- | sysdeps/powerpc/powerpc32/____longjmp_chk.S | 64 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc32/__longjmp-common.S | 15 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S | 15 |
3 files changed, 16 insertions, 78 deletions
diff --git a/sysdeps/powerpc/powerpc32/____longjmp_chk.S b/sysdeps/powerpc/powerpc32/____longjmp_chk.S deleted file mode 100644 index 128899a532..0000000000 --- a/sysdeps/powerpc/powerpc32/____longjmp_chk.S +++ /dev/null @@ -1,64 +0,0 @@ -/* Copyright (C) 2009 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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include <sysdep.h> -#include <rtld-global-offsets.h> - - .section .rodata.str1.1,"aMS",@progbits,1 -.LC0: - .string "longjmp causes uninitialized stack frame" - .text - -#define __longjmp ____longjmp_chk - -#ifdef PIC -# ifdef HAVE_ASM_PPC_REL16 -# define LOAD_ARG \ - bcl 20,31,1f; \ -1: mflr r3; \ - addis r3,r3,_GLOBAL_OFFSET_TABLE_-1b@ha; \ - addi r3,r3,_GLOBAL_OFFSET_TABLE_-1b@l; \ - lwz r3,.LC0@got(r3) -# else -# define LOAD_ARG \ - bl _GLOBAL_OFFSET_TABLE_-4@local; \ - mflr r3; \ - lwz r3,.LC0@got(r3) -# endif -#else -# define LOAD_ARG \ - lis r3,.LC0@ha; \ - la r3,.LC0@l(r3) -#endif - -#define CHECK_SP(reg) \ - cmplw reg, r1; \ - bge+ .Lok; \ - cfi_remember_state; \ - mflr r0; \ - stwu r1,-16(r1); \ - cfi_adjust_cfa_offset (16); \ - stw r0,20(r1); \ - cfi_offset (lr, 4); \ - LOAD_ARG; \ - bl HIDDEN_JUMPTARGET (__fortify_fail); \ - nop; \ - cfi_restore_state; \ -.Lok: - -#include <__longjmp-common.S> diff --git a/sysdeps/powerpc/powerpc32/__longjmp-common.S b/sysdeps/powerpc/powerpc32/__longjmp-common.S index 7b1c017837..955161ef2b 100644 --- a/sysdeps/powerpc/powerpc32/__longjmp-common.S +++ b/sysdeps/powerpc/powerpc32/__longjmp-common.S @@ -33,6 +33,13 @@ ENTRY (BP_SYM (__longjmp)) #if defined PTR_DEMANGLE || defined CHECK_SP lwz r24,(JB_GPR1*4)(r3) +# ifdef CHECK_SP +# ifdef PTR_DEMANGLE + PTR_DEMANGLE3 (r24, r24, r25) +# endif + CHECK_SP (r24) + mr r1,r24 +# endif #else lwz r1,(JB_GPR1*4)(r3) #endif @@ -45,17 +52,11 @@ ENTRY (BP_SYM (__longjmp)) lwz r19,((JB_GPRS+5)*4)(r3) lwz r20,((JB_GPRS+6)*4)(r3) #ifdef PTR_DEMANGLE -# ifdef CHECK_SP - PTR_DEMANGLE3 (r24, r24, r25) -# else +# ifndef CHECK_SP PTR_DEMANGLE3 (r1, r24, r25) # endif PTR_DEMANGLE2 (r0, r25) #endif -#ifdef CHECK_SP - CHECK_SP (r24) - mr r1,r24 -#endif mtlr r0 lwz r21,((JB_GPRS+7)*4)(r3) lwz r22,((JB_GPRS+8)*4)(r3) diff --git a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S index f105815b9c..04ed6da68b 100644 --- a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S +++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S @@ -116,6 +116,13 @@ L(no_vmx): #endif #if defined PTR_DEMANGLE || defined CHECK_SP lwz r24,(JB_GPR1*4)(r3) +# ifdef CHECK_SP +# ifdef PTR_DEMANGLE + PTR_DEMANGLE3 (r24, r24, r25) +# endif + CHECK_SP (r24) + mr r1,r24 +# endif #else lwz r1,(JB_GPR1*4)(r3) #endif @@ -135,17 +142,11 @@ L(no_vmx): lwz r20,((JB_GPRS+6)*4)(r3) lfd fp20,((JB_FPRS+6*2)*4)(r3) #ifdef PTR_DEMANGLE -# ifdef CHECK_SP - PTR_DEMANGLE3 (r24, r24, r25) -# else +# ifndef CHECK_SP PTR_DEMANGLE3 (r1, r24, r25) # endif PTR_DEMANGLE2 (r0, r25) #endif -#ifdef CHECK_SP - CHECK_SP (r24) - mr r1,r24 -#endif mtlr r0 lwz r21,((JB_GPRS+7)*4)(r3) lfd fp21,((JB_FPRS+7*2)*4)(r3) |