From: Roland McGrath Date: Wed, 28 Dec 2005 05:46:19 +0000 (+0000) Subject: 2005-12-27 Roland McGrath X-Git-Tag: glibc-2.16-ports-merge^2~977 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5263067562a004273a7349532cf490dd2b2802c;p=platform%2Fupstream%2Fglibc.git 2005-12-27 Roland McGrath * sysdeps/arm/eabi/bits/setjmp.h (_JMPBUF_UNWINDS): Take third argument DEMANGLE, and pass SP value through it. * sysdeps/arm/bits/setjmp.h (_JMPBUF_UNWINDS): Likewise. * sysdeps/arm/fpu/bits/setjmp.h (_JMPBUF_UNWINDS): Likewise. --- diff --git a/sysdeps/arm/bits/setjmp.h b/sysdeps/arm/bits/setjmp.h index 9b74906..4eb237a 100644 --- a/sysdeps/arm/bits/setjmp.h +++ b/sysdeps/arm/bits/setjmp.h @@ -35,7 +35,7 @@ typedef int __jmp_buf[10]; /* 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])) +#define _JMPBUF_UNWINDS(jmpbuf, address, demangle) \ + ((void *) (address) < (void *) demangle (jmpbuf[__JMP_BUF_SP])) #endif diff --git a/sysdeps/arm/eabi/bits/setjmp.h b/sysdeps/arm/eabi/bits/setjmp.h index 3bb92dd..458e47f 100644 --- a/sysdeps/arm/eabi/bits/setjmp.h +++ b/sysdeps/arm/eabi/bits/setjmp.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 Free Software Foundation, Inc. +/* Copyright (C) 2004, 2005 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 @@ -39,7 +39,7 @@ typedef int __jmp_buf[64] __attribute__((aligned (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])) +#define _JMPBUF_UNWINDS(jmpbuf, address, demangle) \ + ((void *) (address) < (void *) demangle (jmpbuf[__JMP_BUF_SP])) #endif diff --git a/sysdeps/arm/fpu/bits/setjmp.h b/sysdeps/arm/fpu/bits/setjmp.h index 0a19d2c..1adf94e 100644 --- a/sysdeps/arm/fpu/bits/setjmp.h +++ b/sysdeps/arm/fpu/bits/setjmp.h @@ -35,7 +35,7 @@ typedef int __jmp_buf[22]; /* 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])) +#define _JMPBUF_UNWINDS(jmpbuf, address, demangle) \ + ((void *) (address) < (void *) demangle (jmpbuf[__JMP_BUF_SP])) #endif