--- gcc/Makefile	2018/04/24 16:50:26	1.1.1.14
+++ gcc/Makefile	2018/04/24 16:55:28	1.1.1.18
@@ -18,17 +18,41 @@
 #the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-CFLAGS = -g
+# Variables that exist for you to override.
+# See below for how to change them for certain systems.
+
+CFLAGS = -g $(XCFLAGS)
 CC = cc
-# OLDCC should not be the GNU C compiler.
-OLDCC = cc
 BISON = bison
 BISONFLAGS = -v
+# This should be the version of ar to use with output from GCC.
 AR = ar
 SHELL = /bin/sh
 # on sysV, define this as cp.
 INSTALL = install -c
+# Directory not specified here so that, if a GNU ranlib
+# is earlier in the path, it will be used.
+# That is likely to be true on systems that have the GNU ar
+# installed earlier in the path.
+RANLIB = ranlib
+
+# Compiler to use for compiling gnulib.
+# OLDCC should not be the GNU C compiler.
+OLDCC = cc
 
+# CFLAGS for use with OLDCC, for compiling gnulib.
+# NOTE: -O does not work on some Unix systems!
+# On them, you must take it out.
+CCLIBFLAGS=-O
+
+# This should be the version of ar to use with output from $(OLDCC).
+OLDAR = ar
+
+# CFLAGS for use with OLDCC, for compiling hard-params.
+HARD_PARAMS_FLAGS=
+
+# Directory where sources are, from where we are.
+srcdir = .
 # Directory in which to put the executable for the command `gcc'
 bindir = $(prefix)/usr/local/bin
 # Directory in which to put the subprograms used by the compiler.
@@ -38,6 +62,21 @@ mandir = $(prefix)/usr/local/man/man1
 # Number to put in man-page filename.
 manext = 1
 
+# Additional system libraries to link with.
+CLIB=
+
+# Change this to a null string if obstacks are installed in the
+# system library.
+OBSTACK=obstack.o
+
+# Directory to link to, when using the target `maketest'.
+DIR = ../gcc
+
+# End of variables for you to override.
+
+
+# Variables you should change for certain systems.
+
 # These are what you would need on HPUX:
 # CFLAGS = -Wc,-Ns2000 -Wc,-Ne700 -Wc,-Np300
 # If you are using the GNU assembler and linker on HPUX,
@@ -45,30 +84,73 @@ manext = 1
 # -g is desirable in CFLAGS, but a compiler bug in HPUX version 5
 # bites whenever tree.def, rtl.def or machmode.def is included
 # (ie., on every source file).
-# CCLIBFLAGS = -Wc,-Ns2000 -Wc,-Ne700
+# If you have a floating point accelerator, you might want -lsetjmp as well.
+# CCLIBFLAGS = -Wc,-Ns2000 -Wc,-Ne700 -O
+# HARD_PARAMS_FLAGS = -Wc,-Ns2000 -Wc,-Ne700
+# INSTALL = cp
 # For CCLIBFLAGS you might want to specify the switch that
 # forces only 68000 instructions to be used.
+# If using the GNU assembler and linker, set AR to the GNU ar program,
+# wherever that is.
+# To get a working alloca, you may need to get alloca.s from Emacs
+# and assemble it into alloca.o rather than using alloca.c.
+
+# On the Sequent, you may need to set CCLIBFLAG to empty.
+
+# On the 3b1, this line may help you compile gnulib
+# if you already have a prior version of gcc installed.
+# CCLIBFLAGS = -B/usr/local/lib/gcc- -tp -Wp,-traditional
+
+# On SysV from SCO, uncomment these lines as well as those for SysV in general.
+# You might also want to remove limits.h from the definition of USER_H,
+# since the one that comes with the system is good for POSIX.
+# RANLIB = :
+# CC = rcc
+# OLDCC = rcc
 
 # If you are making gcc for the first time, and if you are compiling it with
 # a non-gcc compiler, and if your system doesn't have a working alloca() in any
 # of the standard libraries (as is true for HP/UX or Genix),
-# then get alloca.c from GNU Emacs and un-comment the following line:
+# then un-comment the following line when compiling with the system's cc:
 # ALLOCA = alloca.o
+# But don't do that if compiling using GCC.
 
-# If your system has alloca() in /lib/libPW.a, un-comment the following line:
+# If your system has a working alloca in /lib/libPW.a,
+# un-comment the following line.  Note that -lPW doesn't work on HPUX or IRIX.
 # CLIB= -lPW
 
+# On SysV R4, when compiling with PCC, you can get alloca as follows:
+# CLIB = -lc /usr/ucblib/libucb.a
+# -lc is needed because if libucb.a were searched before libc.a,
+# you would get an incompatible stdio package that won't work.
+
+# On the NCR Tower 32 running SVR3, says ra@intsys.no :
+# Do *not* enable optimization in CFLAGS when using the native cc, because:
+# a) The optimizer seems to loop when invoked with -O2.
+# b) The -O1 level does stack/frame pointer optimizations that make the
+#    assembler alloca in libPW.a fail, and the C alloca eats *lots* of memory.
+# c) gcc will eventually be recompiled with itself, so all this doesn't matter.
+# CFLAGS = -g -O0
+# HARD_PARAMS_FLAGS = -O0
+# CCLIBFLAGS = -O2
+# CLIB = -lmalloc -lPW
+
+# On a pyramid, you need to uncomment the following line:
+# CLIB = -lc /usr/.attlib/libPW.a
+
 # If your system's malloc() routine fails for any reason (as it does on
 # certain versions of Genix), try getting the files
 # malloc.c and getpagesize.h from GNU Emacs and un-comment the following line:
 # MALLOC = malloc.o
 
