27 files changed, 85 insertions, 108 deletions
diff --git a/gcc/config/m68k/a-ux.h b/gcc/config/m68k/a-ux.h
index 8662c6f20aa..0dbcd5b6a8f 100644
--- a/gcc/config/m68k/a-ux.h
+++ b/gcc/config/m68k/a-ux.h
@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA.  */
 /* Execution environment */
 
 #undef TARGET_DEFAULT
-#define TARGET_DEFAULT 7	/* 68020, 68881 */
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)	/* 68020, 68881 */
 
 #define CPP_PREDEFINES "-Dunix -Dm68k -DAUX -DmacII \
 -Asystem(unix) -Asystem(AUX) -Acpu(m68k) -Amachine(m68k) -Amachine(macII)"
diff --git a/gcc/config/m68k/altos3068.h b/gcc/config/m68k/altos3068.h
index e778d4215b7..5903a12d5a6 100644
--- a/gcc/config/m68k/altos3068.h
+++ b/gcc/config/m68k/altos3068.h
@@ -1,8 +1,6 @@
 /* Definitions of target machine for GNU compiler.  Altos 3068 68020 version.
-   Copyright (C) 1988, 1989, 1993 Free Software Foundation, Inc.
-
-Written by Jyrki Kuoppala <jkp@cs.hut.fi>
-Last modified: Mon Mar  6 22:47:58 1989
+   Copyright (C) 1988, 1989, 1993, 1996 Free Software Foundation, Inc.
+   Contributed by Jyrki Kuoppala <jkp@cs.hut.fi>
 
 This file is part of GNU CC.
 
@@ -28,7 +26,7 @@ Boston, MA 02111-1307, USA.  */
 /* 5 is without 68881.  Change to 7 if you have 68881 */
 
 #ifndef TARGET_DEFAULT
-#define TARGET_DEFAULT 5
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68020)
 
 /* Don't try using XFmode.  */
 #undef LONG_DOUBLE_TYPE_SIZE
@@ -40,7 +38,7 @@ Boston, MA 02111-1307, USA.  */
    This will control the use of inline 68881 insns in certain macros.
    Also inform the program which CPU this is for.  */
 
-#if TARGET_DEFAULT & 02
+#if TARGET_DEFAULT & MASK_68881
 
 /* -m68881 is the default */
 #define CPP_SPEC \
diff --git a/gcc/config/m68k/apollo68.h b/gcc/config/m68k/apollo68.h
index 0cf2fa08c04..caaaeff4313 100644
--- a/gcc/config/m68k/apollo68.h
+++ b/gcc/config/m68k/apollo68.h
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler.  Apollo 680X0 version.
-   Copyright (C) 1989,1992 Free Software Foundation, Inc.
+   Copyright (C) 1989,1992, 1996 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA.  */
 /* See m68k.h.  7 means 68020 with 68881.  */
 
 #ifndef TARGET_DEFAULT
-#define TARGET_DEFAULT 7
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
 #endif
 
 /* Target switches for the Apollo is the same as in m68k.h, except
@@ -54,7 +54,7 @@ Boston, MA 02111-1307, USA.  */
    This will control the use of inline 68881 insns in certain macros.
    Also inform the program which CPU this is for.  */
 
-#if TARGET_DEFAULT & 02
+#if TARGET_DEFAULT & MASK_68881
 
 /* -m68881 is the default */
 #define CPP_SPEC \
@@ -100,7 +100,7 @@ Boston, MA 02111-1307, USA.  */
    Note that includes knowledge of the default specs for gcc, ie. no
    args translates to the same effect as -m68881 */
 
-#if TARGET_DEFAULT & 2
+#if TARGET_DEFAULT & MASK_68881
 /* -m68881 is the default */
 #define STARTFILE_SPEC					\
   "%{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}"
diff --git a/gcc/config/m68k/ccur-GAS.h b/gcc/config/m68k/ccur-GAS.h
index 1ff2c93d18e..17410c80740 100644
--- a/gcc/config/m68k/ccur-GAS.h
+++ b/gcc/config/m68k/ccur-GAS.h
@@ -40,7 +40,7 @@ Boston, MA 02111-1307, USA.  */
 #define SPACE_AFTER_L_OPTION
 #define SWITCHES_NEED_SPACES "oL"
 
