OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2006-01-12 Roland McGrath <roland@redhat.com>

Browse Source 
* sysdeps/alpha/__longjmp.S: Include <jmpbuf-offsets.h>
	instead of <bits/setjmp.h>.
	* sysdeps/alpha/setjmp.S: Likewise.
	* sysdeps/i386/__longjmp.S: Likewise.
	* sysdeps/i386/bsd-_setjmp.S: Likewise.
	* sysdeps/i386/bsd-setjmp.S: Likewise.
	* sysdeps/i386/setjmp.S: Likewise.
	* sysdeps/powerpc/powerpc32/__longjmp-common.S: Likewise.
	* sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S: Likewise.
	* sysdeps/powerpc/powerpc32/fpu/setjmp-common.S:
	* sysdeps/powerpc/powerpc32/setjmp-common.S: Likewise.
	* sysdeps/powerpc/powerpc64/__longjmp-common.S: Likewise.
	* sysdeps/powerpc/powerpc64/setjmp-common.S: Likewise.
	* sysdeps/sh/sh3/setjmp.S: Likewise.
	* sysdeps/sh/sh4/setjmp.S: Likewise.
	* sysdeps/sparc/sparc32/__longjmp.S: Likewise.
	* sysdeps/sparc/sparc32/setjmp.S: Likewise.
	* sysdeps/x86_64/__longjmp.S: Likewise.
	* sysdeps/x86_64/setjmp.S: Likewise.
	* sysdeps/mach/hurd/i386/longjmp-ts.c: Include <jmpbuf-offsets.h>.
	* sysdeps/mach/hurd/powerpc/longjmp-ts.c: Likewise.
	* sysdeps/mach/hurd/alpha/longjmp-ts.c: Likewise.
	* sysdeps/alpha/jmpbuf-unwind.h: Likewise.
	* sysdeps/hppa/jmpbuf-unwind.h: Likewise.
	* sysdeps/i386/jmpbuf-unwind.h: Likewise.
	* sysdeps/powerpc/jmpbuf-unwind.h: Likewise.
	* sysdeps/sparc/sparc32/jmpbuf-unwind.h: Likewise.
	* sysdeps/sparc/sparc64/jmpbuf-unwind.h: Likewise.
	* sysdeps/x86_64/jmpbuf-unwind.h: Likewise.
	* setjmp/jmpbuf-offsets.h: File removed.
	* include/bits/setjmp.h: File removed.
This commit is contained in:
Roland McGrath 2006-01-12 09:27:47 +00:00
parent bb10459f2d
commit a7140723f8
30 changed files with 48 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/bits/setjmp.h
View File

@ -1,7 +0,0 @@
/* For internal uses, get the public <bits/setjmp.h> definitions
plus the JB_* macros from the private header <jmpbuf-offsets.h>. */
#include_next <bits/setjmp.h>
#ifndef _ISOMAC
# include <jmpbuf-offsets.h>
#endif

4
setjmp/jmpbuf-offsets.h
View File

@ -1,4 +0,0 @@
/* Private macros for accessing __jmp_buf contents. Stub version.
This file can define macros such as JB_* used by code inside libc
to access __jmp_buf contents. */

6
sysdeps/alpha/__longjmp.S
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1992, 1994, 1997 Free Software Foundation, Inc. /* Copyright (C) 1992, 1994, 1997, 2006 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
@ -19,9 +19,7 @@
#define __ASSEMBLY__ #define __ASSEMBLY__
#include <sysdep.h> #include <sysdep.h>
#define _ASM #include <jmpbuf-offsets.h>
#define _SETJMP_H
#include <bits/setjmp.h>
ENTRY(__longjmp) ENTRY(__longjmp)

1
sysdeps/alpha/jmpbuf-unwind.h
View File

@ -18,6 +18,7 @@
02111-1307 USA. */ 02111-1307 USA. */
#include <setjmp.h> #include <setjmp.h>
#include <jmpbuf-offsets.h>
#include <stdint.h> #include <stdint.h>
#include <unwind.h> #include <unwind.h>
#include <sysdep.h> #include <sysdep.h>

6
sysdeps/alpha/setjmp.S
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1992, 1994, 1996, 1997, 2002 Free Software Foundation, Inc. /* Copyright (C) 1992,1994,1996,1997,2002,2006 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
@ -19,9 +19,7 @@
#define __ASSEMBLY__ #define __ASSEMBLY__
#include <sysdep.h> #include <sysdep.h>
#define _ASM #include <jmpbuf-offsets.h>
#define _SETJMP_H
#include <bits/setjmp.h>
.ent __sigsetjmp .ent __sigsetjmp
.global __sigsetjmp .global __sigsetjmp

1
sysdeps/hppa/jmpbuf-unwind.h
View File

@ -18,6 +18,7 @@
02111-1307 USA. */ 02111-1307 USA. */
#include <setjmp.h> #include <setjmp.h>
#include <jmpbuf-offsets.h>
/* Test if longjmp to JMPBUF would unwind the frame containing a local /* Test if longjmp to JMPBUF would unwind the frame containing a local
variable at ADDRESS. */ variable at ADDRESS. */

6
sysdeps/i386/__longjmp.S
View File

@ -1,5 +1,5 @@
/* longjmp for i386. /* longjmp for i386.
Copyright (C) 1995-1998,2000,2002,2005 Free Software Foundation, Inc. Copyright (C) 1995-1998,2000,2002,2005, 2006 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
@ -18,9 +18,7 @@
02111-1307 USA. */ 02111-1307 USA. */
#include <sysdep.h> #include <sysdep.h>
#define _ASM #include <jmpbuf-offsets.h>
#define _SETJMP_H
#include <bits/setjmp.h>
#include <asm-syntax.h> #include <asm-syntax.h>
#include <bp-sym.h> #include <bp-sym.h>
#include <bp-asm.h> #include <bp-asm.h>

6
sysdeps/i386/bsd-_setjmp.S
View File

@ -1,5 +1,5 @@
/* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'. i386 version. /* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'. i386 version.
Copyright (C) 1994-1997,2000-2002,2005 Free Software Foundation, Inc. Copyright (C) 1994-1997,2000-2002,2005, 2006 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
@ -22,9 +22,7 @@
in setjmp doesn't clobber the state restored by longjmp. */ in setjmp doesn't clobber the state restored by longjmp. */
#include <sysdep.h> #include <sysdep.h>
#define _ASM #include <jmpbuf-offsets.h>
#define _SETJMP_H
#include <bits/setjmp.h>
#include "bp-sym.h" #include "bp-sym.h"
#include "bp-asm.h" #include "bp-asm.h"

6
sysdeps/i386/bsd-setjmp.S
View File

@ -1,5 +1,5 @@
/* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. i386 version. /* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. i386 version.
Copyright (C) 1994-1997,2000,2001,2005 Free Software Foundation, Inc. Copyright (C) 1994-1997,2000,2001,2005, 2006 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
@ -22,9 +22,7 @@
in setjmp doesn't clobber the state restored by longjmp. */ in setjmp doesn't clobber the state restored by longjmp. */
#include <sysdep.h> #include <sysdep.h>
#define _ASM #include <jmpbuf-offsets.h>
#define _SETJMP_H
#include <bits/setjmp.h>
#include "bp-sym.h" #include "bp-sym.h"
#include "bp-asm.h" #include "bp-asm.h"

1
sysdeps/i386/jmpbuf-unwind.h
View File

@ -18,6 +18,7 @@
02111-1307 USA. */ 02111-1307 USA. */
#include <setjmp.h> #include <setjmp.h>
#include <jmpbuf-offsets.h>
#include <stdint.h> #include <stdint.h>
#include <unwind.h> #include <unwind.h>
#include <sysdep.h> #include <sysdep.h>

7
sysdeps/i386/setjmp.S
View File

@ -1,5 +1,6 @@
/* setjmp for i386. /* setjmp for i386.
Copyright (C) 1995,1996,1997,2000,2001,2005 Free Software Foundation, Inc. Copyright (C) 1995,1996,1997,2000,2001,2005,2006
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
@ -18,9 +19,7 @@
02111-1307 USA. */ 02111-1307 USA. */
#include <sysdep.h> #include <sysdep.h>
#define _ASM #include <jmpbuf-offsets.h>
#define _SETJMP_H
#include <bits/setjmp.h>
#include <asm-syntax.h> #include <asm-syntax.h>
#include "bp-sym.h" #include "bp-sym.h"
#include "bp-asm.h" #include "bp-asm.h"

3
sysdeps/mach/hurd/alpha/longjmp-ts.c
View File

@ -1,5 +1,5 @@
/* Perform a `longjmp' on a Mach thread_state. Alpha version. /* Perform a `longjmp' on a Mach thread_state. Alpha version.
Copyright (C) 2002 Free Software Foundation, Inc. Copyright (C) 2002, 2006 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
@ -19,6 +19,7 @@
#include <hurd/signal.h> #include <hurd/signal.h>
#include <setjmp.h> #include <setjmp.h>
#include <jmpbuf-offsets.h>
#include <mach/thread_status.h> #include <mach/thread_status.h>

3
sysdeps/mach/hurd/i386/longjmp-ts.c
View File

@ -1,5 +1,5 @@
/* Perform a `longjmp' on a Mach thread_state. i386 version. /* Perform a `longjmp' on a Mach thread_state. i386 version.
Copyright (C) 1991, 1994, 1995, 1997 Free Software Foundation, Inc. Copyright (C) 1991, 1994, 1995, 1997, 2006 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
@ -19,6 +19,7 @@
#include <hurd/signal.h> #include <hurd/signal.h>
#include <setjmp.h> #include <setjmp.h>
#include <jmpbuf-offsets.h>
#include <mach/thread_status.h> #include <mach/thread_status.h>

3
sysdeps/mach/hurd/powerpc/longjmp-ts.c
View File

@ -1,5 +1,5 @@
/* Perform a `longjmp' on a Mach thread_state. PowerPC version. /* Perform a `longjmp' on a Mach thread_state. PowerPC version.
Copyright (C) 1991,94,95,97,2001 Free Software Foundation, Inc. Copyright (C) 1991,94,95,97,2001, 2006 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
@ -19,6 +19,7 @@
#include <hurd/signal.h> #include <hurd/signal.h>
#include <setjmp.h> #include <setjmp.h>
#include <jmpbuf-offsets.h>
#include <mach/thread_status.h> #include <mach/thread_status.h>

1
sysdeps/powerpc/jmpbuf-unwind.h
View File

@ -18,6 +18,7 @@
02111-1307 USA. */ 02111-1307 USA. */
#include <setjmp.h> #include <setjmp.h>
#include <jmpbuf-offsets.h>
#include <stdint.h> #include <stdint.h>
#include <unwind.h> #include <unwind.h>
#include <sysdep.h> #include <sysdep.h>

7
sysdeps/powerpc/powerpc32/__longjmp-common.S
View File

