--- gcc/config/ns32k/merlin.h	2018/04/24 18:10:24	1.1.1.1
+++ gcc/config/ns32k/merlin.h	2018/04/24 18:28:40	1.1.1.4
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler.  MERLIN NS32000 version.
-   Copyright (C) 1990 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1994 Free Software Foundation, Inc.
    By Mark Mason (mason@reed.bitnet, pyramid!unify!mason@uunet.uu.net).
 
 This file is part of GNU CC.
@@ -16,7 +16,8 @@ GNU General Public License for more deta
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Two flags to control how addresses are printed in assembler insns.  */
 
@@ -46,7 +47,8 @@ the Free Software Foundation, 675 Mass A
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES \
-	"-Dns32000 -Dns32k -Dns16000 -Dmerlin -Dunix -DUtek -Dbsd"
+	"-Dns32000 -Dns32k -Dns16000 -Dmerlin -Dunix -DUtek -Dbsd \
+	-Asystem(unix) -Asystem(bsd) -Acpu(ns32k) -Amachine(ns32k)"
 
 /* This is how to align the code that follows an unconditional branch.
    Don't define it, since it confuses the assembler (we hear).  */
@@ -111,7 +113,7 @@ the Free Software Foundation, 675 Mass A
 	  break;							\
 	}								\
     }									\
-  else if (GET_CODE (X) == CONST_DOUBLE && GET_MODE (X) != DImode)	\
+  else if (GET_CODE (X) == CONST_DOUBLE && GET_MODE (X) != VOIDmode)	\
     if (GET_MODE (X) == DFmode)						\
       { union { double d; int i[2]; } u;				\
 	u.i[0] = CONST_DOUBLE_LOW (X); u.i[1] = CONST_DOUBLE_HIGH (X);	\