-#define TARGET_DEFAULT 0407 /* See m68k.h.  7 means 68020 with 68881.  */
+#define TARGET_DEFAULT (MASK_68040|MASK_BITFIELD|MASK_68881|MASK_68020) /* See m68k.h.  7 means 68020 with 68881.  */
 
 #include "m68k/m68k.h"
 
diff --git a/gcc/config/m68k/dpx2.h b/gcc/config/m68k/dpx2.h
index 1402a256186..14f0606b8aa 100644
--- a/gcc/config/m68k/dpx2.h
+++ b/gcc/config/m68k/dpx2.h
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler.  
    Bull DPX/2 200 and 300 systems (m68k, SysVr3).
-   Copyright (C) 1987, 1993, 1994, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
    Contributed by Frederic Pierresteguy (F.Pierresteguy@frcl.bull.fr).
 
 This file is part of GNU CC.
@@ -36,7 +36,7 @@ Boston, MA 02111-1307, USA.  */
  * but this will get us going.  
  */
 #ifndef TARGET_DEFAULT
-#define TARGET_DEFAULT 7
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
 #endif
 
 #define OBJECT_FORMAT_COFF
@@ -79,7 +79,7 @@ Boston, MA 02111-1307, USA.  */
  * bitfield instructions do not seem to work a clean way.
  */
 #undef TARGET_DEFAULT
-#define TARGET_DEFAULT 3
+#define TARGET_DEFAULT (MASK_68881|MASK_68020)
 
 /* The native assembler doesn't support fmovecr.  */
 #define NO_ASM_FMOVECR
diff --git a/gcc/config/m68k/hp320.h b/gcc/config/m68k/hp320.h
index f748f3fde13..f61e2f2edbb 100644
--- a/gcc/config/m68k/hp320.h
+++ b/gcc/config/m68k/hp320.h
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler.  HP-UX 68000/68020 version.
-   Copyright (C) 1987, 1988, 1993, 1994, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1987, 88, 93, 94, 95, 1996 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -65,7 +65,7 @@ Boston, MA 02111-1307, USA.  */
 /* See m68k.h.  7 means 68020 with 68881.  */
 
 #ifndef TARGET_DEFAULT
-#define	TARGET_DEFAULT 7
+#define	TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
 #endif
 
 /* Define __HAVE_68881__ in preprocessor, unless -msoft-float is specified.
@@ -77,7 +77,7 @@ Boston, MA 02111-1307, USA.  */
 
 #define NO_DOT_IN_LABEL
 
-#if TARGET_DEFAULT & 02  /* -m68881 is the default */
+#if TARGET_DEFAULT & MASK_68881  /* -m68881 is the default */
 
 /* These definitions differ from those used for GAS by defining __HPUX_ASM__.
    This is needed because some programs, particularly GDB, need to
@@ -98,7 +98,7 @@ Boston, MA 02111-1307, USA.  */
 
 #else /* not HPUX_ASM */
 
-#if TARGET_DEFAULT & 02  /* -m68881 is the default */
+#if TARGET_DEFAULT & MASK_68881  /* -m68881 is the default */
 
 #define CPP_SPEC \
 "%{!msoft-float:-D__HAVE_68881__ }\
diff --git a/gcc/config/m68k/hp3bsd.h b/gcc/config/m68k/hp3bsd.h
index d800f7a137b..34405f88350 100644
--- a/gcc/config/m68k/hp3bsd.h
+++ b/gcc/config/m68k/hp3bsd.h
@@ -2,7 +2,7 @@
 
 /* See m68k.h.  7 means 68020 with 68881.  */
 
-#define TARGET_DEFAULT 7
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
 
 /* Define __HAVE_68881__ in preprocessor, unless -msoft-float is specified.
    This will control the use of inline 68881 insns in certain macros.  */
diff --git a/gcc/config/m68k/hp3bsd44.h b/gcc/config/m68k/hp3bsd44.h
index b94b598d0ea..a3b652ffe35 100644
--- a/gcc/config/m68k/hp3bsd44.h
+++ b/gcc/config/m68k/hp3bsd44.h
@@ -2,7 +2,7 @@
 
 /* See m68k.h.  7 means 68020 with 68881.  */
 
-#define TARGET_DEFAULT 7
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
 
 /* Define __HAVE_68881__ in preprocessor, unless -msoft-float is specified.
    This will control the use of inline 68881 insns in certain macros.  */