-# If you are running GCC on an Apollo, you will need this:
-# CFLAGS = -g -O -M 3000 -U__STDC__ -DSHORT_ENUM_BUG
+# To build gcc for Apollo 68K machines you must be running at least SR10.2
+# with the 6.7 version of the C compiler. Use 'apollo68' as the argument to
+# config.gcc, then go into a bsd4.3 environment and use this:
+# CFLAGS = -g -O -Acpu,3000 -Arun,bsd4.3 -Asys,any -Anansi $(XCFLAGS)
+# CCLIBFLAGS = -O -Acpu,3000 -Arun,bsd4.3 -Asys,any -Anansi
+# HARD_PARAMS_FLAGS= -Anansi
+# (Says vasta@apollo.com.)
 
-# Change this to a null string if obstacks are installed in the
-# system library.
-OBSTACK=obstack.o
 
 # Dependency on obstack, alloca, malloc or whatever library facilities
 # are not installed in the system libraries.
@@ -78,7 +160,16 @@ LIBDEPS= $(OBSTACK) $(ALLOCA) $(MALLOC)
 # and the system's installed libraries.
 LIBS = $(OBSTACK) $(ALLOCA) $(MALLOC) $(CLIB)
 
-DIR = ../gcc
+# Specify the directories to be searched for header files.
+# Both . and srcdir are used, in that order,
+# so that tm.h and config.h will be found in the compilation
+# subdirectory rather than in the source directory.
+INCLUDES = -I. -I$(srcdir) -I$(srcdir)/config
+SUBDIR_INCLUDES = -I.. -I../$(srcdir) -I../$(srcdir)/config
+
+# Always use -I$(srcdir)/config when compiling.
+.c.o:
+	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(INCLUDES) $<
 
 # Language-specific object files for C.
 C_OBJS = c-parse.tab.o c-decl.o c-typeck.o c-convert.o
@@ -91,7 +182,7 @@ CPLUS_OBJS = cplus-parse.o cplus-decl.o
 
 # Language-independent object files.
 OBJS = toplev.o version.o tree.o print-tree.o stor-layout.o fold-const.o \
- rtl.o expr.o stmt.o expmed.o explow.o optabs.o varasm.o \
+ rtl.o rtlanal.o expr.o stmt.o expmed.o explow.o optabs.o varasm.o \
  symout.o dbxout.o sdbout.o emit-rtl.o insn-emit.o \
  integrate.o jump.o cse.o loop.o flow.o stupid.o combine.o \
  regclass.o local-alloc.o global-alloc.o reload.o reload1.o caller-save.o \
@@ -101,34 +192,56 @@ OBJS = toplev.o version.o tree.o print-t
 STAGE_GCC=gcc
 STAGESTUFF = *.o insn-flags.h insn-config.h insn-codes.h \
  insn-output.c insn-recog.c insn-emit.c insn-extract.c insn-peep.c \
+ stamp-flags stamp-config stamp-codes \
+ stamp-output stamp-recog stamp-emit stamp-extract stamp-peep \
  genemit genoutput genrecog genextract genflags gencodes genconfig genpeep \
  cc1 cpp cccp # cc1plus
 
 # Members of gnulib.
-LIBFUNCS = _eprintf _builtin_new _builtin_New _builtin_del \
+LIBFUNCS = _eprintf _builtin_new _builtin_New _builtin_del _bb \
    _umulsi3 _mulsi3 _udivsi3 _divsi3 _umodsi3 _modsi3 \
-   _lshrsi3 _lshlsi3 _ashrsi3 _ashlsi3 _cmpdi2 _ucmpdi2 \
+   _lshrsi3 _lshlsi3 _ashrsi3 _ashlsi3 \
    _divdf3 _muldf3 _negdf2 _adddf3 _subdf3 _cmpdf2 \
-   _fixunsdfsi _fixunsdfdi _fixdfsi _fixdfdi \
-   _floatsidf _floatdidf _truncdfsf2 _extendsfdf2 \
-   _addsf3 _negsf2 _subsf3 _cmpsf2 _mulsf3 _divsf3 _varargs
+   _fixunsdfsi _fixdfsi _floatsidf _truncdfsf2 _extendsfdf2 \
+   _addsf3 _negsf2 _subsf3 _cmpsf2 _mulsf3 _divsf3
+
+# Library members defined in gnulib2.c.
+LIB2FUNCS = _adddi3 _subdi3 _muldi3 _divdi3 _moddi3 _udivdi3 _umoddi3 _negdi2 \
+    _anddi3 _iordi3 _xordi3 _lshrdi3 _lshldi3 _ashldi3 _ashrdi3 _one_cmpldi2  \
+    _bdiv _cmpdi2 _ucmpdi2 _fixunsdfdi _fixdfdi _floatdidf _varargs
 
 # Header files that are made available to programs compiled with gcc.
-USER_H = stddef.h stdarg.h assert.h varargs.h va-*.h limits.h
+USER_H = stddef.h assert.h va-i860.h va-mips.h va-pyr.h va-sparc.h \
+    va-spur.h limits.h proto.h
 
-# If you want to recompile everything, just do rm *.o.
+# The files that "belong" in CONFIG_H are deliberately omitted
+# because having them there would not be useful in actual practice.
+# All they would do is cause complete recompilation every time
+# one of the machine description files is edited.
+# That may or may not be what one wants to do.
+# If it is, rm *.o is an easy way to do it.
 # CONFIG_H = config.h tm.h
 CONFIG_H =
 RTL_H = rtl.h rtl.def machmode.def
 TREE_H = tree.h real.h tree.def machmode.def
 CPLUS_TREE_H = $(TREE_H) cplus-tree.h c-tree.h
 
