diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3c92b7eff2a..da4c9474d51 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Sun Dec 19 07:50:42 1999  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
+
+	* rs6000.h (SUBTARGET_DEFAULT): New macro.
+	(TARGET_SWITCHES): Allow subtargets to default switches.
+	* rs6000/vxppc.h (SUBTARGET_DEFAULT): New macro.
+
 1999-12-18  Mark Mitchell  <mark@codesourcery.com>
 
 	* crtstuff.c (__do_global_ctors_aux): Do not call __cxa_finalize
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 32504165b20..68298b598fd 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler, for IBM RS/6000.
-   Copyright (C) 1992, 93-8, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1992, 93-98, 1999 Free Software Foundation, Inc.
    Contributed by Richard Kenner (kenner@vlsi1.ultra.nyu.edu)
 
 This file is part of GNU CC.
@@ -391,9 +391,10 @@ extern int target_flags;
   {"fused-madd",	- MASK_NO_FUSED_MADD},				\
   {"no-fused-madd",	MASK_NO_FUSED_MADD},				\
   SUBTARGET_SWITCHES							\
-  {"",			TARGET_DEFAULT}}
+  {"",			TARGET_DEFAULT | SUBTARGET_DEFAULT}}
 
 #define TARGET_DEFAULT (MASK_POWER | MASK_MULTIPLE | MASK_STRING)
+#define SUBTARGET_DEFAULT 0
 
 /* Processor type.  Order must match cpu attribute in MD file.  */
 enum processor_type
diff --git a/gcc/config/rs6000/vxppc.h b/gcc/config/rs6000/vxppc.h
index 37b92dc7591..0fb8aac9cb0 100644
--- a/gcc/config/rs6000/vxppc.h
+++ b/gcc/config/rs6000/vxppc.h
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler.  Vxworks PowerPC version.
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,7 +18,8 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* This file just exists to give specs for the PowerPC running on VxWorks.  */
+/* This file primarily exists to give specs for the PowerPC running on
+   VxWorks.  */
 
 #include "rs6000/sysv4.h"
 
@@ -71,3 +72,8 @@ Boston, MA 02111-1307, USA.  */
 /* We use stabs-in-elf for debugging */
 #undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
+
+/* VxWorks normally doesn't have an unaligned handler, so make -mstrict-align
+   the default.  */
+#undef SUBTARGET_DEFAULT
+#define SUBTARGET_DEFAULT MASK_STRICT_ALIGN