--- gcc/config/m68k/3b1.h	2018/04/24 18:14:17	1.1.1.2
+++ gcc/config/m68k/3b1.h	2018/04/24 18:28:00	1.1.1.4
@@ -1,10 +1,8 @@
 /* Definitions of target machine for GNU compiler.
    AT&T UNIX PC version (pc7300, 3b1)
+   Written by Alex Crain (alex@umbc3.umd.edu).
 
-   Written by Alex Crain
-   bug reports to alex@umbc3.umd.edu
-
-   Copyright (C) 1987 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1993 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -20,7 +18,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.  */
 
 #define SGS_SWITCH_TABLES	/* Different switch table handling */
 
@@ -99,11 +98,6 @@ output_file_directive ((FILE), main_inpu
     : GET_MODE_BITSIZE (MODE) < PARM_BOUNDARY)				\
    ? downward : none)
 
-/* Override part of the obstack macros.  */
-
-#define __PTR_TO_INT(P) ((int)(P))
-#define __INT_TO_PTR(P) ((char *)(P))
-
 /* The 3b1 does not have `atexit'.  */
 
 #undef HAVE_ATEXIT
@@ -194,7 +188,7 @@ do { long l;					\
 /* Yet another null terminated string format. */
 
 #define ASM_OUTPUT_ASCII(FILE,PTR,LEN) \
-  { register int sp = 0, lp = 0; \
+  do { register int sp = 0, lp = 0; \
     fprintf ((FILE), "\tbyte\t"); \
   loop: \
     if ((PTR)[sp] > ' ' && ! ((PTR)[sp] & 0x80) && (PTR)[sp] != '\\') \
@@ -210,7 +204,7 @@ do { long l;					\
 	else \
 	  putc (',', (FILE)); \
 	goto loop; } \
-    putc ('\n', (FILE)); }
+    putc ('\n', (FILE)); } while (0)
 
 /* Note that in the case of the movhi which fetches an element of
    an ADDR_DIFF_VEC the offset output is too large by 2.