diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 10dbc3470c5..8cedf20d825 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 48c0378636a..1ebeaf76cdb 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 19f8e67c429..f8694615b47 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 e3c318ef90b..7fe4f9d3be6 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 23a4e5a7149..0e9252e12a3 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__