diff --git a/gcc/config/m68k/isi-nfp.h b/gcc/config/m68k/isi-nfp.h
index f3544485feb..fbded9e8bdb 100644
--- a/gcc/config/m68k/isi-nfp.h
+++ b/gcc/config/m68k/isi-nfp.h
@@ -1,6 +1,6 @@
 /* Define target machine as an ISI 68000/68020 with no 68881.  */
 
-#define TARGET_DEFAULT 5
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68020)
 
 #include "m68k/isi.h"
 
diff --git a/gcc/config/m68k/isi.h b/gcc/config/m68k/isi.h
index bc1b969d980..a458cf9e080 100644
--- a/gcc/config/m68k/isi.h
+++ b/gcc/config/m68k/isi.h
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler.  ISI 68000/68020 version.
    Intended only for use with GAS, and not ISI's assembler, which is buggy
-   Copyright (C) 1988 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1996 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -23,10 +23,10 @@ Boston, MA 02111-1307, USA.  */
 
 /* See m68k.h.  7 means 68020 with 68881. */
 #ifndef TARGET_DEFAULT
-#define TARGET_DEFAULT 7
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
 #endif
 
-#if TARGET_DEFAULT & 2
+#if TARGET_DEFAULT & MASK_68881
 /* Define __HAVE_68881__ in preprocessor, unless -msoft-float is specified.
    This will control the use of inline 68881 insns in certain macros.  */
 
diff --git a/gcc/config/m68k/linux-aout.h b/gcc/config/m68k/linux-aout.h
index 980d08f72f9..b21e76bf6a9 100644
--- a/gcc/config/m68k/linux-aout.h
+++ b/gcc/config/m68k/linux-aout.h
@@ -1,5 +1,5 @@
 /* Definitions for Motorola m68k running Linux
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include <linux-aout.h>
 
 /* 68020 with 68881 */
-#define TARGET_DEFAULT 7
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
 
 #define DBX_DEBUGGING_INFO
 
@@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA.  */
   "-Dunix -Dmc68000 -Dmc68020 -Dlinux -Asystem(unix) -Asystem(posix) -Acpu(m68k) -Amachine(m68k)"
 
 #undef CPP_SPEC
-#if TARGET_DEFAULT & 2
+#if TARGET_DEFAULT & MASK_68881
 #define CPP_SPEC \
   "%{!msoft-float:-D__HAVE_68881__} %{posix:-D_POSIX_SOURCE}"
 #else
diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h
index 1d7ac32255f..5a53db14ba9 100644
--- a/gcc/config/m68k/linux.h
+++ b/gcc/config/m68k/linux.h
@@ -29,7 +29,7 @@ Boston, MA 02111-1307, USA.  */
 #define TARGET_VERSION fprintf (stderr, " (68k Linux/ELF)");
 
 /* 68020 with 68881 */
-#define TARGET_DEFAULT 7
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
 
 /* for 68k machines this only needs to be TRUE for the 68000 */
 
@@ -104,7 +104,7 @@ Boston, MA 02111-1307, USA.  */
   "-D__ELF__ -Dunix -Dmc68000 -Dmc68020 -Dlinux -Asystem(unix) -Asystem(posix) -Acpu(m68k) -Amachine(m68k)"
 
 #undef CPP_SPEC
-#if TARGET_DEFAULT & 2
+#if TARGET_DEFAULT & MASK_68881
 #define CPP_SPEC \
   "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!msoft-float:-D__HAVE_68881__} %{posix:-D_POSIX_SOURCE}"
 #else
diff --git a/gcc/config/m68k/lynx-ng.h b/gcc/config/m68k/lynx-ng.h
index 6921bcf79c7..ac3afac938e 100644
--- a/gcc/config/m68k/lynx-ng.h
+++ b/gcc/config/m68k/lynx-ng.h
@@ -1,5 +1,5 @@
 /* Definitions for Motorola 680x0 running LynxOS, using Lynx's old as and ld.
-   Copyright (C) 1993, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -25,7 +25,7 @@ Boston, MA 02111-1307, USA.  */
 /* See m68k.h.  7 means 68020 with 68881.  */
 
 #ifndef TARGET_DEFAULT
-#define TARGET_DEFAULT 7
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
 #endif
 
 /* Names to predefine in the preprocessor for this target machine.  */
