dummy import to prevent merge lossage

From-SVN: r24349

gcc/config/1750a/1750a.c

@@ -19,13 +19,10 @@ 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.  */
 
-#ifndef FILE
-#include <stdio.h>
-#endif
-#include <string.h>
-
 #define __datalbl
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 #include "rtl.h"
 #include "tree.h"
 #include "expr.h"

gcc/config/a29k/a29k.c

 /* Subroutines used for code generation on AMD Am29000.
-   Copyright (C) 1987, 88, 90-94, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1987, 88, 90-94, 1995, 1997 Free Software Foundation, Inc.
    Contributed by Richard Kenner (kenner@nyu.edu)
 
 This file is part of GNU CC.
@@ -19,8 +19,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.  */
 
-#include <stdio.h>
 #include "config.h"
+#include <stdio.h>
 #include "rtl.h"
 #include "regs.h"
 #include "hard-reg-set.h"

gcc/config/arm/t-linux

@@ -10,7 +10,7 @@ ENQUIRE=
 CROSS_LIBGCC1 = libgcc1-asm.a
 LIBGCC1 = libgcc1-asm.a
 LIB1ASMSRC = arm/lib1funcs.asm
-LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls
+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
 
 MULTILIB_OPTIONS = mapcs-32
 MULTILIB_DIRNAMES = apcs-32

gcc/config/arm/t-netbsd

@@ -5,7 +5,3 @@ LIBGCC2_CFLAGS=-O2 -fomit-frame-pointer $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) -g0
 
 # Don't build enquire
 ENQUIRE=
-
-CROSS_LIBGCC1 = libgcc1-asm.a
-LIB1ASMSRC = arm/lib1funcs.asm
-LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls

gcc/config/arm/x-riscix

@@ -6,4 +6,3 @@ X_CFLAGS= -DPOSIX -Dopterr=gcc_opterr -Doptind=gcc_optind \
 OLDCC=/usr/ucb/cc
 CC=$(OLDCC)
 FIXPROTO_DEFINES= -D_POSIX_SOURCE -D_XOPEN_C -D_BSD_C -D_XOPEN_SOURCE
-INSTALL=$(srcdir)/install.sh -c

gcc/config/arm/xm-arm.h

@@ -44,12 +44,6 @@ Boston, MA 02111-1307, USA.  */
 #define USE_C_ALLOCA
 #endif
 
-/* Define this if the library function putenv is available on your machine */
-#define HAVE_PUTENV 1
-
-/* Define this if the library function vprintf is available on your machine */
-#define HAVE_VPRINTF 1
-
 /* Define this to be 1 if you know the host compiler supports prototypes, even
    if it doesn't define __STDC__, or define it to be 0 if you do not want any
    prototypes when compiling GNU CC. */

gcc/config/clipper/clix.h

 /* Definitions of target machine for GNU compiler.  Clipper/Clix version.
-   Copyright (C) 1988, 1993, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1993, 1996, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -31,6 +31,8 @@ Boston, MA 02111-1307, USA.  */
 
 #undef LIB_SPEC
 
+#define TARGET_MEM_FUNCTIONS
+
 #undef HAVE_ATEXIT
 #define HAVE_ATEXIT
 

gcc/config/clipper/xm-clix.h

@@ -27,13 +27,4 @@
 /* isinf isn't there, but finite is. */
 #define isinf(x) (!finite(x))
 
-
 #define USG
-
-#define bcopy(a,b,c) memcpy (b,a,c)
-#define bzero(a,b) memset (a,0,b)
-#define bcmp(a,b,c) memcmp (a,b,c)
-#define index strchr
-#define rindex strrchr
-
-#define TARGET_MEM_FUNCTIONS

gcc/config/convex/convex.c

 /* Subroutines for insn-output.c for Convex.
-   Copyright (C) 1988, 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1993, 1994, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -19,6 +19,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
+#include <stdio.h>
 #include "tree.h"
 #include "rtl.h"
 #include "regs.h"
@@ -31,9 +32,6 @@ Boston, MA 02111-1307, USA.  */
 #include "output.h"
 #include "expr.h"
 
-#undef NULL
-#include <stdio.h>
-
 /* Tables used in convex.h */
 
 char regno_ok_for_index_p_base[1 + LAST_VIRTUAL_REGISTER + 1];

gcc/config/convex/x-convex

 # ld can make exe's c2-only if this lib is searched even though not loaded
-CCLIBFLAGS = -tm c1 
+CCLIBFLAGS = -tm c1
 
 # Use -pcc to avoid surprises.
 CC = cc -pcc

gcc/config/convex/xm-convex.h

 /* Configuration for GNU C-compiler for Convex.
-   Copyright (C) 1989, 1993 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -42,11 +42,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define P_tmpdir	"/tmp/"
 
-/* Use memcpy and memset -- either would work but these get inlined. */
-
-#define bcopy(a,b,c) memcpy (b,a,c)
-#define bzero(a,b) memset (a,0,b)
-
 /* Convex uses Vax or IEEE floats.
    Both formats have Vax semantics. */
 

gcc/config/elxsi/elxsi.c

 /* Subroutines for insn-output.c for GNU compiler.  Elxsi version.
-   Copyright (C) 1987, 1992 Free Software Foundation, Inc
+   Copyright (C) 1987, 1992, 1997 Free Software Foundation, Inc
    This port, done by Mike Stump <mrs@cygnus.com> in 1988, and is the first
    64 bit port of GNU CC.
    Based upon the VAX port.
@@ -21,8 +21,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.  */
 
-#include <stdio.h>
 #include "config.h"
+#include <stdio.h>
 #include "rtl.h"
 
 extern char *reg_names[];

gcc/config/fx80/fx80.c

 /* Subroutines for insn-output.c for Alliant FX computers.
-   Copyright (C) 1989,1991 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1991, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -20,8 +20,8 @@ Boston, MA 02111-1307, USA.  */
 
 
 /* Some output-actions in alliant.md need these.  */
-#include <stdio.h>
 #include "config.h"
+#include <stdio.h>
 #include "rtl.h"
 #include "regs.h"
 #include "hard-reg-set.h"

gcc/config/gnu.h

 /* Configuration common to all targets running the GNU system.  */
 
-/* Macro to produce CPP_PREDEFINES for GNU on a given machine.  */
-#define GNU_CPP_PREDEFINES(machine) \
-"-D" machine " -Acpu(" machine ") -Amachine(" machine ") \
--Dunix -Asystem(unix) \
--DMACH -Asystem(mach) \
--D__GNU__ -Asystem(gnu)"
-
 /* Provide GCC options for standard feature-test macros.  */
 #undef CPP_SPEC
 #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{bsd:-D_BSD_SOURCE}"

gcc/config/i370/i370.c

 /* Subroutines for insn-output.c for System/370.
-   Copyright (C) 1989, 1993, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993, 1995, 1997 Free Software Foundation, Inc.
    Contributed by Jan Stein (jan@cd.chalmers.se).
    Modified for MVS C/370 by Dave Pitts (dpitts@nyx.cs.du.edu)
 
@@ -20,10 +20,10 @@ 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.  */
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include "config.h"
 #include "rtl.h"
 #include "regs.h"
 #include "hard-reg-set.h"
@@ -35,6 +35,11 @@ Boston, MA 02111-1307, USA.  */
 #include "insn-attr.h"
 #include "flags.h"
 #include "recog.h"
+#ifdef sun
+#include <sys/types.h>
+#include <ctype.h>
+#endif
+#include <time.h>
 
 
 /* Label node, this structure is used to keep track of labels on the
@@ -285,7 +290,7 @@ mvs_add_label (id)
   label_anchor = lp;
 }
 
-/* Check to see if the label is in the list.  If 1 is returned then a load 
+/* Check to see if the label is in the list.  If 1 is returned then a load
    and branch on register must be generated.
    ID is the label number of the label being checked.  */
 
