mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 03:10:05 +00:00
ARM: Consolidate setjmp details in include/bits/setjmp.h file.
This commit is contained in:
parent
38435a9aff
commit
7f86996afc
@ -1,5 +1,13 @@
|
||||
2013-03-11 Roland McGrath <roland@hack.frob.com>
|
||||
|
||||
* sysdeps/arm/bits/setjmp.h: Test [!__ASSEMBLER__] rather than [!_ASM].
|
||||
* sysdeps/arm/jmpbuf-offsets.h: File removed.
|
||||
* sysdeps/arm/jmpbuf-unwind.h: Don't #include it.
|
||||
* sysdeps/arm/include/bits/setjmp.h: New file.
|
||||
* sysdeps/arm/setjmp.S (_SETJMP_H, _ASM): Macros removed.
|
||||
Use JMP_BUF_REGLIST macro.
|
||||
* sysdeps/arm/__longjmp.S: Likewise.
|
||||
|
||||
* sysdeps/arm/memcpy.S: Convert to unified assembly syntax.
|
||||
* sysdeps/arm/memmove.S: Likewise.
|
||||
* sysdeps/arm/memset.S: Likewise.
|
||||
|
@ -19,8 +19,6 @@
|
||||
/* ??? Needs more rearrangement for the LDM to handle thumb mode. */
|
||||
#define NO_THUMB
|
||||
#include <sysdep.h>
|
||||
#define _SETJMP_H
|
||||
#define _ASM
|
||||
#include <bits/setjmp.h>
|
||||
#include <rtld-global-offsets.h>
|
||||
#include <arm-features.h>
|
||||
@ -37,7 +35,7 @@ ENTRY (__longjmp)
|
||||
cfi_undefined (r4)
|
||||
CHECK_SP (r4)
|
||||
#endif
|
||||
ldmia ip!, {v1-v6, sl, fp, sp, lr}
|
||||
ldmia ip!, JMP_BUF_REGLIST
|
||||
cfi_restore (v1)
|
||||
cfi_restore (v2)
|
||||
cfi_restore (v3)
|
||||
|
@ -24,7 +24,7 @@
|
||||
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
|
||||
#endif
|
||||
|
||||
#ifndef _ASM
|
||||
#ifndef __ASSEMBLER__
|
||||
/* The exact set of registers saved may depend on the particular core
|
||||
in use, as some coprocessor registers may need to be saved. The C
|
||||
Library ABI requires that the buffer be 8-byte aligned, and
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* Private macros for accessing __jmp_buf contents. ARM EABI version.
|
||||
Copyright (C) 2007-2013 Free Software Foundation, Inc.
|
||||
/* Private jmp_buf-related definitions. ARM EABI version.
|
||||
Copyright (C) 2013 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
|
||||
@ -16,4 +16,19 @@
|
||||
License along with the GNU C Library. If not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#ifndef _INCLUDE_BITS_SETJMP_H
|
||||
#define _INCLUDE_BITS_SETJMP_H 1
|
||||
|
||||
#ifndef __ASSEMBLER__
|
||||
/* Get the public declarations. */
|
||||
# include <sysdeps/arm/bits/setjmp.h>
|
||||
#endif
|
||||
|
||||
/* Register list for a ldm/stm instruction to load/store
|
||||
the general registers from a __jmp_buf. */
|
||||
#define JMP_BUF_REGLIST {v1-v6, sl, fp, sp, lr}
|
||||
|
||||
/* Index of __jmp_buf where the sp register resides. */
|
||||
#define __JMP_BUF_SP 8
|
||||
|
||||
#endif /* include/bits/setjmp.h */
|
@ -16,7 +16,6 @@
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <setjmp.h>
|
||||
#include <jmpbuf-offsets.h>
|
||||
#include <stdint.h>
|
||||
#include <unwind.h>
|
||||
|
||||
|
@ -19,8 +19,6 @@
|
||||
/* ??? Needs more rearrangement for the STM to handle thumb mode. */
|
||||
#define NO_THUMB
|
||||
#include <sysdep.h>
|
||||
#define _SETJMP_H
|
||||
#define _ASM
|
||||
#include <bits/setjmp.h>
|
||||
#include <rtld-global-offsets.h>
|
||||
#include <arm-features.h>
|
||||
@ -29,7 +27,7 @@ ENTRY (__sigsetjmp)
|
||||
mov ip, r0
|
||||
|
||||
/* Save registers */
|
||||
stmia ip!, {v1-v6, sl, fp, sp, lr}
|
||||
stmia ip!, JMP_BUF_REGLIST
|
||||
|
||||
#if !defined ARM_ASSUME_NO_IWMMXT || defined __SOFTFP__
|
||||
# define NEED_HWCAP 1
|
||||
|
Loading…
Reference in New Issue
Block a user