diff --git a/gcc/config/m68k/lynx.h b/gcc/config/m68k/lynx.h
index 0635ebba697..8c54b8bc13f 100644
--- a/gcc/config/m68k/lynx.h
+++ b/gcc/config/m68k/lynx.h
@@ -1,5 +1,5 @@
 /* Definitions for Motorola 680x0 running LynxOS.
-   Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -35,7 +35,7 @@ Boston, MA 02111-1307, USA.  */
 /* See m68k.h.  7 means 68020 with 68881.  */
 
 #ifndef TARGET_DEFAULT
-#define TARGET_DEFAULT 7
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
 #endif
 
 /* Names to predefine in the preprocessor for this target machine.  */
diff --git a/gcc/config/m68k/m68k-none.h b/gcc/config/m68k/m68k-none.h
index 01b87c2aacd..c93a16349bd 100644
--- a/gcc/config/m68k/m68k-none.h
+++ b/gcc/config/m68k/m68k-none.h
@@ -180,7 +180,7 @@ Unrecognized value in TARGET_CPU_DEFAULT.
    The default is m68k 99.9% of the time anyway.  */
 
 #if TARGET_CPU_DEFAULT == M68K_CPU_m68k || TARGET_CPU_DEFAULT == M68K_CPU_m68020
-#if TARGET_DEFAULT & 2
+#if TARGET_DEFAULT & MASK_68881
 #define MULTILIB_DEFAULTS { "m68020", "m68881" }
 #else
 #define MULTILIB_DEFAULTS { "m68020", "msoft-float" }
@@ -188,7 +188,7 @@ Unrecognized value in TARGET_CPU_DEFAULT.
 #endif
 
 #if TARGET_CPU_DEFAULT == M68K_CPU_m68000 || TARGET_CPU_DEFAULT == M68K_CPU_m68302
-#if TARGET_DEFAULT & 2
+#if TARGET_DEFAULT & MASK_68881
 #define MULTILIB_DEFAULTS { "m68000", "m68881" }
 #else
 #define MULTILIB_DEFAULTS { "m68000", "msoft-float" }
diff --git a/gcc/config/m68k/m68k-psos.h b/gcc/config/m68k/m68k-psos.h
index d775c6ee137..8e5b843397e 100644
--- a/gcc/config/m68k/m68k-psos.h
+++ b/gcc/config/m68k/m68k-psos.h
@@ -34,7 +34,7 @@ Boston, MA 02111-1307, USA.  */
    the floating-point support package. */
 
 #undef TARGET_DEFAULT
-#define TARGET_DEFAULT 01007
+#define TARGET_DEFAULT (MASK_68040_ONLY|MASK_BITFIELD|MASK_68881|MASK_68020)
 
 /* Options passed to CPP, GAS, CC1 and CC1PLUS. We override
    m68k-none.h for consistency with TARGET_DEFAULT. */
diff --git a/gcc/config/m68k/m68kv4.h b/gcc/config/m68k/m68kv4.h
index 88bad79316a..a40d919990d 100644
--- a/gcc/config/m68k/m68kv4.h
+++ b/gcc/config/m68k/m68kv4.h
@@ -36,7 +36,7 @@ Boston, MA 02111-1307, USA.  */
 /* See m68k.h.  7 means 68020 with 68881.  */
 
 #ifndef TARGET_DEFAULT
-#define	TARGET_DEFAULT (5 /*68020*/ + 2 /*68881*/)
+#define	TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
 #endif
 
 /* When using an SGS assembler, modify the name of the artificial label which
@@ -84,7 +84,7 @@ while (0)
    If a 68881 is not the default, gcc will only define __HAVE_68881__ if
    -m68881 is specified. */
 
-#if TARGET_DEFAULT & 2
+#if TARGET_DEFAULT & MASK_68881
 #define CPP_SPEC "%{!msoft-float:-D__HAVE_68881__}"
 #else
 #define CPP_SPEC "%{m68881:-D__HAVE_68881__}"
diff --git a/gcc/config/m68k/mot3300.h b/gcc/config/m68k/mot3300.h
index 126d8eab118..8d830a9e3fd 100644
--- a/gcc/config/m68k/mot3300.h
+++ b/gcc/config/m68k/mot3300.h
@@ -40,7 +40,7 @@ Boston, MA 02111-1307, USA.  */
 /* See m68k.h.  0407 means 68020-68040.  */
 
 #ifndef TARGET_DEFAULT
-#define	TARGET_DEFAULT 0407
+#define	TARGET_DEFAULT (MASK_68040|MASK_BITFIELD|MASK_68881|MASK_68020)
 #endif
 
 /* -m[c]6800 requires special flag to the assembler.  */