@@ -480,3 +485,100 @@ unsigned_jump_follows_p (insn)
   return GET_CODE (insn) != GE && GET_CODE (insn) != GT
     && GET_CODE (insn) != LE && GET_CODE (insn) != LT;
 }
+
+void
+i370_function_prolog (f, l)
+     FILE *f;
+     int l;
+{
+#if MACROPROLOGUE == 1
+  fprintf (f, "\tEDCPRLG USRDSAL=%d,BASEREG=%d\n",
+	   STACK_POINTER_OFFSET + l - 120 +
+	   current_function_outgoing_args_size, BASE_REGISTER);
+  fprintf (f, "PG%d\tEQU\t*\n", mvs_page_num );
+  fprintf (f, "\tLR\t11,1\n");
+  fprintf (f, "\tL\t%d,=A(PGT%d)\n", PAGE_REGISTER, mvs_page_num);
+  mvs_page_code = 6;
+  mvs_page_lit = 4;
+  mvs_check_page (f, 0, 0);
+  function_base_page = mvs_page_num;
+#else /* MACROPROLOGUE != 1 */
+  static int function_label_index = 1;
+  static int function_first = 0;
+  static int function_year, function_month, function_day;
+  static int function_hour, function_minute, function_second;
+  int i;
+  if (!function_first)
+    {
+      struct tm *function_time;
+      time_t lcltime;
+      time (&lcltime);
+      function_time = localtime (&lcltime);
+      function_year = function_time->tm_year + 1900;
+      function_month = function_time->tm_mon + 1;
+      function_day = function_time->tm_mday;
+      function_hour = function_time->tm_hour;
+      function_minute = function_time->tm_min;
+      function_second = function_time->tm_sec;
+      fprintf (f, "PPA2\tDS\t0F\n");
+      fprintf (f, "\tDC\tX'03',X'00',X'33',X'00'\n");
+      fprintf (f, "\tDC\tV(CEESTART),A(0)\n");
+      fprintf (f, "\tDC\tA(CEETIMES)\n");
+      fprintf (f, "CEETIMES\tDS\t0F\n");
+      fprintf (f, "\tDC\tCL4'%d',CL4'%02d%02d',CL6'%02d%02d00'\n",
+    		 function_year, function_month, function_day,
+    		 function_hour, function_minute, function_second);
+      fprintf (f, "\tDC\tCL2'01',CL4'0100'\n");
+    }
+  fprintf (f, "$DSD%03d\tDSECT\n", function_label_index);
+  fprintf (f, "\tDS\tD\n");
+  fprintf (f, "\tDS\tCL(%d)\n", STACK_POINTER_OFFSET + l
+			+ current_function_outgoing_args_size);
+  fprintf (f, "\tORG\t$DSD%03d\n", function_label_index);
+  fprintf (f, "\tDS\tCL(120+8)\n");
+  fprintf (f, "\tORG\n");
+  fprintf (f, "\tDS\t0D\n");
+  fprintf (f, "$DSL%03d\tEQU\t*-$DSD%03d-8\n", function_label_index,
+	   function_label_index);
+  fprintf (f, "\tDS\t0H\n");
+  assemble_name (f, mvs_function_name);
+  fprintf (f, "\tEQU\t*\n");
+  fprintf (f, "\tUSING\t*,15\n");
+  fprintf (f, "\tB\tFPL%03d\n", function_label_index);
+  fprintf (f, "\tDC\tAL1(FPL%03d+4-*)\n", function_label_index + 1);
+  fprintf (f, "\tDC\tX'CE',X'A0',AL1(16)\n");
+  fprintf (f, "\tDC\tAL4(PPA2)\n");
+  fprintf (f, "\tDC\tAL4(0)\n");
+  fprintf (f, "\tDC\tAL4($DSL%03d)\n", function_label_index);
+  fprintf (f, "FPL%03d\tEQU\t*\n", function_label_index + 1);
+  fprintf (f, "\tDC\tAL2(%d),C'%s'\n", strlen (mvs_function_name),
+	mvs_function_name);
+  fprintf (f, "FPL%03d\tDS\t0H\n", function_label_index);
+  fprintf (f, "\tSTM\t14,12,12(13)\n");
+  fprintf (f, "\tL\t2,76(,13)\n");
+  fprintf (f, "\tL\t0,16(,15)\n");
+  fprintf (f, "\tALR\t0,2\n");
+  fprintf (f, "\tCL\t0,12(,12)\n");
+  fprintf (f, "\tBNH\t*+10\n");
+  fprintf (f, "\tL\t15,116(,12)\n");
+  fprintf (f, "\tBALR\t14,15\n");
+  fprintf (f, "\tL\t15,72(,13)\n");
+  fprintf (f, "\tSTM\t15,0,72(2)\n");
+  fprintf (f, "\tMVI\t0(2),X'10'\n");
+  fprintf (f, "\tST\t2,8(,13)\n ");
+  fprintf (f, "\tST\t13,4(,2)\n ");
+  fprintf (f, "\tLR\t13,2\n");
+  fprintf (f, "\tDROP\t15\n");
+  fprintf (f, "\tBALR\t%d,0\n", BASE_REGISTER);
+  fprintf (f, "PG%d\tEQU\t*\n", mvs_page_num );
+  fprintf (f, "\tUSING\t*,%d\n", BASE_REGISTER);
+  fprintf (f, "\tLR\t11,1\n");
+  fprintf (f, "\tL\t%d,=A(PGT%d)\n", PAGE_REGISTER, mvs_page_num);
+  mvs_page_code = 4;
+  mvs_page_lit = 4;
+  mvs_check_page (f, 0, 0);
+  function_base_page = mvs_page_num;
+  function_first = 1;
+  function_label_index += 2;
+#endif /* MACROPROLOGUE */
+}

gcc/config/i370/xm-i370.h

 /* Configuration for GNU C-compiler for System/370.
-   Copyright (C) 1989, 1993 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993, 1997 Free Software Foundation, Inc.
    Contributed by Jan Stein (jan@cd.chalmers.se).
    Modified for MVS C/370 by Dave Pitts (dpitts@nyx.cs.du.edu)
 
@@ -44,10 +44,6 @@ Boston, MA 02111-1307, USA.  */
 
 #include "tm.h"
 
-#define bcopy(a,b,c) memcpy (b,a,c)
-#define bzero(a,b) memset (a,0,b)
-#define bcmp(a,b,c) memcmp (a,b,c)
-
 /* Arguments to use with `exit'.  */
 
 #define SUCCESS_EXIT_CODE	0

gcc/config/i386/gmon-sol2.c

@@ -31,23 +31,18 @@
  * SUCH DAMAGE.
  */
 
-/* 
- * Re rework of the solaris 2 version of gmon by J.W.Hawtin 12/8/1996
- * Does not work right yet.
- */
-
 /*
- * This is a modified gmon.c by J.W.Hawtin <J.W.Hawtin@lboro.ac.uk>,
+ * This is a modified gmon.c by J.W.Hawtin <oolon@ankh.org>,
  * 14/8/96 based on the original gmon.c in GCC and the hacked version
  * solaris 2 sparc version (config/sparc/gmon-sol.c) by Mark Eichin. To do
- * process profiling on solaris 2.4 X86
+ * process profiling on solaris 2.X X86
  *
  * It must be used in conjunction with sol2-gc1.asm, which is used to start
  * and stop process monitoring.
  *
  * Differences.
  *
- * On Solaris 2 _mcount is called my library functions not mcount, so support
+ * On Solaris 2 _mcount is called by library functions not mcount, so support
  * has been added for both.
  *
  * Also the prototype for profil() is different
@@ -58,7 +53,7 @@
  *
  * Notes
  *
- * This code could easily be integrated with the orginal gmon.c and perhaps
+ * This code could easily be integrated with the original gmon.c and perhaps
  * should be.
  */
 
