--- gcc/config/tahoe/harris.h	2018/04/24 18:10:25	1.1
+++ gcc/config/tahoe/harris.h	2018/04/24 18:22:21	1.1.1.3
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler.  Harris tahoe version.
-   Copyright (C) 1989 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -21,7 +21,7 @@ the Free Software Foundation, 675 Mass A
 #include "tahoe/tahoe.h"
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dtahoe -Dunix -Dhcx"
+#define CPP_PREDEFINES "-Dtahoe -Dunix -Dhcx -Asystem(unix) -Acpu(tahoe) -Amachine(tahoe)"
 
 #undef DBX_DEBUGGING_INFO
 #define SDB_DEBUGGING_INFO
@@ -65,7 +65,7 @@ the Free Software Foundation, 675 Mass A
   output_file_directive ((FILE), main_input_filename);
 
 #define ASM_OUTPUT_ASCII(FILE, PTR, SIZE)		\
-{							\
+do {							\
   unsigned char *_p = (PTR);				\
   int _thissize = (SIZE);				\
   fprintf ((FILE), "\t.ascii \"");			\
@@ -83,4 +83,4 @@ the Free Software Foundation, 675 Mass A
 	}						\
     }							\
   fprintf ((FILE), "\"\n");				\
-}
+} while (0)