@@ -793,7 +793,7 @@ do {(CUM).offset = 0;\
    tell g++.c about that.  */
 #define ALT_LIBM	"-lm881"
 
-#if (TARGET_DEFAULT & 2)      /* The default configuration has a 6888[12] FPU. */
+#if (TARGET_DEFAULT & MASK_68881)      /* The default configuration has a 6888[12] FPU. */
 #define MATH_LIBRARY	"-lm881"
 #endif
 
diff --git a/gcc/config/m68k/netbsd.h b/gcc/config/m68k/netbsd.h
index 9247244b7c9..0dbf380c76d 100644
--- a/gcc/config/m68k/netbsd.h
+++ b/gcc/config/m68k/netbsd.h
@@ -4,10 +4,7 @@
 
 #include <netbsd.h>
 
-
-/* See m68k.h.  7 means 68020 with 68881.  */
-
-#define TARGET_DEFAULT 7
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
 
 /* Define __HAVE_68881__ in preprocessor, unless -msoft-float is specified.
    This will control the use of inline 68881 insns in certain macros.  */
diff --git a/gcc/config/m68k/news.h b/gcc/config/m68k/news.h
index 8300801b681..de665da9aeb 100644
--- a/gcc/config/m68k/news.h
+++ b/gcc/config/m68k/news.h
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler.  SONY NEWS-OS 4 version.
-   Copyright (C) 1987, 1989, 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1989, 1993, 1994, 1996 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* See m68k.h.  7 means 68020 with 68881.  */
 
-#define TARGET_DEFAULT 7
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
 
 /* Define __HAVE_68881__ in preprocessor, unless -msoft-float is specified.
    This will control the use of inline 68881 insns in certain macros.  */
diff --git a/gcc/config/m68k/next.h b/gcc/config/m68k/next.h
index 3d8d8f67dff..23f7ff13303 100644
--- a/gcc/config/m68k/next.h
+++ b/gcc/config/m68k/next.h
@@ -25,7 +25,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* See m68k.h.  0407 means 68040 (or 68030 or 68020, with 68881/2).  */
 
-#define TARGET_DEFAULT 0407
+#define TARGET_DEFAULT (MASK_68040|MASK_BITFIELD|MASK_68881|MASK_68020)
 
 /* Boundary (in *bits*) on which stack pointer should be aligned.  */
 
diff --git a/gcc/config/m68k/pbb.h b/gcc/config/m68k/pbb.h
index c3e7fd299d0..d73cda97065 100644
--- a/gcc/config/m68k/pbb.h
+++ b/gcc/config/m68k/pbb.h
@@ -1,8 +1,6 @@
 /* Definitions of target machine for GNU compiler.
-
    Citicorp/TTI Unicom PBB version (using GAS with a %-register prefix)
-
-   Copyright (C) 1987, 1988, 1990 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1988, 1990, 1996 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -29,7 +27,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* See m68k.h.  5 means 68020 without 68881.  */
 
-#define TARGET_DEFAULT 5
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68020)
 
 /* Don't try using XFmode.  */
 #undef LONG_DOUBLE_TYPE_SIZE
diff --git a/gcc/config/m68k/plexus.h b/gcc/config/m68k/plexus.h
index 769b5fb5a33..3ca99fdb5bc 100644
--- a/gcc/config/m68k/plexus.h
+++ b/gcc/config/m68k/plexus.h
@@ -1,26 +1,7 @@
-/* Definitions of target machine for GNU compiler.
-   Copyright (C) 1990, 1994 Free Software Foundation, Inc.
-
-   Written by Randy Welch
-   Send bug reports, questions and improvements to any of the following
-   addresses:
-
-   randy@kcin.uucp
-   randy@tss.com
-   rwelch@netcom.com
-   plx-info@wpg.com        Plexus users mailing list
-
-   For 680X0 based Plexus Computers running SYSVR2
-
-   The Plexus port of gcc requires you to use gas ( either 1.3X with COFF 
-   patches or 2.X ),  If you use gas 2.X you have to use binutils-2.X.
-      
-   With using gas-2.X the Plexus gcc port is now capable of generating
-   output suitable for use by gdb-4.X ( send mail to above address for
-   info on getting gdb patches or other GNU items for the Plexus )
-
-   This is configured for label output default by gas as LXXX instead of
-   plexus cc/as combination requires .LXXX
+/* Definitions of target machine for GNU compiler, for 680X0 based Plexus
+   Computers running SYSVR2
+   Copyright (C) 1990, 1994, 1996 Free Software Foundation, Inc.
+   Contributed by Randy Welch (rwelch@netcom.com).
 
 This file is part of GNU CC.
 
@@ -40,12 +21,22 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
+/* The Plexus port of gcc requires you to use gas ( either 1.3X with COFF 
+   patches or 2.X ),  If you use gas 2.X you have to use binutils-2.X.
+      
+   With using gas-2.X the Plexus gcc port is now capable of generating
+   output suitable for use by gdb-4.X ( send mail to above address for
+   info on getting gdb patches or other GNU items for the Plexus )
+
+   This is configured for label output default by gas as LXXX instead of
+   plexus cc/as combination requires .LXXX  */
+
 #include "m68k/m68k.h"
 
 /* Define __HAVE_68881 in preprocessor only if -m68881 is specified.
    This will control the use of inline 68881 insns in certain macros. */
 