@@ -90,7 +85,7 @@ struct phdr {
 #define HASHFRACTION 1
 #define ARCDENSITY 2
 #define MINARCS 50
-#define BASEADDRESS 0x8000000 /* On Solaris 2 X86 all excutables start here
+#define BASEADDRESS 0x8000000 /* On Solaris 2 X86 all executables start here
 				 and not at 0 */ 
 
 struct tostruct {
@@ -264,6 +259,7 @@ internal_mcount()
 	register struct tostruct	*top;
 	register struct tostruct	*prevtop;
 	register long			toindex;
+	static char already_setup;
 
 	/*
 	 *	find the return address for mcount,
@@ -277,6 +273,17 @@ internal_mcount()
 	   This identifies the caller of the function just entered.  */
 	frompcindex = (void *) __builtin_return_address (1);
 
+	if(!already_setup) {
+          extern etext();
+	  already_setup = 1;
+/*	  monstartup(0, etext); */
+	  monstartup(0x08040000, etext);
+#ifdef USE_ONEXIT
+	  on_exit(_mcleanup, 0);
+#else
+	  atexit(_mcleanup);
+#endif
+	}
 	/*
 	 *	check that we are profiling
 	 *	and that we aren't recursively invoked.

gcc/config/i386/sol2-c1.asm

 ! crt1.s for Solaris 2, x86
 
-!   Copyright (C) 1993 Free Software Foundation, Inc.
+!   Copyright (C) 1993, 1998 Free Software Foundation, Inc.
 !   Written By Fred Fish, Nov 1992
 ! 
 ! This file is free software; you can redistribute it and/or modify it
@@ -149,7 +149,7 @@ _start:
 ! A dummy profiling support routine for non-profiling executables,
 ! in case we link in some objects that have been compiled for profiling.
 
-	.globl	_mcount
+	.weak	_mcount
 _mcount:
 	ret
 	.type	_mcount,@function

gcc/config/i386/sol2-gc1.asm

@@ -41,7 +41,7 @@
 ! information obtained by single stepping executables on other i386 SVR4
 ! implementations.  This file is the first thing linked into any executable.
 
-! This is a modified crt1.s by J.W.Hawtin <J.W.Hawtin@lboro.ac.uk> 15/8/96, 
+! This is a modified crt1.s by J.W.Hawtin <oolon@ankh.org> 15/8/96, 
 ! to allow program profiling, by calling monstartup on entry and _mcleanup 
 ! on exit
 

gcc/config/i386/sol2dbg.h

@@ -14,3 +14,14 @@
 #ifdef DWARF_DEBUGGING_INFO
 #undef DWARF_DEBUGGING_INFO
 #endif
+
+/*
+  Changed from config/svr4.h in the following ways:
+
+  - Added "%{V}".
+  - Modified "{%v:-V}" to take into account "%{V}".
+  - Added "-s" so that stabs are saved in the final executable.  */
+
+#undef ASM_SPEC
+#define ASM_SPEC \
+  "%{V} %{v:%{!V:-V}} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*} -s"

gcc/config/i386/x-osfrose

@@ -17,7 +17,6 @@ DEBUG		=
 DEBUG_COLLECT	= # -DDEBUG
 CCLIBFLAGS	= -O -DNO_HALF_PIC
 GCC_CFLAGS	= $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS) -B./ -DPOSIX -DNO_HALF_PIC
-INSTALL		= installbsd -c
 LDFLAGS		=
 MSTATS		= # -mstats
 OLDCC		= /usr/ccs/gcc/gcc

gcc/config/i386/xm-aix.h

-/* Configuration for GNU C-compiler for IBM PS/2 running AIX/386.
-   Copyright (C) 1988, 1993 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-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, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#define USG
-
 #undef TRUE
 #undef FALSE
-
-#include "i386/xm-i386.h"
-
-#define bcopy(a,b,c) memcpy (b,a,c)
-#define bzero(a,b) memset (a,0,b)
-#define bcmp(a,b,c) memcmp (a,b,c)
-
-/* If not compiled with GNU C, use the portable alloca.  */
-#ifndef __GNUC__
-#define USE_C_ALLOCA
-#endif
-
-#define HAVE_PUTENV

gcc/config/i386/xm-isc.h

-#include "i386/xm-sysv3.h"
-
 #ifndef REAL_ARITHMETIC
 #define REAL_VALUE_ATOF(x, mode) strtod ((x), (char **)0)
 extern double strtod ();

gcc/config/i386/xm-os2.h

 /* Configuration for GNU compiler
    for an Intel i386 or later processor running OS/2 2.x.
-   Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
-   Contributed by Samuel Figueroa (figueroa@cs.nyu.edu)
+   Copyright (C) 1993, 1994, 1995, 1997, 1998 Free Software Foundation, Inc.
+   Contributed by Samuel Figueroa (figueroa@apple.com)
 
 This file is part of GNU CC.
 
@@ -28,20 +28,24 @@ Boston, MA 02111-1307, USA.  */
 #include <stdlib.h> /* this defines alloca */
 #define USG
 #define ONLY_INT_FIELDS
-#define HAVE_PUTENV
 #define USE_PROTOTYPES 1
-#define bcmp(a,b,c) memcmp (a,b,c)
-#define bcopy(a,b,c) memcpy (b,a,c)
-#define bzero(a,b) memset (a,0,b)
-#define index  strchr
-#define rindex strrchr
 #define strcasecmp stricmp
 #define kill(a,b) raise(b)
 #define mktemp tmpnam
 #else
+#ifdef __EMX__
+#define EMX
+#define USG
+#define BSTRING
+#define HAVE_PUTENV
+#define HAVE_VPRINTF
+#define HAVE_STRERROR
+#define strcasecmp stricmp
+#else
 #define ____386BSD____
 int spawnv (int modeflag, char *path, char *argv[]);
 int spawnvp (int modeflag, char *path, char *argv[]);
+#endif /* __EMX__ */
 #endif /* __IBMC__ */
 
 #ifndef PATH_SEPARATOR
@@ -52,6 +56,14 @@ int spawnvp (int modeflag, char *path, char *argv[]);
 #endif
 
 #define EXECUTABLE_SUFFIX ".exe"
+
+/* The EMX compiler uses regular .o files */
+#ifndef __EMX__
 #define OBJECT_SUFFIX ".obj"
+#endif
+
+/* This is required to make temporary file names unique on file
+   systems which severely restrict the length of file names. */
+#define MKTEMP_EACH_FILE
 
 #include "i386/xm-i386.h"

gcc/config/i386/xm-osf.h

-/* Configuration for GNU C-compiler for 386 running OSF/1
-   Copyright (C) 1994 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-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, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
 #undef TRUE
 #undef FALSE
-
-#include "i386/xm-i386.h"
-
-#define bcopy(a,b,c) memcpy (b,a,c)
-#define bzero(a,b) memset (a,0,b)
-#define bcmp(a,b,c) memcmp (a,b,c)
-
-#define HAVE_PUTENV
-#define HAVE_VPRINTF
-

gcc/config/i386/xm-sco.h

 /* Configuration for GCC for Intel i386 running SCO.  */
 
-#include "i386/xm-sysv3.h"
-
-/* On SCO 3.2.1, ldexp rejects values outside [0.5, 1). */
-
-#define BROKEN_LDEXP
-
 /* Big buffers improve performance.  */
 
 #define IO_BUFFER_SIZE (0x8000 - 1024)
 
-/* SCO has a very small ARG_MAX.  */
-#define SMALL_ARG_MAX
-
 #ifndef __GNUC__
 /* The SCO compiler gets it wrong, and treats enumerated bitfields
    as signed quantities, making it impossible to use an 8-bit enum
@@ -20,6 +11,3 @@
 #define ONLY_INT_FIELDS 1
 #define CODE_FIELD_BUG 1
 #endif
-
-/* SCO lacks sys_siglist.  */
-#define NO_SYS_SIGLIST

gcc/config/i386/xm-vsta.h

-/* Configuration for GNU C-compiler for Intel 80386.
-   Copyright (C) 1994 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-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, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#define NO_STAB_H
-
-#include "i386/xm-i386.h"
-
 /* Use semicolons to separate elements of a path.  */
 #define PATH_SEPARATOR ';'

gcc/config/i860/fx2800.h

 /* Target definitions for GNU compiler for Alliant FX/2800
    running Concentrix 2.2
-   Copyright (C) 1991, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1996, 1998 Free Software Foundation, Inc.
    Contributed by Howard Chu (hyc@hanauma.jpl.nasa.gov).
 
 This file is part of GNU CC.
@@ -252,7 +252,7 @@ Boston, MA 02111-1307, USA.  */
 
 #define DATA_ALIGNMENT(dummy,align)	\
 	((TREE_PUBLIC (decl) &&	\
-	 (TREE_CODE (TREE_TYPE (decl))==POINTER_TYPE)) ? 64:align)
+	 (POINTER_TYPE_P (TREE_TYPE (decl)))) ? 64: align)
 
 #undef FUNCTION_PROFILER
 #define FUNCTION_PROFILER(FILE, LABELNO)	\

