diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-13 21:43:14 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-15 14:00:23 +0200 |
| commit | c53099f7dfa350391785fc3ded1e9d077f45417f (patch) | |
| tree | f6bb2ad75b1e101fd228a0e81c695beb5b346b84 /libc/sysdeps/linux/arm | |
| parent | 14647468df0b45ecf15223ee6a14ae50304b1f11 (diff) | |
cleanup bits/setjmp.h of stuff moved to jmpbuf-offsets.h and jmpbuf-unwind.h
Make sure we use the new jmpbuf-*.h headers
While there, adapt the offset on microblaze and the _JMPBUF_UNWINDS macro on bfin,
it seems, these were changed in the meantime.
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libc/sysdeps/linux/arm')
| -rw-r--r-- | libc/sysdeps/linux/arm/bits/setjmp.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/libc/sysdeps/linux/arm/bits/setjmp.h b/libc/sysdeps/linux/arm/bits/setjmp.h index ac52f1281..84e0e6207 100644 --- a/libc/sysdeps/linux/arm/bits/setjmp.h +++ b/libc/sysdeps/linux/arm/bits/setjmp.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997,1998,2005,2006 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 @@ -17,14 +17,14 @@ 02111-1307 USA. */ /* Define the machine-dependent type `jmp_buf'. ARM version. */ + #ifndef _BITS_SETJMP_H -#define _BITS_SETJMP_H 1 +#define _BITS_SETJMP_H 1 #if !defined _SETJMP_H && !defined _PTHREAD_H # error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead." #endif -#ifndef _ASM /* Jump buffer contains v1-v6, sl, fp, sp and pc. Other registers are not saved. */ #ifdef __ARM_EABI__ @@ -38,15 +38,10 @@ typedef int __jmp_buf[64] __attribute__((aligned (8))); #elif defined __MAVERICK__ || defined __IWMMXT__ typedef int __jmp_buf[34]; #else +# ifdef __UCLIBC_HAS_FPU__ typedef int __jmp_buf[22]; +# else +typedef int __jmp_buf[10]; +# endif #endif #endif - -#define __JMP_BUF_SP 8 - -/* Test if longjmp to JMPBUF would unwind the frame - containing a local variable at ADDRESS. */ -#define _JMPBUF_UNWINDS(jmpbuf, address) \ - ((void *) (address) < (void *) (jmpbuf[__JMP_BUF_SP])) - -#endif /* bits/setjmp.h */ |