-#define TARGET_DEFAULT 5                      /* set to 5 if on a '020 box */
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68020)
 
 /* Don't try using XFmode.  */
 #undef LONG_DOUBLE_TYPE_SIZE
@@ -54,7 +45,7 @@ Boston, MA 02111-1307, USA.  */
 #define CPP_SPEC "%{m68881:-D__HAVE_68881__}"
 #define CPP_PREDEFINES "-Dm68 -Dunix -Dplexus -Asystem(unix)  -Acpu(m68k) -Amachine(m68k)"
 
-#if TARGET_DEFAULT & 01
+#if TARGET_DEFAULT & MASK_68020
 #define ASM_SPEC\
 "%{m68000:-mc68000}%{mc68000:-mc68000}%{!mc68000:%{!m68000:-mc68020}}"
 #undef STRICT_ALIGNMENT
diff --git a/gcc/config/m68k/sun2o4.h b/gcc/config/m68k/sun2o4.h
index adaf48a5231..6f1ae7a7a6c 100644
--- a/gcc/config/m68k/sun2o4.h
+++ b/gcc/config/m68k/sun2o4.h
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler.  Sun 2 running Sunos 4.
-   Copyright (C) 1987, 1988, 1993 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1988, 1993, 1996 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -35,7 +35,7 @@ Boston, MA 02111-1307, USA.  */
 #undef WCHAR_TYPE_SIZE
 #define WCHAR_TYPE_SIZE 16
 
-#if TARGET_DEFAULT & 0200
+#if TARGET_DEFAULT & MASK_SKY
 
 /* -msky is the default */
 #define CPP_SPEC \
@@ -58,7 +58,7 @@ Boston, MA 02111-1307, USA.  */
 
 #undef STARTFILE_SPEC
 
-#if TARGET_DEFAULT & 0200
+#if TARGET_DEFAULT & MASK_SKY
 /* -msky is the default */
 #define STARTFILE_SPEC					\
   "%{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}	\
@@ -78,7 +78,7 @@ Boston, MA 02111-1307, USA.  */
 
 #undef LIB_SPEC
 
-#if TARGET_DEFAULT & 0200
+#if TARGET_DEFAULT & MASK_SKY
 /* -msky is the default */
 #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p} \
 %{a:/usr/lib/bb_link.o -lc} %{g:-lg} \
diff --git a/gcc/config/m68k/sun3.h b/gcc/config/m68k/sun3.h
index 909e4a0a991..13e927ede4d 100644
--- a/gcc/config/m68k/sun3.h
+++ b/gcc/config/m68k/sun3.h
@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA.  */
 /* See m68k.h.  7 means 68020 with 68881.  */
 
 #ifndef TARGET_DEFAULT
-#define TARGET_DEFAULT 7
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020)
 #endif
 
 /* Define __HAVE_FPA__ or __HAVE_68881__ in preprocessor,
@@ -39,7 +39,7 @@ Boston, MA 02111-1307, USA.  */
    This will control the use of inline 68881 insns in certain macros.
    Also inform the program which CPU this is for.  */
 
-#if TARGET_DEFAULT & 02
+#if TARGET_DEFAULT & MASK_68881
 
 /* -m68881 is the default */
 #define CPP_SPEC \
@@ -98,7 +98,7 @@ Boston, MA 02111-1307, USA.  */
    I'm not sure what would happen below if people gave contradictory
    arguments (eg. -msoft-float -mfpa) */
 