gcc/config/m68k/a-ux.h

 /* Definitions for Motorola 680x0 running A/UX
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1998 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -114,10 +114,10 @@ crt2.o%s "
    For A/UX generate the result in d0, a0, or fp0 as appropriate. */
 
 #undef FUNCTION_VALUE
-#define FUNCTION_VALUE(VALTYPE, FUNC)                                   \
-  (TREE_CODE (VALTYPE) == REAL_TYPE && TARGET_68881                     \
-   ? gen_rtx (REG, TYPE_MODE (VALTYPE), 16)                             \
-   : (TREE_CODE (VALTYPE) == POINTER_TYPE                               \
+#define FUNCTION_VALUE(VALTYPE, FUNC)                                  \
+  (TREE_CODE (VALTYPE) == REAL_TYPE && TARGET_68881                    \
+   ? gen_rtx (REG, TYPE_MODE (VALTYPE), 16)                            \
+   : (POINTER_TYPE_P (VALTYPE)		                               \
       ? gen_rtx (REG, TYPE_MODE (VALTYPE), 8)                           \
       : gen_rtx (REG, TYPE_MODE (VALTYPE), 0)))
                     

gcc/config/m68k/auxas.h

 /* Definitions for Motorola 680x0 running A/UX using /bin/as
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA.  */
 #define ASM_SPEC "%{m68030:-68030 }%{m68040:-68040 }"
 
 /* Modify AT&T SGS assembler syntax */
-/* A/UX's as doesn't do dots in pseodo-ops */
+/* A/UX's as doesn't do dots in pseudo-ops */
 
 #define SDB_DEBUGGING_INFO
 

gcc/config/m68k/linux-aout.h

-/* Definitions for Motorola m68k running Linux
+/* Definitions for Motorola m68k running Linux-based GNU systems.
    Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
@@ -50,7 +50,7 @@ Boston, MA 02111-1307, USA.  */
 #undef LIB_SPEC
 #if 1
 /* We no longer link with libc_p.a or libg.a by default.  If you want
-   to profile or debug the Linux C library, please add -lc_p or -ggdb
+   to profile or debug the GNU/Linux C library, please add -lc_p or -ggdb
    to LDFLAGS at the link time, respectively.  */
 #define LIB_SPEC \
   "%{mieee-fp:-lieee} %{p:-lgmon} %{pg:-lgmon} %{!ggdb:-lc} %{ggdb:-lg}"

gcc/config/m68k/mot3300-crt0.S

@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA.  */
 # define FILE(n)	file	n
 # define GLOBAL_SYM(s)	global	s
 # define LOCAL_LABEL(l)	L%##l
-# define SECTION(n)	section	n
+# define IDENT(s)	ident	s
 # define TEXT		text
 #else /* Assume we are using GNU as.  */
 # define COMM		.comm
@@ -35,8 +35,7 @@ Boston, MA 02111-1307, USA.  */
 # define FILE(name)	.file	name
 # define GLOBAL_SYM(s)	.globl	s
 # define LOCAL_LABEL(l)	.L.##l
-# define SECTION(n)	.section	n
-# define STRING(s)	.asciz	s
+# define IDENT(s)	.section .comment;.asciz s
 # define TEXT		.text
 #endif
 
@@ -86,24 +85,14 @@ LOCAL_LABEL(isatty):
 	trap	&0
 	nop
 
+	GLOBAL_SYM (__stop_monitor)
+__stop_monitor:
+	rts
 	EVEN
 
 	COMM	splimit%,4
 	COMM	environ,4
 
-	COMM	mcount,4
-	COMM	mcount%,4
-	COMM	monitor,4
-
-#ifdef STRING
-	SECTION (.comment)
-	STRING ("$Id: mot3300-crt0.S,v 1.1 1997/08/11 15:57:32 law Exp $\n")
-	STRING ("Contributed by manfred@lts.sel.alcatel.de (Manfred Hollstein, Germany)\n")
-#else
-	byte	'C,'o,'n,'t,'r,'i,'b,'u,'t,'e,'d,' ,'b,'y
-	byte	' ,'m,'a,'n,'f,'r,'e,'d,'@,'l,'t,'s,'.,'s
-	byte	'e,'l,'.,'a,'l,'c,'a,'t,'e,'l,'.,'d,'e,' 
-	byte	'(,'M,'a,'n,'f,'r,'e,'d,' ,'H,'o,'l,'l,'s
-	byte	't,'e,'i,'n,',,' ,'G,'e,'r,'m,'a,'n,'y,')
-	byte	10,0
-#endif
+	IDENT ("$Id: mot3300-crt0.S,v 1.1.1.2 1998/01/14 19:39:06 law Exp $")
+	IDENT ("Contributed by Manfred Hollstein (manfred@lts.sel.alcatel.de)")
+	IDENT ("Corrections by Philippe De Muyter (phdm@macqel.be)")

gcc/config/m68k/mot3300Mcrt0.S

 /* The start module mcrt0.s for the SysV68 Motorola 3300 Delta Series.
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
    Contributed by Manfred Hollstein (manfred@lts.sel.alcatel.de).
 
 This file is part of GNU CC.
@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA.  */
 # define FILE(n)	file	n
 # define GLOBAL_SYM(s)	global	s
 # define LOCAL_LABEL(l)	L%##l
-# define SECTION(n)	section	n
+# define IDENT(s)	ident	s
 # define TEXT		text
 #else /* Assume we are using GNU as.  */
 # define COMM		.comm
@@ -35,8 +35,7 @@ Boston, MA 02111-1307, USA.  */
 # define FILE(name)	.file	name
 # define GLOBAL_SYM(s)	.globl	s
 # define LOCAL_LABEL(l)	.L.##l
-# define SECTION(n)	.section	n
-# define STRING(s)	.asciz	s
+# define IDENT(s)	.section .comment;.asciz s
 # define TEXT		.text
 #endif
 
@@ -110,30 +109,27 @@ LOCAL_LABEL(isatty):
 	jsr	exit
 _exit:	moveq	&1,%d0
 	trap	&0
-	
-	GLOBAL_SYM (mcount)
 
-	EVEN
-mcount:	bra	mcount%
+	GLOBAL_SYM (__stop_monitor)
+__stop_monitor:
+	clr.l	-(%sp)
+	jsr	monitor
+	add.w	&4,%sp
+	rts
 
 LOCAL_LABEL(errtxt):
-#ifdef STRING
-	STRING ("No space for monitor buffer\n")
-#else
 	byte	'N,'o,' ,'s,'p,'a,'c,'e,' ,'f,'o,'r,' ,'m,'o,'n
-	byte	'i,'t,'o,'r,' ,'b,'u,'f,'f,'e,'r,'\n,0
-#endif
+	byte	'i,'t,'o,'r,' ,'b,'u,'f,'f,'e,'r,'\n
+LOCAL_LABEL(errtxt_end):
 
 	EVEN
 LOCAL_LABEL(3):
-	mov.l	&28,-(%sp)
-	mov.l	&LOCAL_LABEL(errtxt),-(%sp)
-	moveq	&2,%d0
-	mov.l	%d0,-(%sp)
+	pea	LOCAL_LABEL(errtxt_end)-LOCAL_LABEL(errtxt)
+	pea	LOCAL_LABEL(errtxt)(%pc)
+	pea	2
 	jsr	write
 	bra.b	_exit
 LOCAL_LABEL(endofstart):
-	nop
 	
 	EVEN
 
@@ -141,15 +137,6 @@ LOCAL_LABEL(endofstart):
 	COMM	environ,4
 	COMM	_countbase,4
 
-#ifdef STRING
-	SECTION (.comment)
-	STRING ("$Id: mot3300Mcrt0.S,v 1.1 1997/08/11 15:57:32 law Exp $\n")
-	STRING ("Contributed by manfred@lts.sel.alcatel.de (Manfred Hollstein, Germany)\n")
-#else
-	byte	'C,'o,'n,'t,'r,'i,'b,'u,'t,'e,'d,' ,'b,'y
-	byte	' ,'m,'a,'n,'f,'r,'e,'d,'@,'l,'t,'s,'.,'s
-	byte	'e,'l,'.,'a,'l,'c,'a,'t,'e,'l,'.,'d,'e,' 
-	byte	'(,'M,'a,'n,'f,'r,'e,'d,' ,'H,'o,'l,'l,'s
-	byte	't,'e,'i,'n,',,' ,'G,'e,'r,'m,'a,'n,'y,')
-	byte	10,0
-#endif
+	IDENT ("$Id: mot3300Mcrt0.S,v 1.1.1.2 1998/01/14 19:39:08 law Exp $")
+	IDENT ("Contributed by Manfred Hollstein (manfred@lts.sel.alcatel.de)")
+	IDENT ("Corrections by Philippe De Muyter (phdm@macqel.be)")

