mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-10 19:30:10 +00:00
____longjmp_chk for ARM.
* sysdeps/arm/____longjmp_chk.S: New file. * sysdeps/arm/__longjmp.S: If CHECK_SP is defined, use it. * sysdeps/arm/eabi/__longjmp.S: Likewise.
This commit is contained in:
parent
d9056ac655
commit
ef889ffe8d
@ -1,3 +1,9 @@
|
|||||||
|
2009-05-16 Joseph Myers <joseph@codesourcery.com>
|
||||||
|
|
||||||
|
* sysdeps/arm/____longjmp_chk.S: New file.
|
||||||
|
* sysdeps/arm/__longjmp.S: If CHECK_SP is defined, use it.
|
||||||
|
* sysdeps/arm/eabi/__longjmp.S: Likewise.
|
||||||
|
|
||||||
2009-05-16 Joseph Myers <joseph@codesourcery.com>
|
2009-05-16 Joseph Myers <joseph@codesourcery.com>
|
||||||
|
|
||||||
* sysdeps/unix/sysv/linux/arm/kernel-features.h (__ASSUME_PREADV,
|
* sysdeps/unix/sysv/linux/arm/kernel-features.h (__ASSUME_PREADV,
|
||||||
|
55
sysdeps/arm/____longjmp_chk.S
Normal file
55
sysdeps/arm/____longjmp_chk.S
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
/* 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 General Public License
|
||||||
|
along with GCC; see the file COPYING. If not, write to the Free
|
||||||
|
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
|
||||||
|
02110-1301, USA. */
|
||||||
|
|
||||||
|
|
||||||
|
.section .rodata.str1.1,"aMS",%progbits,1
|
||||||
|
.type longjmp_msg,%object
|
||||||
|
longjmp_msg:
|
||||||
|
.string "longjmp causes uninitialized stack frame"
|
||||||
|
.size longjmp_msg, .-longjmp_msg
|
||||||
|
.text
|
||||||
|
|
||||||
|
#define __longjmp ____longjmp_chk
|
||||||
|
|
||||||
|
#ifdef PIC
|
||||||
|
# define CALL_FAIL \
|
||||||
|
ldr sl, .L_GOT; \
|
||||||
|
.L_GOT_OFF: \
|
||||||
|
add sl, pc, sl; \
|
||||||
|
ldr r0, .Lstr; \
|
||||||
|
add r0, sl, r0; \
|
||||||
|
B PLTJMP(HIDDEN_JUMPTARGET(__fortify_fail)); \
|
||||||
|
.L_GOT: \
|
||||||
|
.word _GLOBAL_OFFSET_TABLE_-(.L_GOT_OFF+8); \
|
||||||
|
.Lstr: \
|
||||||
|
.word longjmp_msg(GOTOFF);
|
||||||
|
#else
|
||||||
|
# define CALL_FAIL \
|
||||||
|
ldr r0, .Lstr; \
|
||||||
|
B HIDDEN_JUMPTARGET(__fortify_fail); \
|
||||||
|
.Lstr: \
|
||||||
|
.word longjmp_msg;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define CHECK_SP(reg) \
|
||||||
|
cmp sp, reg; \
|
||||||
|
ble .Lok; \
|
||||||
|
CALL_FAIL \
|
||||||
|
.Lok:
|
||||||
|
|
||||||
|
#include <__longjmp.S>
|
@ -1,5 +1,5 @@
|
|||||||
/* longjmp for ARM.
|
/* longjmp for ARM.
|
||||||
Copyright (C) 1997, 1998 Free Software Foundation, Inc.
|
Copyright (C) 1997, 1998, 2009 Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
The GNU C Library is free software; you can redistribute it and/or
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
@ -29,5 +29,9 @@ ENTRY (__longjmp)
|
|||||||
movs r0, r1 /* get the return value in place */
|
movs r0, r1 /* get the return value in place */
|
||||||
moveq r0, #1 /* can't let setjmp() return zero! */
|
moveq r0, #1 /* can't let setjmp() return zero! */
|
||||||
|
|
||||||
|
#ifdef CHECK_SP
|
||||||
|
ldr r1, [ip, #32]
|
||||||
|
CHECK_SP (r1)
|
||||||
|
#endif
|
||||||
LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
|
LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
|
||||||
END (__longjmp)
|
END (__longjmp)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* longjmp for ARM.
|
/* longjmp for ARM.
|
||||||
Copyright (C) 1997, 1998, 2005, 2006 Free Software Foundation, Inc.
|
Copyright (C) 1997, 1998, 2005, 2006, 2009 Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
The GNU C Library is free software; you can redistribute it and/or
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
@ -30,6 +30,10 @@ ENTRY (__longjmp)
|
|||||||
movs r0, r1 /* get the return value in place */
|
movs r0, r1 /* get the return value in place */
|
||||||
moveq r0, #1 /* can't let setjmp() return zero! */
|
moveq r0, #1 /* can't let setjmp() return zero! */
|
||||||
|
|
||||||
|
#ifdef CHECK_SP
|
||||||
|
ldr r1, [ip, #32]
|
||||||
|
CHECK_SP (r1)
|
||||||
|
#endif
|
||||||
LOADREGS(ia, ip!, {v1-v6, sl, fp, sp, lr})
|
LOADREGS(ia, ip!, {v1-v6, sl, fp, sp, lr})
|
||||||
|
|
||||||
#ifdef IS_IN_rtld
|
#ifdef IS_IN_rtld
|
||||||
|
Loading…
Reference in New Issue
Block a user