svn commit: trunk/uClibc/libc/sysdeps/linux: alpha/bits arm/bits bfin/bits cris/bits etc...
vapier at uclibc.org
vapier at uclibc.org
Wed Nov 16 04:55:36 UTC 2005
Author: vapier
Date: 2005-11-15 20:55:24 -0800 (Tue, 15 Nov 2005)
New Revision: 12305
Log:
update copyright and license, add _BITS_SETJMP_H protection around the file, make sure we are only included by setjmp.h and pthread.h, and fix casting of address/jumpbugf in _JMPBUF_UNWINDS
Modified:
trunk/uClibc/libc/sysdeps/linux/alpha/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/arm/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/bfin/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/cris/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/e1/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/frv/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/h8300/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/hppa/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/i386/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/i960/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/m68k/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/microblaze/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/mips/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/nios/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/nios2/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/powerpc/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/sh/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/sh64/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/sparc/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/v850/bits/setjmp.h
trunk/uClibc/libc/sysdeps/linux/x86_64/bits/setjmp.h
Changeset:
Modified: trunk/uClibc/libc/sysdeps/linux/alpha/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/alpha/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/alpha/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -1,5 +1,5 @@
/* Define the machine-dependent type `jmp_buf'. Alpha version.
- Copyright (C) 1992, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1997, 2003 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,7 +17,10 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#ifndef _SETJMP_H
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
+
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -80,3 +83,5 @@
#define _JMPBUF_UNWINDS(_jmpbuf, _address) \
((void *)(_address) < (void *)((_jmpbuf)[JB_SP]))
#endif
+
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/arm/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/arm/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/arm/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -17,8 +17,10 @@
02111-1307 USA. */
/* Define the machine-dependent type `jmp_buf'. ARM version. */
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
-#ifndef _SETJMP_H
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -38,3 +40,5 @@
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
((void *) (address) < (void *) (jmpbuf[__JMP_BUF_SP]))
+
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/bfin/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/bfin/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/bfin/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -2,23 +2,25 @@
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 Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ 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. */
/* Define the machine-dependent type `jmp_buf'. bfin version. Lineo, Inc. 2001*/
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
-#ifndef _SETJMP_H
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -51,3 +53,5 @@
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
((void *) (address) < (void *) (jmpbuf)->__pregs[6])
+
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/cris/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/cris/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/cris/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -2,23 +2,25 @@
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 Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ 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. */
/* Define the machine-dependent type `jmp_buf'. CRIS version. */
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
-#ifndef _SETJMP_H
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -61,4 +63,4 @@
#define _JMPBUF_UNWINDS(jmpbuf, address) \
((void *) (address) < (void *) (jmpbuf)[JB_SP])
-
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/e1/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/e1/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/e1/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -3,7 +3,10 @@
* Yannis Mitsos <yannis.mitsos at gdt.gr>
*/
-#ifndef _SETJMP_H
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
+
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -16,3 +19,4 @@
unsigned long ReturnValue;
} __jmp_buf[1];
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/frv/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/frv/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/frv/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -2,23 +2,26 @@
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 Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ 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. */
/* Define the machine-dependent type `jmp_buf'. FRV version. */
-#ifndef _SETJMP_H
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
+
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -50,4 +53,6 @@
/* Test if longjmp to JMPBUF would unwind the frame
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
- ((unsigned long) (address) < (jmpbuf)->__sp)
+ ((void *) (address) < (void *) (jmpbuf)->__sp)
+
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/h8300/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/h8300/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/h8300/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -2,7 +2,10 @@
/* Copyright (C) 2004, Yoshinori Sato <ysato at users.sourceforge.jp> */
/* Define the machine-dependent type `jmp_buf'. H8/300 version. */
-#ifndef _SETJMP_H
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
+
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -25,3 +28,5 @@
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
((void *) (address) < (void *) (jmpbuf)->__regs[3])
+
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/hppa/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/hppa/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/hppa/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -17,8 +17,8 @@
02111-1307 USA. */
/* Define the machine-dependent type `jmp_buf'. HPPA version. */
-#ifndef _BITS_SETJMP_H_
-#define _BITS_SETJMP_H_
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
@@ -40,7 +40,6 @@
/* Test if longjmp to JMPBUF would unwind the frame containing a local
variable at ADDRESS. */
#define _JMPBUF_UNWINDS(_jmpbuf, _address) \
- ((void *)(_address) > (void *)(((unsigned long *) _jmpbuf)[JB_SP]))
+ ((void *)(_address) > (void *)(_jmpbuf[JB_SP]))
-#endif
-
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/i386/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/i386/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/i386/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 2000, 2001, 2003 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,8 +17,10 @@
02111-1307 USA. */
/* Define the machine-dependent type `jmp_buf'. Intel 386 version. */
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
-#ifndef _SETJMP_H
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -40,3 +42,5 @@
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
((void *) (address) < (void *) (jmpbuf)[JB_SP])
+
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/i960/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/i960/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/i960/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -1,6 +1,9 @@
/* Define the machine-dependent type `jmp_buf'. i960 version. */
-#ifndef _SETJMP_H
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
+
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -29,5 +32,7 @@
/* Test if longjmp to JMPBUF would unwind the frame
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
- ((void *) (address) < (jmpbuf)[0].__sp)
+ ((void *) (address) < (void *) (jmpbuf)[0].__sp)
#endif
+
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/m68k/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/m68k/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/m68k/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -1,8 +1,27 @@
-
/* Copyright (C) 2002, David McCullough <davidm at snapgear.com> */
-/* This file is released under the LGPL, any version you like */
+/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
-#ifndef _SETJMP_H
+ 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. */
+
+/* Define the machine-dependent type `jmp_buf'. m68k version. */
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
+
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -41,3 +60,5 @@
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
((void *) (address) < (void *) (jmpbuf)->__aregs[5])
+
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/microblaze/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/microblaze/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/microblaze/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -12,7 +12,10 @@
* Written by Miles Bader <miles at gnu.org>
*/
-#ifndef _SETJMP_H
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
+
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -35,4 +38,6 @@
/* Test if longjmp to JMPBUF would unwind the frame
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
- ((__ptr_t) (address) < &(jmpbuf)[0].__sp)
+ ((void *) (address) < (void *) &(jmpbuf)[0].__sp)
+
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/mips/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/mips/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/mips/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -17,7 +17,10 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#ifndef _SETJMP_H
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
+
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -54,4 +57,6 @@
/* Test if longjmp to JMPBUF would unwind the frame
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
- ((void *) (address) < (jmpbuf)[0].__sp)
+ ((void *) (address) < (void *) (jmpbuf)[0].__sp)
+
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/nios/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/nios/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/nios/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -2,23 +2,25 @@
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 Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ 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. */
/* Define the machine-dependent type `jmp_buf'. Nios version. */
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
-#ifndef _SETJMP_H
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -71,4 +73,4 @@
#endif /* _ASM */
-
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/nios2/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/nios2/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/nios2/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -17,7 +17,10 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#ifndef _SETJMP_H
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
+
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -65,3 +68,5 @@
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
((void *) (address) < (void*)(jmpbuf)->__sp)
+
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/powerpc/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/powerpc/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/powerpc/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 2000, 2003, 2004 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,8 +17,10 @@
02111-1307 USA. */
/* Define the machine-dependent type `jmp_buf'. PowerPC version. */
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
-#ifndef _SETJMP_H
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -27,21 +29,52 @@
assembler easier. Naturally, user code should not depend on
either representation. */
+#include <bits/wordsize.h>
+
#if defined __USE_MISC || defined _ASM
# define JB_GPR1 0 /* Also known as the stack pointer */
# define JB_GPR2 1
# define JB_LR 2 /* The address we will return to */
-# define JB_GPRS 3 /* GPRs 14 through 31 are saved, 18 in total */
-# define JB_CR 21 /* Condition code registers. */
-# define JB_FPRS 22 /* FPRs 14 through 31 are saved, 18*2 words total */
-# define JB_SIZE (58*4)
+# if __WORDSIZE == 64
+# define JB_GPRS 3 /* GPRs 14 through 31 are saved, 18*2 words total. */
+# define JB_CR 21 /* Condition code registers with the VRSAVE at */
+ /* offset 172 (low half of the double word. */
+# define JB_FPRS 22 /* FPRs 14 through 31 are saved, 18*2 words total. */
+# define JB_SIZE (64 * 8) /* As per PPC64-VMX ABI. */
+# define JB_VRSAVE 21 /* VRSAVE shares a double word with the CR at offset */
+ /* 168 (high half of the double word). */
+# define JB_VRS 40 /* VRs 20 through 31 are saved, 12*4 words total. */
+# else
+# define JB_GPRS 3 /* GPRs 14 through 31 are saved, 18 in total. */
+# define JB_CR 21 /* Condition code registers. */
+# define JB_FPRS 22 /* FPRs 14 through 31 are saved, 18*2 words total. */
+# define JB_SIZE ((64 + (12 * 4)) * 4)
+# define JB_VRSAVE 62
+# define JB_VRS 64
+# endif
#endif
+
+/* The current powerpc 32-bit Altivec ABI specifies for SVR4 ABI and EABI
+ the vrsave must be at byte 248 & v20 at byte 256. So we must pad this
+ correctly on 32 bit. It also insists that vecregs are only gauranteed
+ 4 byte alignment so we need to use vperm in the setjmp/longjmp routines.
+ We have to version the code because members like int __mask_was_saved
+ in the jmp_buf will move as jmp_buf is now larger than 248 bytes. We
+ cannot keep the altivec jmp_buf backward compatible with the jmp_buf. */
#ifndef _ASM
-typedef long int __jmp_buf[58];
+# if __WORDSIZE == 64
+typedef long int __jmp_buf[64] __attribute__ ((__aligned__ (16)));
+# else
+/* The alignment is not essential, i.e.the buffer can be copied to a 4 byte
+ aligned buffer as per the ABI it is just added for performance reasons. */
+typedef long int __jmp_buf[64 + (12 * 4)] __attribute__ ((__aligned__ (16)));
+# endif
#endif
/* Test if longjmp to JMPBUF would unwind the frame
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
((void *) (address) < (void *) (jmpbuf)[JB_GPR1])
+
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/sh/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/sh/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/sh/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -18,7 +18,7 @@
/* Define the machine-dependent type `jmp_buf'. SH 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."
@@ -53,4 +53,4 @@
#define _JMPBUF_UNWINDS(jmpbuf, address) \
((void *) (address) < (void *) &(jmpbuf)[0].__regs[7])
-#endif /* bits/setjmp.h */
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/sh64/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/sh64/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/sh64/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -2,23 +2,25 @@
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 Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ 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. */
/* Define the machine-dependent type `jmp_buf'. SH-5 version. */
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
-#ifndef _SETJMP_H
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -45,4 +47,4 @@
} __jmp_buf[1];
#endif
-
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/sparc/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/sparc/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/sparc/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997,1999,2000 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1999,2000,2003 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,8 +16,10 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
-#ifndef _SETJMP_H
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -75,6 +77,8 @@
/* Test if longjmp to JMPBUF would unwind the frame
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
- ((int) (address) < (jmpbuf)[JB_SP])
+ ((void *) (address) < (void *) (jmpbuf)[JB_SP])
#endif
+
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/v850/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/v850/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/v850/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -11,7 +11,10 @@
* Written by Miles Bader <miles at gnu.org>
*/
-#ifndef _SETJMP_H
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H 1
+
+#if !defined _SETJMP_H && !defined _PTHREAD_H
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
@@ -34,4 +37,6 @@
/* Test if longjmp to JMPBUF would unwind the frame
containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address) \
- ((__ptr_t) (address) < &(jmpbuf)[0].__sp)
+ ((void *) (address) < (void *) &(jmpbuf)[0].__sp)
+
+#endif /* bits/setjmp.h */
Modified: trunk/uClibc/libc/sysdeps/linux/x86_64/bits/setjmp.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/x86_64/bits/setjmp.h 2005-11-16 04:36:58 UTC (rev 12304)
+++ trunk/uClibc/libc/sysdeps/linux/x86_64/bits/setjmp.h 2005-11-16 04:55:24 UTC (rev 12305)
@@ -18,7 +18,7 @@
/* Define the machine-dependent type `jmp_buf'. x86-64 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."
@@ -75,4 +75,4 @@
# endif
#endif
-#endif /* bits/setjmp.h */
+#endif /* bits/setjmp.h */
More information about the uClibc-cvs
mailing list