gcc/config/m68k/sun2o4.h

-/* Definitions of target machine for GNU compiler.  Sun 2 running Sunos 4.
-   Copyright (C) 1987, 1988, 1993, 1996 Free Software Foundation, Inc.
+/* Definitions of target machine for GNU compiler.  Sun 2 running SunOS 4.
+   Copyright (C) 1987, 1988, 1993, 1996, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 

gcc/config/m68k/sun3mach.h

@@ -6,7 +6,7 @@
 /* Specify extra dir to search for include files.  */
 #define SYSTEM_INCLUDE_DIR "/usr/mach/include"
 
-/* LINK_SPEC is needed only for Sunos 4.  */
+/* LINK_SPEC is needed only for SunOS 4.  */
 
 #undef LINK_SPEC
 

gcc/config/m68k/sun3n3.h

 #include "m68k/sun3n.h"
 
-/* LINK_SPEC is needed only for Sunos 4.  */
+/* LINK_SPEC is needed only for SunOS 4.  */
 
 #undef LINK_SPEC

gcc/config/m68k/sun3o3.h

 #include "m68k/sun3.h"
 
-/* LINK_SPEC is needed only for Sunos 4.  */
+/* LINK_SPEC is needed only for SunOS 4.  */
 
 #undef LINK_SPEC

gcc/config/m68k/xm-3b1.h

-#define USG
-
-#include "m68k/xm-m68k.h"
-
-#define bcopy(a,b,c) memcpy (b,a,c)
-#define bzero(a,b) memset (a,0,b)
-#define bcmp(a,b,c) memcmp (a,b,c)
-#define index strchr
-#define rindex strrchr
-
 /* Override part of the obstack macros.  */
 
 #define __PTR_TO_INT(P) ((int)(P))

gcc/config/m68k/xm-atari.h

-/* Definitions of host machine for GNU compiler.
-   Atari TT ASV version.
-   Copyright (C) 1994, 1995 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-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, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#include "m68k/xm-m68kv.h"	/* Use the System V flavor of m68k host */
-
-#define HAVE_VPRINTF            /* Host has vprintf() in library */
-
 /* Add HZ define if missing */
 
 #ifndef HZ
 #define HZ 100			/* System clock */
 #endif
-
-/* Define FULL_PROTOTYPES for protoize.c, to get <unistd.h> included.
-   We need this file for things like R_OK, not necessarily prototypes. */
-
-#define FULL_PROTOTYPES
-
-#if defined (__GNUC__) && __GNUC__ == 1
-#define alloca __builtin_alloca
-#endif
-
-/* The m88k and mips ports make use of fancy_abort to give possibly helpful
-   abort information rather than just dumping core.  They do it in their
-   tm-* files.  It seems more logical that this is a characteristic of
-   the host machine and not the target machine, so we do it here. */
-
-#define abort fancy_abort       /* give possibly helpful abort info */

gcc/config/m68k/xm-crds.h

-#define USG
-
-#ifndef unos
-#define unos
-#endif
-
-#include "m68k/xm-m68k.h"
-
-#define bcopy(a,b,c) memcpy (b,a,c)
-#define bzero(a,b) memset (a,0,b)
-#define bcmp(a,b,c) memcmp (a,b,c)
-
-/* UNOS has vprintf() */ 
-#define HAVE_VPRINTF
-
 /* Avoid conflict with C library by changing name of this symbol.  */
 #define gettime gcc_gettime
 
-#ifndef __GNUC__
-#define USE_C_ALLOCA
-#endif
-
 /* Override part of the obstack macros.  */
 
 #define __PTR_TO_INT(P) ((int)(P))

gcc/config/m68k/xm-next.h

-#include "m68k/xm-m68k.h"
-
 /* malloc does better with chunks the size of a page.  */ 
 
 #define OBSTACK_CHUNK_SIZE (getpagesize ())

gcc/config/m68k/xm-plexus.h

 /* Host environment for 68000's running System V.  */
 
-#include "m68k/xm-m68k.h"
-
-#define USG
-#define bcopy(a,b,c) memcpy (b,a,c)
-#define bzero(a,b) memset (a,0,b)
-#define bcmp(a,b,c) memcmp (a,b,c)
-
-#define rindex strrchr
-#define index strchr
-
-#ifndef __GNUC__
-#define USE_C_ALLOCA
-#endif
-
 #ifndef _SIZE_T_
 typedef int size_t;
 #define _SIZE_T_

gcc/config/m88k/dgux.ld

@@ -22,7 +22,7 @@
    64kb can be mapped out, thus catching references through null
    pointers.  We actually start at 0x10200 (for efficiency).  Ideally,
    we want the page offset of a given word of the .text (output)
-   section to be the same as it's page offset in the actual (output)
+   section to be the same as its page offset in the actual (output)
    linked core file so that paging of the .text section is efficient.
    In order to do this we allow for up to 0x200 bytes of header stuff
    in the output (linked) object file.

gcc/config/m88k/luna.h

 /* Definitions of target machine for GNU compiler.
    Motorola m88100 running Omron Luna/88k.
-   Copyright (C) 1991 Free Software Foundation, Inc.
-   Contributed by Jeffery Friedl (jfriedl@omron.co.jp)
+   Copyright (C) 1991, 1997 Free Software Foundation, Inc.
+   Contributed by Jeffrey Friedl (jfriedl@omron.co.jp)
 
 This file is part of GNU CC.
 

gcc/config/mips/bsd-4.h

@@ -44,5 +44,3 @@ Boston, MA 02111-1307, USA.  */
 /* Override defaults for finding the MIPS tools.  */
 #define MD_STARTFILE_PREFIX "/bsd43/usr/lib/cmplrs/cc/"
 #define MD_EXEC_PREFIX "/bsd43/usr/lib/cmplrs/cc/"
-
-#include "mips/mips.h"

gcc/config/mips/bsd-5.h