-all: gnulib gcc cc1 cpp # cc1plus
-
-lang-c: gnulib gcc cc1 cpp
-# lang-cplus: gnulib gcc cc1plus cpp
+# Note that dependencies on obstack.h are not written
+# because that file is not part of GCC.
+# Dependencies on gvarargs.h are not written
+# because all that file does, when not compiling with GCC,
+# is include the system varargs.h.
+
+all: config.status gnulib gcc cc1 cpp float.h gnulib2 libg # cc1plus
+
+lang-c: config.status gnulib gcc cc1 cpp gnulib2 libg
+# lang-cplus: config.status gnulib gcc cc1plus cpp gnulib2 libg
+
+config.status:
+	@echo You must configure gcc.  Look at the INSTALL file for details.
+	@false
 
-doc: cpp.info gplus.info gcc.info
+doc: $(srcdir)/cpp.info $(srcdir)/gplus.info $(srcdir)/gcc.info
 
 compilations: ${OBJS}
 
@@ -137,44 +250,82 @@ gcc: gcc.o version.o $(LIBDEPS)
 # Go via `gccnew' to avoid `file busy' if $(CC) is `gcc'.
 	mv gccnew gcc
 
-gcc.o: gcc.c $(CONFIG_H)
-	$(CC) $(CFLAGS) -c -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-\" gcc.c
-
 cc1: $(C_OBJS) $(OBJS) $(LIBDEPS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o cc1 $(C_OBJS) $(OBJS) $(LIBS)
 
 cc1plus: $(CPLUS_OBJS) $(OBJS) $(LIBDEPS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o cc1plus $(CPLUS_OBJS) $(OBJS) $(LIBS)
 
+# Make sure there is some libg.a to be found,
+# in case compiling with a GCC that was built but not installed.
+libg:
+	if [ ! -f /lib/libg.a -a ! -f /usr/lib/libg.a ]; \
+	then ar rc libg.a; else true; fi
+
 #Library of arithmetic subroutines
 # Don't compile this with gcc!
-gnulib: gnulib.c
-	-mkdir libtemp
-	cd libtemp; \
-	rm -f gnulib; \
+# (That would cause most arithmetic functions to call themselves.)
+gnulib: gnulib.c $(CONFIG_H)
+	-rm -f stamp-gnulib2
+	rm -f tmpgnulib gnulib; \
 	for name in $(LIBFUNCS); \
 	do \
 	  echo $${name}; \
 	  rm -f $${name}.c; \
-	  cp ../gnulib.c $${name}.c; \
-	  $(OLDCC) $(CCLIBFLAGS) -O -I.. -c -DL$${name} $${name}.c; \
-	  $(AR) qc gnulib $${name}.o; \
+	  cp $(srcdir)/gnulib.c $${name}.c; \
+	  $(OLDCC) $(CCLIBFLAGS) $(INCLUDES) -c -DL$${name} $${name}.c; \
+	  $(OLDAR) qc tmpgnulib $${name}.o; \
+	  rm -f $${name}.[co]; \
 	done
-	mv libtemp/gnulib .
-	rm -rf libtemp
-	if [ -f /usr/bin/ranlib ] ; then  ranlib gnulib ;fi
+	-if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ;then $(RANLIB) tmpgnulib; else true; fi
+# Actually build it in tmpgnulib above, then rename now,
+# so that gnulib itself remains nonexistent if compilation is aborted.
+	mv tmpgnulib gnulib
 # On HPUX, if you are working with the GNU assembler and linker,
-# the previous line must be replaced with the following two lines.
+# the previous two command lines must be replaced with the following line.
 # No change is needed here if you are using the HPUX assembler and linker.
-#	mv gnulib gnulib-hp
-#	../hp-bin/hpxt gnulib-hp gnulib
+#	../hp-bin/hpxt tmpgnulib gnulib
 
+gnulib2: stamp-gnulib2;
+stamp-gnulib2: gnulib2.c gnulib cc1 gcc cpp $(CONFIG_H)
+	for name in $(LIB2FUNCS); \
+	do \
+	  echo $${name}; \
+	  ./gcc -B./ -fstrength-reduce -O $(INCLUDES) $(GNULIB2_CFLAGS) -c -DL$${name} $(srcdir)/gnulib2.c -o $${name}.o; \
+	  $(AR) rc gnulib $${name}.o; \
+	  rm -f $${name}.o; \
+	done
+	-if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then $(RANLIB) gnulib; else true; fi
+# On HPUX, if you are working with the GNU assembler and linker,
+# the previous line must be commented out.
+# No change is needed here if you are using the HPUX assembler and linker.
+	touch stamp-gnulib2
+
+float.h:
+# Originally, we used `make' rather than $(MAKE), to avoid propagating
+# a CC=gcc command option.  However, since hard-params is now made
+# with $(OLDCC) explicitly, this is no longer important.
+# However, $(MAKE) fails on some systems where it isn't defined.
+# `make' has the disadvantage of sometimes running the system's make,
+# instead of GNU make.  And the system's make might not support VPATH.
+# However, the compilation of hard-params should not need to use VPATH,
+# due to the explicit use of `$(srcdir)'.
+	make hard-params
+	-./hard-params -f > float.h
+
+# Compile hard-params with standard cc.  It avoids some headaches.
+hard-params: hard-params.o
+	$(OLDCC) $(HARD_PARAMS_FLAGS) $(LDFLAGS) hard-params.o -o $@
+hard-params.o: $(srcdir)/hard-params.c
+	-cp $(srcdir)/hard-params.c . > /dev/null 2>&1
+	$(OLDCC) $(HARD_PARAMS_FLAGS) $(CPPFLAGS) -DNO_SC -c hard-params.c
 
 # C language specific files.
 
-c-parse.tab.o : c-parse.tab.c $(CONFIG_H) $(TREE_H) c-parse.h c-tree.h
-c-parse.tab.c : c-parse.y
-	$(BISON) $(BISONFLAGS) c-parse.y
+c-parse.tab.o : $(srcdir)/c-parse.tab.c $(CONFIG_H) $(TREE_H) c-parse.h c-tree.h input.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c $(srcdir)/c-parse.tab.c
+$(srcdir)/c-parse.tab.c : $(srcdir)/c-parse.y
+	$(BISON) $(BISONFLAGS) $(srcdir)/c-parse.y -o $@
 
 c-decl.o : c-decl.c $(CONFIG_H) $(TREE_H) c-tree.h c-parse.h flags.h
 c-typeck.o : c-typeck.c $(CONFIG_H) $(TREE_H) c-tree.h flags.h
@@ -182,14 +333,16 @@ c-convert.o : c-convert.c $(CONFIG_H) $(
 
 # C++ language specific files.
 
-cplus-parse.o : cplus-parse.c $(CONFIG_H) $(CPLUS_TREE_H) flags.h
-	$(CC) -c $(CFLAGS) -DPARSE_OUTPUT=\"$(PWD)/cplus-parse.output\" cplus-parse.c
+cplus-parse.o : $(srcdir)/cplus-parse.c $(CONFIG_H) $(CPLUS_TREE_H) flags.h
+	$(CC) -c $(CFLAGS) $(INCLUDES) \
+  -DPARSE_OUTPUT=\"$(PWD)/cplus-parse.output\" \
+  `echo $(srcdir)/cplus-parse.c | sed 's,^\./,,'`
 
-cplus-parse.h cplus-parse.c : cplus-parse.y
+$(srcdir)/cplus-parse.h $(srcdir)/cplus-parse.c : $(srcdir)/cplus-parse.y
 	@echo expect 49 shift/reduce conflicts and 4 reduce/reduce conflicts
-	$(BISON) $(BISONFLAGS) -d -o cplus-parse.c cplus-parse.y
+	$(BISON) $(BISONFLAGS) -d -o $(srcdir)/cplus-parse.c $(srcdir)/cplus-parse.y
 
-cplus-lex.o : cplus-lex.c $(CONFIG_H) $(CPLUS_TREE_H) cplus-parse.h
+cplus-lex.o : cplus-lex.c $(CONFIG_H) $(CPLUS_TREE_H) $(srcdir)/cplus-parse.h
 cplus-decl.o : cplus-decl.c $(CONFIG_H) $(CPLUS_TREE_H) flags.h
 cplus-typeck.o : cplus-typeck.c $(CONFIG_H) $(CPLUS_TREE_H) flags.h
 cplus-class.o : cplus-class.c $(CONFIG_H) $(CPLUS_TREE_H)
@@ -201,20 +354,31 @@ new-method.o : new-method.c $(CONFIG_H)
 
 # Language-independent files.
 
-tree.o : tree.c $(CONFIG_H) $(TREE_H)
+gcc.o: gcc.c $(CONFIG_H) gvarargs.h obstack.h
+	$(CC) $(CFLAGS) $(INCLUDES) \
+  -DSTANDARD_STARTFILE_PREFIX=\"$(libdir)/\" \
+  -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-\" -c \
+  `echo $(srcdir)/gcc.c | sed 's,^\./,,'`
+
+version.o: version.c
+obstack.o: obstack.c
+
+tree.o : tree.c $(CONFIG_H) $(TREE_H) flags.h
 print-tree.o : print-tree.c $(CONFIG_H) $(TREE_H)
-stor-layout.o : stor-layout.c $(CONFIG_H) $(TREE_H)
+stor-layout.o : stor-layout.c $(CONFIG_H) $(TREE_H) $(RTL_H)
 fold-const.o : fold-const.c $(CONFIG_H) $(TREE_H)
-toplev.o : toplev.c $(CONFIG_H) $(TREE_H) flags.h
+toplev.o : toplev.c $(CONFIG_H) $(TREE_H) $(RTL_H) flags.h input.h
 
 rtl.o : rtl.c $(CONFIG_H) $(RTL_H)
 
+rtlanal.o : rtlanal.c $(CONFIG_H) $(RTL_H)
+
 varasm.o : varasm.c $(CONFIG_H) $(TREE_H) $(RTL_H) flags.h expr.h \
    insn-codes.h hard-reg-set.h
 stmt.o : stmt.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h  \
-   insn-flags.h expr.h insn-config.h regs.h insn-codes.h
+   insn-flags.h insn-config.h insn-codes.h expr.h regs.h hard-reg-set.h recog.h
 expr.o : expr.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h  \
-   insn-flags.h insn-codes.h expr.h insn-config.h recog.h
+   insn-flags.h insn-codes.h expr.h insn-config.h recog.h typeclass.h
 expmed.o : expmed.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h  \
    insn-flags.h insn-codes.h expr.h insn-config.h recog.h
 explow.o : explow.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h expr.h insn-codes.h
@@ -222,7 +386,7 @@ optabs.o : optabs.c $(CONFIG_H) $(RTL_H)
    insn-flags.h insn-codes.h expr.h insn-config.h recog.h
 symout.o : symout.c $(CONFIG_H) $(TREE_H) $(RTL_H) symseg.h gdbfiles.h
 dbxout.o : dbxout.c $(CONFIG_H) $(TREE_H) $(RTL_H) flags.h
-sdbout.o : sdbout.c $(CONFIG_H) $(TREE_H) $(RTL_H) c-tree.h
+sdbout.o : sdbout.c $(CONFIG_H) $(TREE_H) $(RTL_H)
 
 emit-rtl.o : emit-rtl.c $(CONFIG_H) $(RTL_H) regs.h insn-config.h real.h
 
@@ -234,34 +398,34 @@ stupid.o : stupid.c $(CONFIG_H) $(RTL_H)
 
 cse.o : cse.c $(CONFIG_H) $(RTL_H) regs.h hard-reg-set.h flags.h real.h
 loop.o : loop.c $(CONFIG_H) $(RTL_H) insn-config.h insn-codes.h \
-   regs.h recog.h flags.h expr.h
+   regs.h hard-reg-set.h recog.h flags.h expr.h
 flow.o : flow.c $(CONFIG_H) $(RTL_H) basic-block.h regs.h hard-reg-set.h
 combine.o : combine.c $(CONFIG_H) $(RTL_H) flags.h  \
    insn-config.h regs.h basic-block.h recog.h
-regclass.o : regclass.c $(CONFIG_H) $(RTL_H) flags.h regs.h \
-   insn-config.h recog.h hard-reg-set.h
-local-alloc.o : local-alloc.c $(CONFIG_H) $(RTL_H) basic-block.h regs.h \
-   insn-config.h recog.h hard-reg-set.h
+regclass.o : regclass.c $(CONFIG_H) $(RTL_H) hard-reg-set.h flags.h \
+   basic-block.h regs.h insn-config.h recog.h 
+local-alloc.o : local-alloc.c $(CONFIG_H) $(RTL_H) flags.h basic-block.h regs.h \
+   hard-reg-set.h insn-config.h recog.h
 global-alloc.o : global-alloc.c $(CONFIG_H) $(RTL_H) flags.h  \
    basic-block.h regs.h hard-reg-set.h insn-config.h
 
-reload.o : reload.c $(CONFIG_H) $(RTL_H)  \
+reload.o : reload.c $(CONFIG_H) $(RTL_H) flags.h \
    reload.h recog.h hard-reg-set.h insn-config.h regs.h
 reload1.o : reload1.c $(CONFIG_H) $(RTL_H) flags.h  \
-   reload.h regs.h hard-reg-set.h insn-config.h basic-block.h
+   reload.h regs.h hard-reg-set.h insn-config.h basic-block.h recog.h
 caller-save.o : caller-save.c $(CONFIG_H) $(RTL_H) flags.h \
    reload.h regs.h hard-reg-set.h insn-config.h basic-block.h recog.h
-final.o : final.c $(CONFIG_H) $(RTL_H) regs.h recog.h conditions.h gdbfiles.h \
-   insn-config.h real.h
+final.o : final.c $(CONFIG_H) $(RTL_H) flags.h regs.h recog.h conditions.h \
+   gdbfiles.h insn-config.h real.h output.h
 recog.o : recog.c $(CONFIG_H) $(RTL_H)  \
-   regs.h recog.h hard-reg-set.h insn-config.h
+   regs.h recog.h hard-reg-set.h insn-config.h real.h
 
 # Normally this target is not used; but it is used if you
 # define ALLOCA=alloca.o.  In that case, you must get a suitable alloca.c
 # from the GNU Emacs distribution.
 # Note some machines won't allow $(CC) without -S on this source file.
 alloca.o:	alloca.c
-	$(CC) $(CFLAGS) -S alloca.c
+	$(CC) $(CFLAGS) -S `echo $(srcdir)/alloca.c | sed 's,^\./,,'`
 	as alloca.s -o alloca.o
 
 # Now the source files that are generated from the machine description.
@@ -275,119 +439,116 @@ alloca.o:	alloca.c
 
 # Each of the other insn-* files is handled by a similar pair of rules.
 
-insn-config.h: stamp-config.h ;
-stamp-config.h : md genconfig
-	./genconfig md > tmp-insn-config.h
-	./move-if-change tmp-insn-config.h insn-config.h
-	touch stamp-config.h
-
-insn-flags.h: stamp-flags.h ;
-stamp-flags.h : md genflags
-	./genflags md > tmp-insn-flags.h
-	./move-if-change tmp-insn-flags.h insn-flags.h
-	touch stamp-flags.h
-
-insn-codes.h: stamp-codes.h ;
-stamp-codes.h : md gencodes
-	./gencodes md > tmp-insn-codes.h
-	./move-if-change tmp-insn-codes.h insn-codes.h
-	touch stamp-codes.h
-
-insn-emit.o : insn-emit.c $(CONFIG_H) $(RTL_H) expr.h insn-config.h real.h
-	$(CC) $(CFLAGS) -c insn-emit.c
-
-insn-emit.c: stamp-emit.c ;
-stamp-emit.c : md genemit
-	./genemit md > tmp-insn-emit.c
-	./move-if-change tmp-insn-emit.c insn-emit.c
-	touch stamp-emit.c
-
-insn-recog.o : insn-recog.c $(CONFIG_H) $(RTL_H) insn-config.h
-	$(CC) $(CFLAGS) -c insn-recog.c
-
-insn-recog.c: stamp-recog.c ;
-stamp-recog.c : md genrecog
-	./genrecog md > tmp-insn-recog.c
-	./move-if-change tmp-insn-recog.c insn-recog.c
-	touch stamp-recog.c
-
-insn-extract.o : insn-extract.c $(RTL_H)
-	$(CC) $(CFLAGS) -c insn-extract.c
-
-insn-extract.c: stamp-extract.c ;
-stamp-extract.c : md genextract
-	./genextract md > tmp-insn-extract.c
-	./move-if-change tmp-insn-extract.c insn-extract.c
-	touch stamp-extract.c
+insn-config.h: stamp-config ;
+stamp-config : md genconfig $(srcdir)/move-if-change
+	./genconfig md > tmp-config.h
+	$(srcdir)/move-if-change tmp-config.h insn-config.h
+	touch stamp-config
+
+insn-flags.h: stamp-flags ;
+stamp-flags : md genflags $(srcdir)/move-if-change
+	./genflags md > tmp-flags.h
+	$(srcdir)/move-if-change tmp-flags.h insn-flags.h
+	touch stamp-flags
+
+insn-codes.h: stamp-codes ;
+stamp-codes : md gencodes $(srcdir)/move-if-change
+	./gencodes md > tmp-codes.h
+	$(srcdir)/move-if-change tmp-codes.h insn-codes.h
+	touch stamp-codes
+
+insn-emit.o : insn-emit.c $(CONFIG_H) $(RTL_H) expr.h real.h insn-codes.h \
+  insn-config.h insn-flags.h
+	$(CC) $(CFLAGS) $(INCLUDES) -c insn-emit.c
+
+insn-emit.c: stamp-emit ;
+stamp-emit : md genemit $(srcdir)/move-if-change
+	./genemit md > tmp-emit.c
+	$(srcdir)/move-if-change tmp-emit.c insn-emit.c
+	touch stamp-emit
+
+insn-recog.o : insn-recog.c $(CONFIG_H) $(RTL_H) insn-config.h real.h recog.h
+	$(CC) $(CFLAGS) $(INCLUDES) -c insn-recog.c
+
+insn-recog.c: stamp-recog ;
+stamp-recog : md genrecog $(srcdir)/move-if-change
+	./genrecog md > tmp-recog.c
+	$(srcdir)/move-if-change tmp-recog.c insn-recog.c
+	touch stamp-recog
+
+insn-extract.o : insn-extract.c $(CONFIG_H) $(RTL_H)
+	$(CC) $(CFLAGS) $(INCLUDES) -c insn-extract.c
+
+insn-extract.c: stamp-extract ;
+stamp-extract : md genextract $(srcdir)/move-if-change
+	./genextract md > tmp-extract.c
+	$(srcdir)/move-if-change tmp-extract.c insn-extract.c
+	touch stamp-extract
 
 insn-peep.o : insn-peep.c $(CONFIG_H) $(RTL_H) regs.h real.h
-	$(CC) $(CFLAGS) -c insn-peep.c
+	$(CC) $(CFLAGS) $(INCLUDES) -c insn-peep.c
 
-insn-peep.c: stamp-peep.c ;
-stamp-peep.c : md genpeep
-	./genpeep md > tmp-insn-peep.c
-	./move-if-change tmp-insn-peep.c insn-peep.c
-	touch stamp-peep.c
+insn-peep.c: stamp-peep ;
+stamp-peep : md genpeep $(srcdir)/move-if-change
+	./genpeep md > tmp-peep.c
+	$(srcdir)/move-if-change tmp-peep.c insn-peep.c
+	touch stamp-peep
 
 insn-output.o : insn-output.c $(CONFIG_H) $(RTL_H) regs.h real.h conditions.h \
-    insn-config.h insn-flags.h output.h aux-output.c
-	$(CC) $(CFLAGS) -c insn-output.c
+    hard-reg-set.h insn-config.h insn-flags.h output.h aux-output.c
+	$(CC) $(CFLAGS) $(INCLUDES) -c insn-output.c
 
-insn-output.c: stamp-output.c ;
-stamp-output.c : md genoutput
-	./genoutput md > tmp-insn-output.c
-	./move-if-change tmp-insn-output.c insn-output.c
-	touch stamp-output.c
+insn-output.c: stamp-output ;
+stamp-output : md genoutput $(srcdir)/move-if-change
+	./genoutput md > tmp-output.c
+	$(srcdir)/move-if-change tmp-output.c insn-output.c
+	touch stamp-output
 
 # Now the programs that generate those files.
+# $(CONFIG_H) is omitted from the deps of the gen*.o
+# because these programs don't really depend on anything 
+# about the target machine.  They do depend on config.h itself,
+# since that describes the host machine.
 
 genconfig : genconfig.o rtl.o $(LIBDEPS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o genconfig genconfig.o rtl.o $(LIBS)
 
-genconfig.o : genconfig.c $(RTL_H)
-	$(CC) $(CFLAGS) -c genconfig.c
+genconfig.o : genconfig.c $(RTL_H) config.h
 
 genflags : genflags.o rtl.o $(LIBDEPS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o genflags genflags.o rtl.o $(LIBS)
 
-genflags.o : genflags.c $(RTL_H)
-	$(CC) $(CFLAGS) -c genflags.c
+genflags.o : genflags.c $(RTL_H) config.h
 
 gencodes : gencodes.o rtl.o $(LIBDEPS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o gencodes gencodes.o rtl.o $(LIBS)
 
-gencodes.o : gencodes.c $(RTL_H)
-	$(CC) $(CFLAGS) -c gencodes.c
+gencodes.o : gencodes.c $(RTL_H) config.h
 
 genemit : genemit.o rtl.o $(LIBDEPS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o genemit genemit.o rtl.o $(LIBS)
 
-genemit.o : genemit.c $(RTL_H)
-	$(CC) $(CFLAGS) -c genemit.c
+genemit.o : genemit.c $(RTL_H) config.h
 
 genrecog : genrecog.o rtl.o $(LIBDEPS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o genrecog genrecog.o rtl.o $(LIBS)
 
-genrecog.o : genrecog.c $(RTL_H)
-	$(CC) $(CFLAGS) -c genrecog.c
+genrecog.o : genrecog.c $(RTL_H) config.h
 
 genextract : genextract.o rtl.o $(LIBDEPS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o genextract genextract.o rtl.o $(LIBS)
 
-genextract.o : genextract.c $(RTL_H)
-	$(CC) $(CFLAGS) -c genextract.c
+genextract.o : genextract.c $(RTL_H) config.h
 
 genpeep : genpeep.o rtl.o $(LIBDEPS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o genpeep genpeep.o rtl.o $(LIBS)
 
-genpeep.o : genpeep.c $(RTL_H)
-	$(CC) $(CFLAGS) -c genpeep.c
+genpeep.o : genpeep.c $(RTL_H) config.h
 
 genoutput : genoutput.o rtl.o $(LIBDEPS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o genoutput genoutput.o rtl.o $(LIBS)
 
-genoutput.o : genoutput.c $(RTL_H)
-	$(CC) $(CFLAGS) -c genoutput.c
+genoutput.o : genoutput.c $(RTL_H) config.h
 
 # Making the preprocessor
 cpp: cccp
@@ -395,106 +556,146 @@ cpp: cccp
 	ln cccp cpp
 cccp: cccp.o cexp.o version.o $(LIBDEPS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o cccp cccp.o cexp.o version.o $(LIBS)
-cexp.o: cexp.c
-cexp.c: cexp.y
-	$(BISON) cexp.y
-	mv cexp.tab.c cexp.c
-cccp.o: cccp.c
-	$(CC) $(CFLAGS) -DGCC_INCLUDE_DIR=\"$(libdir)/gcc-include\" \
-          -DGPLUSPLUS_INCLUDE_DIR=\"$(libdir)/g++-include\" -c cccp.c
+cexp.o: $(srcdir)/cexp.c $(CONFIG_H)
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c $(srcdir)/cexp.c
+$(srcdir)/cexp.c: $(srcdir)/cexp.y
+	$(BISON) -o $(srcdir)/cexp.c $(srcdir)/cexp.y
+cccp.o: cccp.c $(CONFIG_H)
+	$(CC) $(CFLAGS) $(INCLUDES) \
+          -DGCC_INCLUDE_DIR=\"$(libdir)/gcc-include\" \
+          -DGPLUSPLUS_INCLUDE_DIR=\"$(libdir)/g++-include\" \
+	  -c `echo $(srcdir)/cccp.c | sed 's,^\./,,'`
 
-cpp.info: cpp.texinfo
-	makeinfo $<
+$(srcdir)/cpp.info: $(srcdir)/cpp.texinfo
+	makeinfo `echo $(srcdir)/cpp.texinfo | sed 's,^\./,,'`
 
-gplus.info: gplus.texinfo
-	makeinfo $<
+$(srcdir)/gplus.info: $(srcdir)/gplus.texinfo
+	makeinfo `echo $(srcdir)/gplus.texinfo | sed 's,^\./,,'`
 
-gcc.info: gcc.texinfo
-	makeinfo $<
+$(srcdir)/gcc.info: $(srcdir)/gcc.texinfo
+	makeinfo `echo $(srcdir)/gcc.texinfo | sed 's,^\./,,'`
 
 # gnulib is not deleted because deleting it would be inconvenient
 # for most uses of this target.
 clean:
 	-rm -f $(STAGESTUFF) $(STAGE_GCC)
-	-rm -f stamp-*.[ch]
-	-rm -f *.s *.s[0-9] *.co *.greg *.lreg *.combine *.flow *.cse *.jump *.rtl *.tree *.loop
-	-rm -f core
+# Delete the temp files made in the course of building gnulib.
+	-rm -f tmpgnulib
+	for name in $(LIBFUNCS); do rm -f $${name}.c; done
+	-rm -f stamp-*.[ch] tmp-*
+	-rm -f *.s *.s[0-9] *.co *.greg *.lreg *.combine *.flow *.cse *.jump *.rtl *.tree *.loop *.dbr *.jump2
+	-rm -f core float.h hard-params
+
+# Like clean but also delete the links made to configure gcc.
+# Also removes gnulib, since that is desirable if you are changing cpus.
+cleanconfig: clean
+	-rm -f tm.h aux-output.c config.h md config.status gnulib stamp-gnulib2
 
 # Get rid of every file that's generated from some other file (except INSTALL).
-realclean: clean
+realclean: cleanconfig
 	-rm -f cpp.aux cpp.cps cpp.fns cpp.info cpp.kys cpp.pgs cpp.tps cpp.vrs
-	#-rm -f cplus-parse.tab.c cplus-parse.output
-	-rm -f c-parse.tab.c c-parse.output
-	-rm -f errs gnulib cexp.c TAGS 
+#	-rm -f cplus-parse.tab.c cplus-parse.output
+	-rm -f c-parse.tab.c c-parse.output c-parse.tab.output
+	-rm -f gnulib cexp.c TAGS 
+	-rm -f cpp.info* cpp.?? cpp.??s cpp.log cpp.toc cpp.*aux
 	-rm -f gcc.info* gcc.?? gcc.??s gcc.log gcc.toc gcc.*aux
 	-rm -f gplus.info* gplus.?? gplus.??s gplus.log gplus.toc gplus.*aux
-
-# Like realclean but also delete the links made to configure gcc.
-cleanlinks: realclean
-	-rm -f tm.h aux-output.c config.h md config.status
+	-rm -f *.dvi
 
 # Copy the files into directories where they will be run.
-install: all
+install: all $(USER_H) float.h gvarargs.h gstdarg.h gcc.1
 	-mkdir $(libdir)
-	-if [ -f cc1 ] ; then $(INSTALL) cc1 $(libdir)/gcc-cc1 ;fi
-	-if [ -f cc1plus ] ; then $(INSTALL) cc1plus $(libdir)/gcc-cc1plus ;fi
+	-if [ -f cc1 ] ; then $(INSTALL) cc1 $(libdir)/gcc-cc1 ; else true; fi
+	-if [ -f cc1plus ] ; then $(INSTALL) cc1plus $(libdir)/gcc-cc1plus ; else true; fi
 	$(INSTALL) gnulib $(libdir)/gcc-gnulib
-	-if [ -f /usr/bin/ranlib ] ; then (cd $(libdir); ranlib gcc-gnulib) ;fi
+	-if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then (cd $(libdir); $(RANLIB) gcc-gnulib) ; else true; fi
 	$(INSTALL) cpp $(libdir)/gcc-cpp
 	$(INSTALL) gcc $(bindir)
 	-mkdir $(libdir)/gcc-include
-	chmod ugo+rx $(libdir)/gcc-include
-	for file in $(USER_H); do $(INSTALL) $${file} $(libdir)/gcc-include; done
-	$(INSTALL) gcc.1 $(mandir)/gcc.$(manext)
+	-chmod ugo+rx $(libdir)/gcc-include
+	for file in $(USER_H); do \
+	     for eachfile in  $(srcdir)/$${file} ; do \
+		$(INSTALL) $${eachfile} $(libdir)/gcc-include/`basename $${eachfile}`; \
+	     done ; done
+	$(INSTALL) float.h $(libdir)/gcc-include/float.h
+	$(INSTALL) $(srcdir)/gvarargs.h $(libdir)/gcc-include/varargs.h
+	$(INSTALL) $(srcdir)/gstdarg.h $(libdir)/gcc-include/stdarg.h
+	-chmod a-x $(libdir)/gcc-include/*.h
+	$(INSTALL) $(srcdir)/gcc.1 $(mandir)/gcc.$(manext)
+	-chmod a-x $(mandir)/gcc.$(manext)
+# Make sure -lg won't get an error message from the linker:
+# create a library libg.a if there isn't one.
+	-if [ -f /lib/libg.a -o -f /usr/lib/libg.a ]; then \
+		: ; \
+	else \
+		echo Installing a dummy libg.a into /usr/lib; \
+		echo "_no_libg(){}" > _no_libg.c; \
+		./gcc -B./ -c _no_libg.c; \
+		$(AR) rc libg.a _no_libg.o; \
+		$(INSTALL) libg.a /usr/lib/libg.a; \
+		if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then (cd /usr/lib; $(RANLIB) libg.a) ; else true; fi; \
+		rm -f _no_libg.[co] libg.a; \
+	fi
 
 # do make -f ../gcc/Makefile maketest DIR=../gcc
 # in the intended test directory to make it a suitable test directory.
 maketest:
 	ln -s $(DIR)/*.[chy] .
+	ln -s $(DIR)/config .
 	ln -s $(DIR)/*.def .
-	ln -s $(DIR)/*.md .
 	-rm -f =*
 	ln -s $(DIR)/.gdbinit .
 	-ln -s $(DIR)/bison.simple .
 	ln -s $(DIR)/config.gcc .
 	ln -s $(DIR)/move-if-change .
-	if [ -f Makefile ] ; then false; else ln -s $(DIR)/Makefile . ; fi
+# The then and else were swapped to avoid a problem on Ultrix.
+	if [ ! -f Makefile ] ; then ln -s $(DIR)/Makefile . ; else false; fi
 	-rm tm.h aux-output.c config.h md
 	make clean
 # You must then run config.gcc to set up for compilation.
 
 bootstrap: all force
 	$(MAKE) stage1
-	$(MAKE) CC="stage1/gcc -Bstage1/" CFLAGS="-O $(CFLAGS)"
+	$(MAKE) CC="stage1/gcc -Bstage1/" CFLAGS="-O $(CFLAGS)" libdir=$(libdir)
 	$(MAKE) stage2
-	$(MAKE) CC="stage2/gcc -Bstage2/" CFLAGS="-O $(CFLAGS)"
+	$(MAKE) CC="stage2/gcc -Bstage2/" CFLAGS="-O $(CFLAGS)" libdir=$(libdir)
 
 bootstrap2: force
-	$(MAKE) CC="stage1/gcc -Bstage1/" CFLAGS="-O $(CFLAGS)"
+	$(MAKE) CC="stage1/gcc -Bstage1/" CFLAGS="-O $(CFLAGS)" libdir=$(libdir)
 	$(MAKE) stage2
-	$(MAKE) CC="stage2/gcc -Bstage2/" CFLAGS="-O $(CFLAGS)"
+	$(MAKE) CC="stage2/gcc -Bstage2/" CFLAGS="-O $(CFLAGS)" libdir=$(libdir)
 
 bootstrap3: force
-	$(MAKE) CC="stage2/gcc -Bstage2/" CFLAGS="-O $(CFLAGS)"
+	$(MAKE) CC="stage2/gcc -Bstage2/" CFLAGS="-O $(CFLAGS)" libdir=$(libdir)
 
 # Copy the object files from a particular stage into a subdirectory.
 stage1: force
 	-mkdir stage1
 	-mv $(STAGESTUFF) $(STAGE_GCC) stage1
 	-rm -f stage1/gnulib
-	-ln gnulib stage1 || (cp gnulib stage1 && ranlib stage1/gnulib)
+	-ln gnulib stage1 || cp gnulib stage1
+	-if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then $(RANLIB) stage1/gnulib; else true; fi
 
 stage2: force
 	-mkdir stage2
 	-mv $(STAGESTUFF) $(STAGE_GCC) stage2
 	-rm -f stage2/gnulib
-	-ln gnulib stage2 || (cp gnulib stage2 && ranlib stage2/gnulib)
+	-ln gnulib stage2 || cp gnulib stage2
+	-if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then $(RANLIB) stage2/gnulib; else true; fi
 
 stage3: force
 	-mkdir stage3
 	-mv $(STAGESTUFF) $(STAGE_GCC) stage3
 	-rm -f stage3/gnulib
-	-ln gnulib stage3 || (cp gnulib stage3 && ranlib stage3/gnulib)
+	-ln gnulib stage3 || cp gnulib stage3
+	-if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then $(RANLIB) stage3/gnulib; else true; fi
+
+stage4: force
+	-mkdir stage4
+	-mv $(STAGESTUFF) $(STAGE_GCC) stage4
+	-rm -f stage4/gnulib
+	-ln gnulib stage4 || cp gnulib stage4
+	-if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then $(RANLIB) stage4/gnulib; else true; fi
 
 TAGS: force
 	mkdir temp
@@ -503,7 +704,10 @@ TAGS: force
 	mv temp/* .
 	rmdir temp
 
+includes: force
+	export LIB; LIB=$(libdir)/gcc-include ./fixincludes
+
 #In GNU Make, ignore whether `stage*' exists.
-.PHONY: stage1 stage2 stage3 clean realclean TAGS bootstrap
+.PHONY: stage1 stage2 stage3 stage4 clean realclean TAGS bootstrap
 
 force: