From ec3d8ea6c120ac67661f3a7c27b8bb49919c7c54 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 10 Jan 2006 10:18:16 +0000 Subject: [PATCH] 2006-01-10 Roland McGrath * include/bits/setjmp.h: New file. * setjmp/jmpbuf-offsets.h: New file. * sysdeps/alpha/bits/setjmp.h: Move JB_* macros ... * sysdeps/alpha/jmpbuf-offsets.h: ... here, new file. * sysdeps/hppa/bits/setjmp.h (JB_SP): Macro moved ... * sysdeps/hppa/jmpbuf-offsets.h: ... here, new file. * sysdeps/i386/bits/setjmp.h: Move JB_* macros ... * sysdeps/i386/jmpbuf-offsets.h: ... here, new file. * sysdeps/mips/bits/setjmp.h (JB_PC): Macro removed. * sysdeps/powerpc/bits/setjmp.h: Move JB_* macros ... * sysdeps/powerpc/jmpbuf-offsets.h: ... here, new file. * sysdeps/s390/bits/setjmp.h: Remove __JB_* macros. * sysdeps/sh/bits/setjmp.h (JB_SIZE): Macro moved ... * sysdeps/sh/jmpbuf-offsets.h: ... here, new file. * sysdeps/sparc/sparc32/bits/setjmp.h: Move JB_* macros ... * sysdeps/sparc/sparc32/jmpbuf-offsets.h: ... here, new file. * sysdeps/unix/sysv/linux/sparc/bits/setjmp.h: Remove JB_* macros. * sysdeps/x86_64/bits/setjmp.h: Move JB_* macros ... * sysdeps/x86_64/jmpbuf-offsets.h: ... here, new file. --- sysdeps/alpha/bits/setjmp.h | 20 ----------- .../{hppa/bits/setjmp.h => alpha/jmpbuf-offsets.h} | 42 ++++++++++------------ sysdeps/hppa/bits/setjmp.h | 4 --- sysdeps/hppa/{bits/setjmp.h => jmpbuf-offsets.h} | 24 ++----------- sysdeps/mips/bits/setjmp.h | 5 --- 5 files changed, 21 insertions(+), 74 deletions(-) copy sysdeps/{hppa/bits/setjmp.h => alpha/jmpbuf-offsets.h} (52%) copy sysdeps/hppa/{bits/setjmp.h => jmpbuf-offsets.h} (54%) diff --git a/sysdeps/alpha/bits/setjmp.h b/sysdeps/alpha/bits/setjmp.h index 7db0dbf5..eb0b478f 100644 --- a/sysdeps/alpha/bits/setjmp.h +++ b/sysdeps/alpha/bits/setjmp.h @@ -55,26 +55,6 @@ * registers. */ -#if defined __USE_MISC || defined __ASSEMBLY__ -# define JB_S0 0 -# define JB_S1 1 -# define JB_S2 2 -# define JB_S3 3 -# define JB_S4 4 -# define JB_S5 5 -# define JB_PC 6 -# define JB_FP 7 -# define JB_SP 8 -# define JB_F2 9 -# define JB_F3 10 -# define JB_F4 11 -# define JB_F5 12 -# define JB_F6 13 -# define JB_F7 14 -# define JB_F8 15 -# define JB_F9 16 -#endif - #ifndef __ASSEMBLY__ typedef long int __jmp_buf[17]; #endif diff --git a/sysdeps/hppa/bits/setjmp.h b/sysdeps/alpha/jmpbuf-offsets.h similarity index 52% copy from sysdeps/hppa/bits/setjmp.h copy to sysdeps/alpha/jmpbuf-offsets.h index 4c8ed07b..c2503d44 100644 --- a/sysdeps/hppa/bits/setjmp.h +++ b/sysdeps/alpha/jmpbuf-offsets.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2000, 2005, 2006 Free Software Foundation, Inc. +/* Private macros for accessing __jmp_buf contents. Alpha version. + Copyright (C) 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 @@ -16,25 +17,20 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -/* Define the machine-dependent type `jmp_buf'. HPPA version. */ -#ifndef _BITS_SETJMP_H -#define _BITS_SETJMP_H 1 - -#if !defined _SETJMP_H && !defined _PTHREAD_H -# error "Never include directly; use instead." -#endif - -/* The previous bits/setjmp.h had __jmp_buf defined as a structure. - We use an array of 'double' instead, to make writing the assembler - easier, and to ensure proper alignment. Naturally, user code should - not depend on either representation. */ - -#if defined __USE_MISC || defined _ASM -#define JB_SP (76/4) -#endif - -#ifndef _ASM -typedef double __jmp_buf[21]; -#endif - -#endif /* bits/setjmp.h */ +#define JB_S0 0 +#define JB_S1 1 +#define JB_S2 2 +#define JB_S3 3 +#define JB_S4 4 +#define JB_S5 5 +#define JB_PC 6 +#define JB_FP 7 +#define JB_SP 8 +#define JB_F2 9 +#define JB_F3 10 +#define JB_F4 11 +#define JB_F5 12 +#define JB_F6 13 +#define JB_F7 14 +#define JB_F8 15 +#define JB_F9 16 diff --git a/sysdeps/hppa/bits/setjmp.h b/sysdeps/hppa/bits/setjmp.h index 4c8ed07b..d5ae7e7b 100644 --- a/sysdeps/hppa/bits/setjmp.h +++ b/sysdeps/hppa/bits/setjmp.h @@ -29,10 +29,6 @@ easier, and to ensure proper alignment. Naturally, user code should not depend on either representation. */ -#if defined __USE_MISC || defined _ASM -#define JB_SP (76/4) -#endif - #ifndef _ASM typedef double __jmp_buf[21]; #endif diff --git a/sysdeps/hppa/bits/setjmp.h b/sysdeps/hppa/jmpbuf-offsets.h similarity index 54% copy from sysdeps/hppa/bits/setjmp.h copy to sysdeps/hppa/jmpbuf-offsets.h index 4c8ed07b..d95ed8a4 100644 --- a/sysdeps/hppa/bits/setjmp.h +++ b/sysdeps/hppa/jmpbuf-offsets.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2000, 2005, 2006 Free Software Foundation, Inc. +/* Private macros for accessing __jmp_buf contents. HPPA version. + Copyright (C) 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 @@ -16,25 +17,4 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -/* Define the machine-dependent type `jmp_buf'. HPPA version. */ -#ifndef _BITS_SETJMP_H -#define _BITS_SETJMP_H 1 - -#if !defined _SETJMP_H && !defined _PTHREAD_H -# error "Never include directly; use instead." -#endif - -/* The previous bits/setjmp.h had __jmp_buf defined as a structure. - We use an array of 'double' instead, to make writing the assembler - easier, and to ensure proper alignment. Naturally, user code should - not depend on either representation. */ - -#if defined __USE_MISC || defined _ASM #define JB_SP (76/4) -#endif - -#ifndef _ASM -typedef double __jmp_buf[21]; -#endif - -#endif /* bits/setjmp.h */ diff --git a/sysdeps/mips/bits/setjmp.h b/sysdeps/mips/bits/setjmp.h index 7b946233..4f159c49 100644 --- a/sysdeps/mips/bits/setjmp.h +++ b/sysdeps/mips/bits/setjmp.h @@ -72,9 +72,4 @@ typedef struct #endif } __jmp_buf[1]; -#ifdef __USE_MISC -/* Offset to the program counter in `jmp_buf'. */ -# define JB_PC 0 -#endif - #endif /* _MIPS_BITS_SETJMP_H */ -- 2.11.4.GIT