-/* Definitions of target machine for GNU compiler.  MIPS RISC-OS, 5.0 BSD version.
+/* Definitions of target machine for GNU compiler.
+   MIPS RISC-OS, 5.0 BSD version.
    Copyright (C) 1991 Free Software Foundation, Inc.
 
 This file is part of GNU CC.

gcc/config/mips/cross64.h

 /* Configuration for an Irix 5 host and Irix 6 target using SGI's cross64
    package.  */
 
-#include "mips/iris6.h"
-
 #define STANDARD_INCLUDE_DIR "/usr/cross64/usr/include"
 #undef MD_EXEC_PREFIX
 #define MD_EXEC_PREFIX "/usr/cross64/usr/bin/"

gcc/config/mips/dec-osf1.h

 /* Definitions of target machine for GNU compiler.  DECstation (OSF/1) version.
-   Copyright (C) 1992, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1996, 1998 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -32,6 +32,7 @@ Boston, MA 02111-1307, USA.  */
 %{!shared: %{!non_shared: %{!call_shared: -non_shared}}}"
 
 #include "mips/ultrix.h"
+#include "mips/mips.h"
 
 /* Specify size_t and wchar_t types.  */
 #undef	SIZE_TYPE

gcc/config/mips/elforion.h

 /* Definitions of target machine for GNU compiler.  MIPS ORION version with
    GOFAST floating point library.
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1998 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -20,5 +20,3 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 #define MIPS_CPU_STRING_DEFAULT "orion"
-
-#include "mips/elf64.h"

gcc/config/mips/gnu.h

@@ -94,8 +94,9 @@ Boston, MA 02111-1307, USA.  */
 #define MIPS_GNU
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES GNU_CPP_PREDEFINES("mips") \
-"-DMIPSEB -DR3000 -D_MIPSEB -D_R3000 \
+#define CPP_PREDEFINES "-Dmips -Acpu(mips) -Amachine(mips) \
+-Dunix -Asystem(unix)  -DMACH -Asystem(mach) -D__GNU__ -Asystem(gnu) \
+-DMIPSEB -DR3000 -D_MIPSEB -D_R3000 \
 -D_MIPS_SZINT=32 -D_MIPS_SZLONG=32 -D_MIPS_SZPTR=32"
 
 #undef LINK_SPEC

gcc/config/mips/iris3.h

 /* Definitions of target machine for GNU compiler.  Iris version.
-   Copyright (C) 1991, 1993, 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 1995, 1996, 1998 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -70,5 +70,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* Plain char is unsigned in the SGI compiler.  */
 #define DEFAULT_SIGNED_CHAR 0
-
-#include "mips/mips.h"

gcc/config/mips/iris4.h

@@ -22,8 +22,6 @@ Boston, MA 02111-1307, USA.  */
    our own exit function.  */
 #define HAVE_ATEXIT
 
-#include "mips/iris3.h"
-
 /* Profiling is supported via libprof1.a not -lc_p as in Irix 3.  */
 #undef STARTFILE_SPEC
 #define STARTFILE_SPEC \

gcc/config/mips/iris4loser.h

@@ -3,5 +3,3 @@
 
 #define SUBTARGET_MIPS_AS_ASM_SPEC "-O0 %{v}"
 #define SUBTARGET_ASM_OPTIMIZING_SPEC ""
-
-#include "mips/iris4.h"

gcc/config/mips/netbsd.h

 /* Definitions for DECstation running BSD as target machine for GNU compiler.
-   Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995, 1996, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -30,11 +30,11 @@ Boston, MA 02111-1307, USA.  */
 #define GCC_INCLUDE_DIR "/usr/include"
 
 #undef INCLUDE_DEFAULTS
-#define INCLUDE_DEFAULTS		\
-  {					\
-    { GPLUSPLUS_INCLUDE_DIR, 1, 1 },	\
-    { GCC_INCLUDE_DIR, 0, 0 },		\
-    { 0, 0, 0 }				\
+#define INCLUDE_DEFAULTS			\
+  {						\
+    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },	\
+    { GCC_INCLUDE_DIR, "GCC", 0, 0 },		\
+    { 0, 0, 0, 0 }				\
   }
 
 /* Under NetBSD, the normal location of the various *crt*.o files is the

gcc/config/mips/news4.h

 /* Definitions of target machine for GNU compiler.  Sony RISC NEWS (mips)
-   Copyright (C) 1991 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -33,4 +33,7 @@ Boston, MA 02111-1307, USA.  */
 
 #define MACHINE_TYPE "RISC NEWS-OS"
 
-#include "mips/mips.h"
+/* INITIALIZE_TRAMPOLINE calls this library function to flush
+   program and data caches.  */
+#define CACHE_FLUSH_FUNC "cacheflush"
+

gcc/config/mips/news5.h

-/* Definitions of target machine for GNU compiler.  Sony RISC NEWS (mips) System V version.
+/* Definitions of target machine for GNU compiler. 
+   Sony RISC NEWS (mips) System V version.
    Copyright (C) 1992 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
@@ -59,4 +60,3 @@ Boston, MA 02111-1307, USA.  */
 #endif /* !_SC_PAGE_SIZE */
 #endif /*  L_trampoline */
 
-#include "mips/mips.h"

gcc/config/mips/osfrose.h

 /* Definitions of target machine for GNU compiler.
    DECstation (OSF/1 reference port with OSF/rose) version.
-   Copyright (C) 1991, 1992, 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1995, 1996, 1998 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -147,5 +147,3 @@ Boston, MA 02111-1307, USA.  */
   if (strcmp (lang_identify (), "c") != 0)				\
     output_lang_identify (STREAM);					\
 }
-
-#include "mips/mips.h"

gcc/config/mips/sni-gas.h

-#include "mips/sni-svr4.h"
-
 /* Enable debugging.  */
 #define DBX_DEBUGGING_INFO
 #define SDB_DEBUGGING_INFO
@@ -38,6 +36,3 @@ do {                                                  \
 	assemble_name (FILE, LABEL2);					\
 	fprintf (FILE, "\n");						\
   } while (0)
-
-
-

gcc/config/mips/svr3-4.h

-/* Definitions of target machine for GNU compiler.  MIPS RISC-OS System V version.
+/* Definitions of target machine for GNU compiler. 
+   MIPS RISC-OS System V version.
    Copyright (C) 1991 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
@@ -60,5 +61,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* Generate calls to memcpy, etc., not bcopy, etc.  */
 #define TARGET_MEM_FUNCTIONS
-
-#include "mips/mips.h"

gcc/config/mips/svr3-5.h

-/* Definitions of target machine for GNU compiler.  MIPS RISC-OS 5.0 System V version.
-   Copyright (C) 1991 Free Software Foundation, Inc.
+/* Definitions of target machine for GNU compiler. 
+   MIPS RISC-OS 5.0 System V version.
+   Copyright (C) 1991, 1998 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 

gcc/config/mips/svr4-4.h

-/* Definitions of target machine for GNU compiler.  MIPS RISC-OS System V.4 version.
-   Copyright (C) 1992 Free Software Foundation, Inc.
+/* Definitions of target machine for GNU compiler.
+   MIPS RISC-OS System V.4 version.
+   Copyright (C) 1992, 1998 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -58,5 +59,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* Generate calls to memcpy, etc., not bcopy, etc.  */
 #define TARGET_MEM_FUNCTIONS
-
-#include "mips/mips.h"

gcc/config/mips/svr4-5.h

-/* Definitions of target machine for GNU compiler.  MIPS RISC-OS 5.0 System V.4 version.
+/* Definitions of target machine for GNU compiler.
+   MIPS RISC-OS 5.0 System V.4 version.
    Copyright (C) 1992 Free Software Foundation, Inc.
 
 This file is part of GNU CC.

gcc/config/mips/svr4-t.h

 /* Definitions of target machine for GNU compiler.  Tandem S2 w/ NonStop UX. */
-#include "mips/svr4-5.h"
 
 /* Use the default value for this.  */
 #undef STANDARD_INCLUDE_DIR

