diff options
| author | Jim Wilson <wilson@cygnus.com> | 1997-09-10 23:34:58 +0000 |
|---|---|---|
| committer | Jim Wilson <wilson@gcc.gnu.org> | 1997-09-10 16:34:58 -0700 |
| commit | db87ec0b581eb8e80de0c02486fd97b7d643665b (patch) | |
| tree | d57d3bde3083c16a6fbe7d041a1830314597566f /gcc | |
| parent | dc3fce90205e2da23b404eb215e2807307cc531e (diff) | |
| download | gcc-db87ec0b581eb8e80de0c02486fd97b7d643665b.zip gcc-db87ec0b581eb8e80de0c02486fd97b7d643665b.tar.gz gcc-db87ec0b581eb8e80de0c02486fd97b7d643665b.tar.bz2 | |
Clean up patches for delta88 nested function support.
* m88k/m88k.c (struct option): Rename to struct options.
* m88k/dolph.h (INITIALIZE_TRAMPOLINE): Delete here.
* m88k/sysv3.h (INITIALIZE_TRAMPOLINE): Delete ifdef and comments.
* libgcc2.c (__enable_execute_stack): Check for __sysV88__ not
__DOLPHIN__ or sysV88.
From-SVN: r15393
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/config/m88k/dolph.h | 11 | ||||
| -rw-r--r-- | gcc/config/m88k/m88k.c | 10 | ||||
| -rw-r--r-- | gcc/config/m88k/sysv3.h | 13 | ||||
| -rw-r--r-- | gcc/libgcc2.c | 4 |
5 files changed, 18 insertions, 28 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 10dbc34..8cedf20 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +Wed Sep 10 16:01:15 1997 Jim Wilson <wilson@cygnus.com> + + * m88k/m88k.c (struct option): Rename to struct options. + * m88k/dolph.h (INITIALIZE_TRAMPOLINE): Delete here. + * m88k/sysv3.h (INITIALIZE_TRAMPOLINE): Delete ifdef and comments. + * libgcc2.c (__enable_execute_stack): Check for __sysV88__ not + __DOLPHIN__ or sysV88. + Wed Sep 10 16:16:07 1997 Richard Kenner (kenner@vlsi1.ultra.nyu.edu) * Makefile.in (LN): Add new symbol. diff --git a/gcc/config/m88k/dolph.h b/gcc/config/m88k/dolph.h index 48c0378..1ebeaf7 100644 --- a/gcc/config/m88k/dolph.h +++ b/gcc/config/m88k/dolph.h @@ -41,14 +41,3 @@ Boston, MA 02111-1307, USA. */ #undef CPU_DEFAULT #define CPU_DEFAULT MASK_88000 - -#undef INITIALIZE_TRAMPOLINE -#define INITIALIZE_TRAMPOLINE(TRAMP, FNADDR, CXT) \ -{ \ - emit_move_insn (gen_rtx (MEM, SImode, plus_constant (TRAMP, 40)), FNADDR); \ - emit_move_insn (gen_rtx (MEM, SImode, plus_constant (TRAMP, 36)), CXT); \ - emit_call_insn (gen_call( gen_rtx (MEM, SImode, \ - gen_rtx(SYMBOL_REF,Pmode, \ - "__enable_execute_stack")), \ - const0_rtx)); \ -} diff --git a/gcc/config/m88k/m88k.c b/gcc/config/m88k/m88k.c index 19f8e67..f869461 100644 --- a/gcc/config/m88k/m88k.c +++ b/gcc/config/m88k/m88k.c @@ -1479,7 +1479,7 @@ pc_or_label_ref (op, mode) /* Output to FILE the start of the assembler file. */ -struct option +struct options { char *string; int *variable; @@ -1510,8 +1510,8 @@ static void output_options (file, f_options, f_len, W_options, W_len, pos, max, sep, indent, term) FILE *file; - struct option *f_options; - struct option *W_options; + struct options *f_options; + struct options *W_options; int f_len, W_len; int pos; int max; @@ -1559,8 +1559,8 @@ output_options (file, f_options, f_len, W_options, W_len, void output_file_start (file, f_options, f_len, W_options, W_len) FILE *file; - struct option *f_options; - struct option *W_options; + struct options *f_options; + struct options *W_options; int f_len, W_len; { register int pos; diff --git a/gcc/config/m88k/sysv3.h b/gcc/config/m88k/sysv3.h index e3c318e..7fe4f9d 100644 --- a/gcc/config/m88k/sysv3.h +++ b/gcc/config/m88k/sysv3.h @@ -138,20 +138,13 @@ do { \ __DTOR_LIST__[i] (); \ } while (0) -#ifdef sysV88 -/* manfred@s-direktnet.de: Re-define INITIALIZE_TRAMPOLINE to additionally call - __enable_execute_stack. - I don't actually have a clue why nobody else than sysV88 and __DOLPHIN__ - needs to call this; perhaps they didn't ever run the c-torture tests - getting segmentations violations and/or bus errors with nested functions. */ #undef INITIALIZE_TRAMPOLINE #define INITIALIZE_TRAMPOLINE(TRAMP, FNADDR, CXT) \ { \ emit_move_insn (gen_rtx (MEM, SImode, plus_constant (TRAMP, 40)), FNADDR); \ emit_move_insn (gen_rtx (MEM, SImode, plus_constant (TRAMP, 36)), CXT); \ emit_call_insn (gen_call (gen_rtx (MEM, SImode, \ - gen_rtx (SYMBOL_REF, Pmode, \ - "__enable_execute_stack")), \ - const0_rtx)); \ + gen_rtx (SYMBOL_REF, Pmode, \ + "__enable_execute_stack")), \ + const0_rtx)); \ } -#endif diff --git a/gcc/libgcc2.c b/gcc/libgcc2.c index 23a4e5a..0e9252e 100644 --- a/gcc/libgcc2.c +++ b/gcc/libgcc2.c @@ -2827,7 +2827,7 @@ __enable_execute_stack () } #endif /* __convex__ */ -#if defined (__DOLPHIN__) || defined (sysV88) +#ifdef __sysV88__ /* Modified from the convex -code above. */ @@ -2857,7 +2857,7 @@ __enable_execute_stack () errno=save_errno; } -#endif /* __DOLPHIN__ or sysV88 */ +#endif /* __sysV88__ */ #ifdef __pyr__ |