@ -1,6 +1,6 @@
/* longjmp for PowerPC. /* longjmp for PowerPC.
Copyright (C) 1995-1997, 1999-2001, 2003, 2004, 2005 Copyright (C) 1995-1997, 1999-2001, 2003, 2004, 2005, 2006
Free Software Foundation, Inc. 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
@ -20,11 +20,10 @@
#include <sysdep.h> #include <sysdep.h>
#define _ASM #define _ASM
#define _SETJMP_H
#ifdef __NO_VMX__ #ifdef __NO_VMX__
# include <novmxsetjmp.h> # include <novmxsetjmp.h>
#else #else
# include <bits/setjmp.h> # include <jmpbuf-offsets.h>
#endif #endif
#include <bp-sym.h> #include <bp-sym.h>
#include <bp-asm.h> #include <bp-asm.h>

3
sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
View File

@ -19,11 +19,10 @@
#include <sysdep.h> #include <sysdep.h>
#define _ASM #define _ASM
#define _SETJMP_H
#ifdef __NO_VMX__ #ifdef __NO_VMX__
# include <novmxsetjmp.h> # include <novmxsetjmp.h>
#else #else
# include <bits/setjmp.h> # include <jmpbuf-offsets.h>
#endif #endif
#include <bp-sym.h> #include <bp-sym.h>
#include <bp-asm.h> #include <bp-asm.h>

3
sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
View File

@ -19,11 +19,10 @@
#include <sysdep.h> #include <sysdep.h>
#define _ASM #define _ASM
#define _SETJMP_H
#ifdef __NO_VMX__ #ifdef __NO_VMX__
# include <novmxsetjmp.h> # include <novmxsetjmp.h>
#else #else
# include <bits/setjmp.h> # include <jmpbuf-offsets.h>
#endif #endif
#include <bp-sym.h> #include <bp-sym.h>
#include <bp-asm.h> #include <bp-asm.h>

5
sysdeps/powerpc/powerpc32/setjmp-common.S
View File

@ -1,5 +1,5 @@
/* setjmp for PowerPC. /* setjmp for PowerPC.
Copyright (C) 1995-1997,1999-2001,2003,2004,2005 Copyright (C) 1995-1997,1999-2001,2003,2004,2005, 2006
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -20,11 +20,10 @@
#include <sysdep.h> #include <sysdep.h>
#define _ASM #define _ASM
#define _SETJMP_H
#ifdef __NO_VMX__ #ifdef __NO_VMX__
# include <novmxsetjmp.h> # include <novmxsetjmp.h>
#else #else
# include <bits/setjmp.h> # include <jmpbuf-offsets.h>
#endif #endif
#include <bp-sym.h> #include <bp-sym.h>
#include <bp-asm.h> #include <bp-asm.h>

6
sysdeps/powerpc/powerpc64/__longjmp-common.S
View File

@ -1,6 +1,6 @@
/* longjmp for PowerPC64. /* longjmp for PowerPC64.
Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Copyright (C) 1995, 1996,1997,1999,2000,2001,2002,2003,2004,2005,2006
Free Software Foundation, Inc. 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
@ -24,7 +24,7 @@
#ifdef __NO_VMX__ #ifdef __NO_VMX__
# include <novmxsetjmp.h> # include <novmxsetjmp.h>
#else #else
# include <bits/setjmp.h> # include <jmpbuf-offsets.h>
#endif #endif
#include <bp-sym.h> #include <bp-sym.h>
#include <bp-asm.h> #include <bp-asm.h>

5
sysdeps/powerpc/powerpc64/setjmp-common.S
View File

@ -1,5 +1,5 @@
/* setjmp for PowerPC64. /* setjmp for PowerPC64.
Copyright (C) 1995-2003, 2004, 2005 Free Software Foundation, Inc. Copyright (C) 1995-2003, 2004, 2005, 2006 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
@ -19,11 +19,10 @@
#include <sysdep.h> #include <sysdep.h>
#define _ASM #define _ASM
#define _SETJMP_H
#ifdef __NO_VMX__ #ifdef __NO_VMX__
#include <novmxsetjmp.h> #include <novmxsetjmp.h>
#else #else
#include <bits/setjmp.h> #include <jmpbuf-offsets.h>
#endif #endif
#include <bp-sym.h> #include <bp-sym.h>
#include <bp-asm.h> #include <bp-asm.h>

6
sysdeps/sh/sh3/setjmp.S
View File

@ -1,5 +1,5 @@
/* setjmp for SH3. /* setjmp for SH3.
Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc. Copyright (C) 1999, 2000, 2005, 2006 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
@ -18,9 +18,7 @@
02111-1307 USA. */ 02111-1307 USA. */
#include <sysdep.h> #include <sysdep.h>
#define _SETJMP_H #include <jmpbuf-offsets.h>
#define _ASM
#include <bits/setjmp.h>
ENTRY (__sigsetjmp) ENTRY (__sigsetjmp)
/* Save registers */ /* Save registers */