gcc/config/mips/ultrix.h

-/* Definitions of target machine for GNU compiler.  DECstation (ultrix) version.
-   Copyright (C) 1991 Free Software Foundation, Inc.
+/* Definitions of target machine for GNU compiler; DECstation (Ultrix) version.
+   Copyright (C) 1991, 1997, 1998 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -31,6 +31,12 @@ Boston, MA 02111-1307, USA.  */
 #define LIB_SPEC "%{p:-lprof1} %{pg:-lprof1} -lc"
 #endif
 
+#define SUBTARGET_CPP_SPEC "\
+%{.cc:	-D__LANGUAGE_C -D_LANGUAGE_C} \
+%{.cxx:	-D__LANGUAGE_C -D_LANGUAGE_C} \
+%{.C:	-D__LANGUAGE_C -D_LANGUAGE_C} \
+"
+
 #ifndef STARTFILE_SPEC
 #define STARTFILE_SPEC "%{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}"
 #endif
@@ -46,4 +52,10 @@ Boston, MA 02111-1307, USA.  */
 /* Generate calls to memcpy, etc., not bcopy, etc.  */
 #define TARGET_MEM_FUNCTIONS
 
-#include "mips/mips.h"
+/* Work around assembler forward label references generated in exception
+   handling code. */
+#define DWARF2_UNWIND_INFO 0
+
+/* INITIALIZE_TRAMPOLINE calls this library function to flush
+   program and data caches.  */
+#define CACHE_FLUSH_FUNC "cacheflush"

gcc/config/mips/x-dec-osf1

@@ -11,7 +11,6 @@
 CC		= $(OLDCC)
 OPT		= -O1
 OLDCC		= cc -Wf,-XNg1500 -Olimit 3000 $(OPT)
-INSTALL		= installbsd -c
 
 # The bison output files are machine-indep,
 # so different flags for a particular machine are not useful.

gcc/config/mips/x-osfrose

@@ -17,7 +17,6 @@ DEBUG		=
 DEBUG_COLLECT	= # -DDEBUG
 CCLIBFLAGS	= -O -DNO_HALF_PIC
 GCC_CFLAGS	= $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS) -B./ -DPOSIX -DNO_HALF_PIC
-INSTALL		= installbsd -c
 LIBGCC2_CFLAGS	= -O2 $(GCC_CFLAGS) -g1 -pic-extern
 LDFLAGS		=
 MSTATS		= # -mstats

gcc/config/mips/xm-iris6.h

@@ -5,17 +5,13 @@
 extern void *alloca ();
 #endif
 
-#include "mips/xm-iris5.h"
+#include "mips/xm-mips.h"
+
+#define USG
 
 #undef HOST_BITS_PER_LONG
 #define HOST_BITS_PER_LONG	_MIPS_SZLONG
 
-/* Declare some functions needed for this machine.  We don't want to
-   include these in the sources since other machines might define them
-   differently.  */
-
-extern void *malloc (), *realloc (), *calloc ();
-
 #ifndef inhibit_libc
 #include "string.h"
 #endif

gcc/config/ns32k/xm-pc532-min.h

-/* Configuration for GNU C-compiler for PC532 running Minix
-   Copyright (C) 1987,1990 Free Software Foundation, Inc.
-   Contributed by Jyrki Kuoppala <jkp@cs.hut.fi>, August 1990
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-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, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* We have USG-style include files and time functions */
-
-#define USG
-
-#include "ns32k/xm-ns32k.h"
-
 #ifndef HZ
 #define HZ 60
 #endif

gcc/config/pa/pa-hpux9.h

 /* Definitions of target machine for GNU compiler, for HP PA-RISC 1.1
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    Contributed by Tim Moore (moore@defmacro.cs.utah.edu)
 
 This file is part of GNU CC.
@@ -20,7 +20,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* We can debug dynamically linked executables on hpux9; we also want
-   derefercing of a NULL pointer to cause a SEGV.  */
+   dereferencing of a NULL pointer to cause a SEGV.  */
 #undef LINK_SPEC
 #if ((TARGET_DEFAULT | TARGET_CPU_DEFAULT) & 1)
 #define LINK_SPEC \

gcc/config/pa/pa-pro-end.h

 /* Definitions of target machine for GNU compiler, for PRO.
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -31,7 +31,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dhppa -DPWB -Acpu(hppa) -Amachine(hppa)"
 
-/* hpux8 and later have C++ compatable include files, so do not
+/* hpux8 and later have C++ compatible include files, so do not
    pretend they are `extern "C"'.  */
 #define NO_IMPLICIT_EXTERN_C
 

gcc/config/pa/xm-pahpux.h

 /* Configuration for GNU C-compiler for PA-RISC.
-   Copyright (C) 1988, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1995, 1997 Free Software Foundation, Inc.
    Contributed by Michael Tiemann (tiemann@cygnus.com).
 
 This file is part of GNU CC.
@@ -24,13 +24,6 @@ Boston, MA 02111-1307, USA.  */
 #define USG
 
 /* Use System V memory functions.  */
-#define bcopy(a,b,c) memcpy (b,a,c)
-#define bzero(a,b) memset (a,0,b)
-#define bcmp(a,b,c) memcmp (a,b,c)
-
-#define rindex strrchr
-#define index strchr
-
 /* #defines that need visibility everywhere.  */
 #define FALSE 0
 #define TRUE 1

gcc/config/rs6000/sol2.h

 /* Definitions of target machine for GNU compiler,
    for IBM RS/6000 running AIX version 3.1.
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
    Contributed by David Reese (Dave.Reese@East.Sun.COM)
 
 This file is part of GNU CC.
@@ -46,6 +46,15 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #undef	LINK_START_DEFAULT_SPEC
 #define LINK_START_DEFAULT_SPEC "%(link_start_solaris)"
 
+#undef CPP_SPEC
+#define CPP_SPEC "%{posix: -D_POSIX_SOURCE}\
+%(cpp_sysv) %(cpp_endian) %(cpp_cpu) \
+%{mmvme: %(cpp_os_mvme) } \
+%{msim: %(cpp_os_sim) } \
+%{mcall-linux: %(cpp_os_linux) } \
+%{mcall-solaris: %(cpp_os_solaris) } \
+%{!mmvme: %{!msim: %{!mcall-linux: %{!mcall-solaris: %(cpp_os_default) }}}}"
+
 #undef	CPP_OS_DEFAULT_SPEC
 #define	CPP_OS_DEFAULT_SPEC "%(cpp_os_solaris)"
 
@@ -165,3 +174,5 @@ while (0)
 
 #undef	MULTILIB_DEFAULTS
 #define	MULTILIB_DEFAULTS { "mlittle", "mcall-solaris" }
+
+#define STDC_0_IN_SYSTEM_HEADERS

gcc/config/rs6000/t-ppcos

-# Target config file for a System V based system (Solaris, Linux, Netbsd) with gas
+# Target config file for a System V based system (Solaris, GNU/Linux, Netbsd)
+# with gas.
 
 # Build libgcc.a with different options.  With gas, build pic libraries
 # as well no floating point

gcc/config/rs6000/tramp.asm

-/* CYGNUS LOCAL -- waiting for FSF sources to be restored/meissner */
-/*
- * special support for trampolines
+/*  Special support for trampolines
  *
- *   Copyright (C) 1996 Free Software Foundation, Inc.
+ *   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
  *   Written By Michael Meissner
  * 
  * This file is free software; you can redistribute it and/or modify it
@@ -82,7 +80,7 @@ FUNC_START(__trampoline_setup)
         mflr	r11
         lwz	r12,(.LCL0-.LCF0)(r11)
         add	r11,r12,r11
-        lwz	r7,.Ltramp(r11)		/* trampoline addres -4 */
+        lwz	r7,.Ltramp(r11)		/* trampoline address -4 */
 
 	li	r8,__trampoline_size	/* verify that the trampoline is big enough */
 	cmpw	cr1,r8,r4

