darwin.h (SUBTARGET_OPTIONS): Move from here, to...

	* config/rs6000/darwin.h (SUBTARGET_OPTIONS): Move from here, to...
	(darwin_fix_and_continue): Likewise.
	(darwin_fix_and_continue_switch): Likewise.
	* config/darwin.h (SUBTARGET_OPTIONS): ...here, to fix -mone-byte-bool.
	(darwin_fix_and_continue): Likewise.
	(darwin_fix_and_continue_switch): Likewise.

From-SVN: r86365

gcc/ChangeLog

+2004-08-21  Mike Stump  <mrs@apple.com>
+
+	* config/rs6000/darwin.h (SUBTARGET_OPTIONS): Move from here, to...
+	(darwin_fix_and_continue): Likewise.
+	(darwin_fix_and_continue_switch): Likewise.
+	* config/darwin.h (SUBTARGET_OPTIONS): ...here, to fix -mone-byte-bool.
+	(darwin_fix_and_continue): Likewise.
+	(darwin_fix_and_continue_switch): Likewise.
+
 2004-08-21  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	PR  c++/16030

gcc/config/darwin.h

@@ -140,9 +140,16 @@ Boston, MA 02111-1307, USA.  */
    that this switch has no "no-" variant. */
 extern const char *darwin_one_byte_bool;
   
+extern int darwin_fix_and_continue;
+extern const char *darwin_fix_and_continue_switch;
+
 #undef SUBTARGET_OPTIONS
 #define SUBTARGET_OPTIONS \
-  {"one-byte-bool", &darwin_one_byte_bool, N_("Set sizeof(bool) to 1"), 0 }
+  {"one-byte-bool", &darwin_one_byte_bool, N_("Set sizeof(bool) to 1"), 0 }, \
+  {"fix-and-continue", &darwin_fix_and_continue_switch,			\
+   N_("Generate code suitable for fast turn around debugging"), 0},	\
+  {"no-fix-and-continue", &darwin_fix_and_continue_switch,		\
+   N_("Don't generate code suitable for fast turn around debugging"), 0}
 
 /* These compiler options take n arguments.  */
 

gcc/config/rs6000/darwin.h

@@ -381,16 +381,6 @@ extern const char *darwin_one_byte_bool;
 
 #define HAS_MD_FALLBACK_FRAME_STATE_FOR 1
 
-#undef SUBTARGET_OPTIONS
-#define	SUBTARGET_OPTIONS \
-  {"fix-and-continue", &darwin_fix_and_continue_switch,			\
-   N_("Generate code suitable for fast turn around debugging"), 0},	\
-  {"no-fix-and-continue", &darwin_fix_and_continue_switch,		\
-   N_("Don't generate code suitable for fast turn around debugging"), 0}
-
-extern int darwin_fix_and_continue;
-extern const char *darwin_fix_and_continue_switch;
-
 /* True, iff we're generating fast turn around debugging code.  When
    true, we arrange for function prologues to start with 4 nops so
    that gdb may insert code to redirect them, and for data to accessed