-#if TARGET_DEFAULT & 0100
+#if TARGET_DEFAULT & MASK_FPA
 /* -mfpa is the default */
 #define STARTFILE_SPEC					\
   "%{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}	\
@@ -106,7 +106,7 @@ Boston, MA 02111-1307, USA.  */
    %{msoft-float:Fcrt1.o%s}				\
    %{!m68881:%{!msoft-float:Wcrt1.o%s}}"
 #else
-#if TARGET_DEFAULT & 2
+#if TARGET_DEFAULT & MASK_68881
 /* -m68881 is the default */
 #define STARTFILE_SPEC					\
   "%{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}	\
@@ -127,14 +127,14 @@ Boston, MA 02111-1307, USA.  */
    Control choice of libm.a (if user says -lm)
    based on fp arith default and options.  */
 
-#if TARGET_DEFAULT & 0100
+#if TARGET_DEFAULT & MASK_FPA
 /* -mfpa is the default */
 #define LIB_SPEC "%{g:-lg} %{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p} \
 %{g:-lg} \
 %{msoft-float:-L/usr/lib/fsoft}%{m68881:-L/usr/lib/f68881}\
 %{!msoft_float:%{!m68881:-L/usr/lib/ffpa}}"
 #else
-#if TARGET_DEFAULT & 2
+#if TARGET_DEFAULT & MASK_68881
 /* -m68881 is the default */
 #define LIB_SPEC "%{g:-lg} %{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p} \
 %{g:-lg} \
diff --git a/gcc/config/m68k/sun3n.h b/gcc/config/m68k/sun3n.h
index d93bee0fbe4..32f5f657dc0 100644
--- a/gcc/config/m68k/sun3n.h
+++ b/gcc/config/m68k/sun3n.h
@@ -1,6 +1,6 @@
 /* Define target machine as a Sun 3 with no 68881.  */
 
-#define TARGET_DEFAULT 5
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68020)
 
 #include "m68k/sun3.h"
 
diff --git a/gcc/config/m68k/tower.h b/gcc/config/m68k/tower.h
index 34c7cfb40c8..30cc9c1a2f3 100644
--- a/gcc/config/m68k/tower.h
+++ b/gcc/config/m68k/tower.h
@@ -1,21 +1,6 @@
 /* Definitions of target machine for GNU compiler.
-   Copyright (C) 1990, 1994 Free Software Foundation, Inc.
-
-   Written by Robert Andersson, International Systems, Oslo, Norway.
-   Please send bug reports, questions and improvements to ra@intsys.no.
-
-   For NCR Tower 32/4x0 and 32/6x0 running System V Release 3.
-   I don't have access to 200/700/800/850 machines, so I don't know if it
-   works on those as well.  It shouldn't be far from it however.
-   The hardware floating point support is completely untested, as I do
-   not have access to a machine with a 6888x FPU in it.
-   It does not work on the System V Release 2 based OS releases.  Making it
-   work will not be easy, due to the silly way in which stack expansion is
-   implemented in the OS.
-
-   This file is included in tower-as.h.
-   Do *NOT* include this file directly.
-
+   Copyright (C) 1990, 1994, 1996 Free Software Foundation, Inc.
+   Contributed by Robert Andersson, International Systems, Oslo, ra@intsys.no.
 
 This file is part of GNU CC.
 
@@ -34,13 +19,21 @@ 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.  */
 
+/* For NCR Tower 32/4x0 and 32/6x0 running System V Release 3.  I don't have
+   access to 200/700/800/850 machines, so I don't know if it works on those
+   as well.  It shouldn't be far from it however.  The hardware floating point
+   support is completely untested, as I do not have access to a machine with
+   a 6888x FPU in it.  It does not work on the System V Release 2 based OS
+   releases.  Making it work will not be easy, due to the silly way in which
+   stack expansion is implemented in the OS.
 
-#include "m68k/m68k.h"
+   This file is included in tower-as.h.
+   Do *NOT* include this file directly.  */
 
 
-/* See m68k.h.  5 means 68020 with no 68881.  */
+#include "m68k/m68k.h"
 
-#define TARGET_DEFAULT 5
+#define TARGET_DEFAULT (MASK_BITFIELD|MASK_68020)
 
 /* Don't try using XFmode.  */
 #undef LONG_DOUBLE_TYPE_SIZE