gcc/config/rs6000/x-rs6000

 # configuration for IBM rs6000 running aix
-INSTALL=/usr/ucb/install -c
 
 # Show we need to use the C version of ALLOCA
 ALLOCA=alloca.o

gcc/config/rs6000/xm-mach.h

-/* Configuration for GNU C-compiler for IBM RS/6000 on MACH.
-   Copyright (C) 1992 Free Software Foundation, Inc.
-   Contributed by Richard Kenner (kenner@nyu.edu).
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-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, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-
-#include "rs6000/xm-rs6000.h"
 #undef USG
 #undef COLLECT_EXPORT_LIST

gcc/config/sh/xm-sh.h

 /* Configuration for GNU C-compiler for Hitachi SH.
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997 Free Software Foundation, Inc.
+
 This file is part of GNU CC.
 
 GNU CC is free software; you can redistribute it and/or modify
@@ -32,9 +33,6 @@ Boston, MA 02111-1307, USA.  */
 #define alloca __builtin_alloca
 #endif
 
-/* We have the vprintf function.  */
-#define HAVE_VPRINTF 1
-
 /* target machine dependencies.
    tm.h is a symbolic link to the actual target specific file.  */
 #include "tm.h"

gcc/config/sparc/t-sparcbare

-# configuration file for a bare sparc cpu, aout format files
+# configuration file for a bare sparc cpu
 
 CROSS_LIBGCC1 = libgcc1-asm.a
 LIB1ASMSRC = sparc/lb1spc.asm

gcc/config/sparc/xm-sparc.h

 /* Configuration for GNU C-compiler for Sun Sparc.
-   Copyright (C) 1988, 1993, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1993, 1995, 1997 Free Software Foundation, Inc.
    Contributed by Michael Tiemann (tiemann@cygnus.com).
 
 This file is part of GNU CC.
@@ -43,8 +43,6 @@ Boston, MA 02111-1307, USA.  */
 #define SUCCESS_EXIT_CODE 0
 #define FATAL_EXIT_CODE 33
 
-#define HAVE_POPEN
-
 /* If compiled with Sun CC, the use of alloca requires this #include.  */
 #ifndef __GNUC__
 #include "alloca.h"

gcc/config/sparc/xm-sysv4.h

 /* Configuration for GNU C-compiler for Sun Sparc running System V.4.
-   Copyright (C) 1992, 1993 Free Software Foundation, Inc.
-
-   Written by Ron Guilmette (rfg@netcom.com).
+   Copyright (C) 1992, 1993, 1998 Free Software Foundation, Inc.
+   Contributed by Ron Guilmette (rfg@netcom.com).
 
 This file is part of GNU CC.
 
@@ -44,8 +43,6 @@ Boston, MA 02111-1307, USA.  */
 #define SUCCESS_EXIT_CODE 0
 #define FATAL_EXIT_CODE 33
 
-#include "xm-svr4.h"
-
 #ifndef __GNUC__
 #define ONLY_INT_FIELDS
 #endif

gcc/config/tahoe/tahoe.c

 /* Subroutines for insn-output.c for Tahoe.
-   Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1991, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -20,6 +20,7 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include "config.h"
+#include <stdio.h>
 #include "rtl.h"
 #include "regs.h"
 #include "hard-reg-set.h"
@@ -51,7 +52,7 @@ Boston, MA 02111-1307, USA.  */
 rtx tahoe_reg_conversion_loc;
 
 int
-extendable_operand (op, mode)
+extensible_operand (op, mode)
      rtx op;
      enum machine_mode mode;
 {
@@ -67,8 +68,6 @@ extendable_operand (op, mode)
 /* since the modes are basically the same. I had to add a special case,	*/
 /* though, for symbol references with offsets.				*/
 
-#include <stdio.h>
-
 print_operand_address (file, addr)
      FILE *file;
      register rtx addr;

gcc/config/vax/ultrix.h

@@ -7,3 +7,6 @@
 #define PTRDIFF_TYPE "int"
 #define WCHAR_TYPE "unsigned int"
 #define WCHAR_TYPE_SIZE 32
+
+/* True for Ultrix 4.3 and later and possibly earlier.  */
+#define HAVE_ATEXIT

gcc/config/vax/vax.c

 /* Subroutines for insn-output.c for Vax.
-   Copyright (C) 1987, 1994, 1995, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1994, 1995, 1997, 1998 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,8 +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.  */
 
-#include <stdio.h>
 #include "config.h"
+#include <stdio.h>
 #include "rtl.h"
 #include "regs.h"
 #include "hard-reg-set.h"
@@ -614,34 +614,36 @@ check_float_value (mode, d, overflow)
 
   if (overflow)
     {
-      bcopy (&float_values[0], d, sizeof (REAL_VALUE_TYPE));
+      bcopy ((char *) &float_values[0], (char *) d, sizeof (REAL_VALUE_TYPE));
       return 1;
     }
 
   if ((mode) == SFmode)
     {
       REAL_VALUE_TYPE r;
-      bcopy (d, &r, sizeof (REAL_VALUE_TYPE));
+      bcopy ((char *) d, (char *) &r, sizeof (REAL_VALUE_TYPE));
       if (REAL_VALUES_LESS (float_values[0], r))
 	{
-	  bcopy (&float_values[0], d, sizeof (REAL_VALUE_TYPE));
+	  bcopy ((char *) &float_values[0], (char *) d,
+		 sizeof (REAL_VALUE_TYPE));
 	  return 1;
 	}
       else if (REAL_VALUES_LESS (r, float_values[1]))
 	{
-	  bcopy (&float_values[1], d, sizeof (REAL_VALUE_TYPE));
+	  bcopy ((char *) &float_values[1], (char*) d,
+		 sizeof (REAL_VALUE_TYPE));
 	  return 1;
 	}
       else if (REAL_VALUES_LESS (dconst0, r)
 		&& REAL_VALUES_LESS (r, float_values[2]))
 	{
-	  bcopy (&dconst0, d, sizeof (REAL_VALUE_TYPE));
+	  bcopy ((char *) &dconst0, (char *) d, sizeof (REAL_VALUE_TYPE));
 	  return 1;
 	}
       else if (REAL_VALUES_LESS (r, dconst0)
 		&& REAL_VALUES_LESS (float_values[3], r))
 	{
-	  bcopy (&dconst0, d, sizeof (REAL_VALUE_TYPE));
+	  bcopy ((char *) &dconst0, (char *) d, sizeof (REAL_VALUE_TYPE));
 	  return 1;
 	}
     }

gcc/config/winnt/xm-winnt.h

 /* Configuration for GNU compiler for processor running Windows NT 3.x.
-   Copyright (C) 1993, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995, 1997 Free Software Foundation, Inc.
    Contributed by Douglas B. Rupp (drupp@cs.washington.edu)
 
 This file is part of GNU CC.
@@ -42,11 +42,6 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #define NO_SYS_SIGLIST 1
-#define bcmp(a,b,c) memcmp (a,b,c)
-#define bcopy(a,b,c) memcpy (b,a,c)
-#define bzero(a,b) memset (a,0,b)
-#define index  strchr
-#define rindex strrchr
 #define kill(a,b) raise(b)
 
 #define OBJECT_SUFFIX ".obj"
@@ -66,4 +61,3 @@ Boston, MA 02111-1307, USA.  */
 #define S_IRWXU S_IRUSR | S_IWUSR | S_IXUSR
 #define S_ISREG(m) (((m)&S_IFMT) == S_IFREG)
 #define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR)
-

gcc/ginclude/ppc-asm.h

 /* PowerPC asm definitions for GNU C.  */
-/* Under winnt, 1) gas suppports the following as names and 2) in particular
+/* Under winnt, 1) gas supports the following as names and 2) in particular
    defining "toc" breaks the FUNC_START macro as ".toc" becomes ".2" */
 
 #if !defined(__WINNT__)