aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/powerpc
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2009-08-22 02:01:51 -0700
committerUlrich Drepper <drepper@redhat.com>2009-08-22 02:01:51 -0700
commit15efafdf07789322219cc8f938ac758f932fe208 (patch)
tree30e249a3b3fed95c18c78e7bffb260d361f9abb6 /sysdeps/powerpc
parent464dc022eb0be4950e2f3a90fe4de6a17dc3d7d7 (diff)
downloadglibc-15efafdf07789322219cc8f938ac758f932fe208.zip
glibc-15efafdf07789322219cc8f938ac758f932fe208.tar.gz
glibc-15efafdf07789322219cc8f938ac758f932fe208.tar.bz2
Add sigstack handling to Linux ____longjmp_chk on powerpc.
Diffstat (limited to 'sysdeps/powerpc')
-rw-r--r--sysdeps/powerpc/powerpc32/____longjmp_chk.S56
-rw-r--r--sysdeps/powerpc/powerpc32/__longjmp-common.S15
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S15
-rw-r--r--sysdeps/powerpc/powerpc64/____longjmp_chk.S39
4 files changed, 16 insertions, 109 deletions
diff --git a/sysdeps/powerpc/powerpc32/____longjmp_chk.S b/sysdeps/powerpc/powerpc32/____longjmp_chk.S
deleted file mode 100644
index 510ce52..0000000
--- a/sysdeps/powerpc/powerpc32/____longjmp_chk.S
+++ /dev/null
@@ -1,56 +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; \
- LOAD_ARG; \
- bl HIDDEN_JUMPTARGET (__fortify_fail); \
-.Lok:
-
-#include <__longjmp-common.S>
diff --git a/sysdeps/powerpc/powerpc32/__longjmp-common.S b/sysdeps/powerpc/powerpc32/__longjmp-common.S
index 7b1c017..955161e 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 f105815..04ed6da 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)
diff --git a/sysdeps/powerpc/powerpc64/____longjmp_chk.S b/sysdeps/powerpc/powerpc64/____longjmp_chk.S
deleted file mode 100644
index 5654902..0000000
--- a/sysdeps/powerpc/powerpc64/____longjmp_chk.S
+++ /dev/null
@@ -1,39 +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"
- .section .toc,"aw"
-.LC1:
- .tc .LC0[TC],.LC0
- .text
-
-#define __longjmp ____longjmp_chk
-
-#define CHECK_SP(reg) \
- cmpld reg, r1; \
- bge+ .Lok; \
- ld r3,.LC1@toc(2); \
- bl HIDDEN_JUMPTARGET (__fortify_fail); \
-.Lok:
-
-#include <__longjmp-common.S>