6
sysdeps/sh/sh4/setjmp.S
View File

@ -1,5 +1,5 @@
/* setjmp for SH4. /* setjmp for SH4.
Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc. Copyright (C) 1999, 2000, 2005, 2006 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
@ -18,9 +18,7 @@
02111-1307 USA. */ 02111-1307 USA. */
#include <sysdep.h> #include <sysdep.h>
#define _SETJMP_H #include <jmpbuf-offsets.h>
#define _ASM
#include <bits/setjmp.h>
ENTRY (__sigsetjmp) ENTRY (__sigsetjmp)
/* Save registers */ /* Save registers */

4
sysdeps/sparc/sparc32/__longjmp.S
View File

@ -19,9 +19,7 @@
#include <sysdep.h> #include <sysdep.h>
#define _ASM 1 #include <jmpbuf-offsets.h>
#define _SETJMP_H
#include <bits/setjmp.h>
#define ENV(base,reg) [%base + (reg * 4)] #define ENV(base,reg) [%base + (reg * 4)]
#define ST_FLUSH_WINDOWS 3 #define ST_FLUSH_WINDOWS 3
#define RW_FP [%fp + 0x48] #define RW_FP [%fp + 0x48]

1
sysdeps/sparc/sparc32/jmpbuf-unwind.h
View File

@ -18,6 +18,7 @@
02111-1307 USA. */ 02111-1307 USA. */
#include <setjmp.h> #include <setjmp.h>
#include <jmpbuf-offsets.h>
#include <stdint.h> #include <stdint.h>
#include <unwind.h> #include <unwind.h>
#include <sysdep.h> #include <sysdep.h>

4
sysdeps/sparc/sparc32/setjmp.S
View File

@ -20,9 +20,7 @@
#include <sysdep.h> #include <sysdep.h>
#include <sys/trap.h> #include <sys/trap.h>
#define _ASM 1 #include <jmpbuf-offsets.h>
#define _SETJMP_H
#include <bits/setjmp.h>
ENTRY(_setjmp) ENTRY(_setjmp)
b 1f b 1f

1
sysdeps/sparc/sparc64/jmpbuf-unwind.h
View File

@ -18,6 +18,7 @@
02111-1307 USA. */ 02111-1307 USA. */
#include <setjmp.h> #include <setjmp.h>
#include <jmpbuf-offsets.h>
#include <stdint.h> #include <stdint.h>
#include <unwind.h> #include <unwind.h>

6
sysdeps/x86_64/__longjmp.S
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc. /* Copyright (C) 2001,2004,2005,2006 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
@ -17,9 +17,7 @@
02111-1307 USA. */ 02111-1307 USA. */
#include <sysdep.h> #include <sysdep.h>
#define _ASM #include <jmpbuf-offsets.h>
#define _SETJMP_H
#include <bits/setjmp.h>
#include <asm-syntax.h> #include <asm-syntax.h>
/* Jump to the position specified by ENV, causing the /* Jump to the position specified by ENV, causing the

1
sysdeps/x86_64/jmpbuf-unwind.h
View File

@ -18,6 +18,7 @@
02111-1307 USA. */ 02111-1307 USA. */
#include <setjmp.h> #include <setjmp.h>
#include <jmpbuf-offsets.h>
#include <stdint.h> #include <stdint.h>
#include <unwind.h> #include <unwind.h>
#include <sysdep.h> #include <sysdep.h>

6
sysdeps/x86_64/setjmp.S
View File

@ -1,5 +1,5 @@
/* setjmp for x86-64. /* setjmp for x86-64.
Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. Copyright (C) 2001, 2003, 2005, 2006 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
@ -18,9 +18,7 @@
02111-1307 USA. */ 02111-1307 USA. */
#include <sysdep.h> #include <sysdep.h>
#define _ASM #include <jmpbuf-offsets.h>
#define _SETJMP_H
#include <bits/setjmp.h>
#include <asm-syntax.h> #include <asm-syntax.h>
ENTRY (__sigsetjmp) ENTRY (__sigsetjmp)