--- gcc/Makefile	2018/04/24 16:39:05	1.1.1.3
+++ gcc/Makefile	2018/04/24 16:42:01	1.1.1.6
@@ -39,12 +39,20 @@ libdir = /usr/local/lib
 # For CCLIBFLAGS you might want to specify the switch that
 # forces only 68000 instructions to be used.
 
-# If you are compiling this with CC on HPUX, you need the following line:
+# 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), then get alloca.c from
+# GNU Emacs and un-comment the following line:
 # CLIB = alloca.o
-# Get alloca.o from GNU Emacs.
 
-# You must also change the line that uses `ranlib'.  See below.
+# If your system has alloca() in /lib/libPW.a, un-comment the following line:
+# CLIB= -lc -lPW
 
+# For System V based systems, you will also have to comment out the `ranlib'
+# command below.
+
+# If you are running GCC on an Apollo, you will need this:
+# CFLAGS = -g -O -M 3000 -U__STDC__ -DSHORT_ENUM_BUG
 
 # How to link with obstack
 OBSTACK=obstack.o
@@ -57,7 +65,7 @@ DIR = ../gcc
 OBJS = toplev.o version.o parse.tab.o tree.o print-tree.o \
  decl.o typecheck.o stor-layout.o fold-const.o \
  rtl.o expr.o stmt.o expmed.o explow.o optabs.o varasm.o \
- symout.o dbxout.o emit-rtl.o insn-emit.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 insn-peep.o \
  final.o recog.o insn-recog.o insn-extract.o insn-output.o
@@ -70,7 +78,7 @@ STAGESTUFF = *.o insn-flags.h insn-confi
  cc1 cpp cccp
 
 # Members of gnulib.
-LIBFUNCS = va_end _eprintf \
+LIBFUNCS = _eprintf \
    _umulsi3 _mulsi3 _udivsi3 _divsi3 _umodsi3 _modsi3 \
    _lshrsi3 _lshlsi3 _ashrsi3 _ashlsi3 \
    _divdf3 _muldf3 _negdf2 _adddf3 _subdf3 _cmpdf2 \
@@ -86,18 +94,20 @@ TREE_H = tree.h tree.def machmode.def
 
 all: gnulib gcc cc1 cpp
 
+doc: cpp.info internals
+
 compilations: ${OBJS}
 
 gcc: gcc.o version.o $(OBSTACK1)
-	$(CC) $(CFLAGS) -o gccnew gcc.o version.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o gccnew gcc.o version.o $(LIBS)
 # Go via `gccnew' to avoid `file busy' if $(CC) is `gcc'.
 	mv gccnew gcc
 
 gcc.o: gcc.c $(CONFIG_H)
-	$(CC) $(CFLAGS) -c gcc.c
+	$(CC) $(CFLAGS) -c -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-\" gcc.c
 
 cc1: $(OBJS) $(OBSTACK1)
-	$(CC) $(CFLAGS) -o cc1 $(OBJS) $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o cc1 $(OBJS) $(LIBS)
 
 #Library of arithmetic subroutines
 # Don't compile this with gcc!
@@ -115,7 +125,7 @@ gnulib: gnulib.c
 	done
 	mv libtemp/gnulib .
 	rm -rf libtemp
-	ranlib gnulib
+	if [ -f /usr/bin/ranlib ] ; then  ranlib gnulib ;fi
 # On HPUX, if you are working with the GNU assembler and linker,
 # the previous line must be replaced with
 # No change is needed here if you are using the HPUX assembler and linker.
@@ -137,22 +147,24 @@ parse.tab.c : parse.y
 
 rtl.o : rtl.c $(CONFIG_H) $(RTL_H)
 
-varasm.o : varasm.c $(CONFIG_H) $(TREE_H) $(RTL_H) flags.h expr.h
+varasm.o : varasm.c $(CONFIG_H) $(TREE_H) $(RTL_H) flags.h expr.h insn-codes.h
 stmt.o : stmt.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h  \
-   insn-flags.h expr.h insn-config.h regs.h 
+   insn-flags.h expr.h insn-config.h regs.h insn-codes.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
 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
+explow.o : explow.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h expr.h insn-codes.h
 optabs.o : optabs.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.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)
+sdbout.o : sdbout.c $(CONFIG_H) $(TREE_H) $(RTL_H) c-tree.h
 
 emit-rtl.o : emit-rtl.c $(CONFIG_H) $(RTL_H) regs.h insn-config.h
 
-integrate.o : integrate.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h expr.h insn-flags.h
+integrate.o : integrate.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h expr.h \
+   insn-flags.h insn-codes.h
 
 jump.o : jump.c $(CONFIG_H) $(RTL_H) flags.h regs.h
 stupid.o : stupid.c $(CONFIG_H) $(RTL_H) regs.h hard-reg-set.h
@@ -162,8 +174,10 @@ loop.o : loop.c $(CONFIG_H) $(RTL_H) ins
 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 hard-reg-set.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
 global-alloc.o : global-alloc.c $(CONFIG_H) $(RTL_H) flags.h  \
    basic-block.h regs.h hard-reg-set.h insn-config.h
 
@@ -171,7 +185,8 @@ reload.o : reload.c $(CONFIG_H) $(RTL_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
-final.o : final.c $(CONFIG_H) $(RTL_H) regs.h recog.h conditions.h gdbfiles.h
+final.o : final.c $(CONFIG_H) $(RTL_H) regs.h recog.h conditions.h gdbfiles.h \
+   insn-config.h
 recog.o : recog.c $(CONFIG_H) $(RTL_H)  \
    regs.h recog.h hard-reg-set.h insn-config.h
 
@@ -230,49 +245,49 @@ insn-output.c : md genoutput
 # Now the programs that generate those files.
 
 genconfig : genconfig.o rtl.o $(OBSTACK1)
-	$(CC) $(CFLAGS) -o genconfig genconfig.o rtl.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o genconfig genconfig.o rtl.o $(LIBS)
 
 genconfig.o : genconfig.c $(RTL_H)
 	$(CC) $(CFLAGS) -c genconfig.c
 
 genflags : genflags.o rtl.o $(OBSTACK1)
-	$(CC) $(CFLAGS) -o genflags genflags.o rtl.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o genflags genflags.o rtl.o $(LIBS)
 
 genflags.o : genflags.c $(RTL_H)
 	$(CC) $(CFLAGS) -c genflags.c
 
 gencodes : gencodes.o rtl.o $(OBSTACK1)
-	$(CC) $(CFLAGS) -o gencodes gencodes.o rtl.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o gencodes gencodes.o rtl.o $(LIBS)
 
 gencodes.o : gencodes.c $(RTL_H)
 	$(CC) $(CFLAGS) -c gencodes.c
 
 genemit : genemit.o rtl.o $(OBSTACK1)
-	$(CC) $(CFLAGS) -o genemit genemit.o rtl.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o genemit genemit.o rtl.o $(LIBS)
 
 genemit.o : genemit.c $(RTL_H)
 	$(CC) $(CFLAGS) -c genemit.c
 
 genrecog : genrecog.o rtl.o $(OBSTACK1)
-	$(CC) $(CFLAGS) -o genrecog genrecog.o rtl.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o genrecog genrecog.o rtl.o $(LIBS)
 
 genrecog.o : genrecog.c $(RTL_H)
 	$(CC) $(CFLAGS) -c genrecog.c
 
 genextract : genextract.o rtl.o $(OBSTACK1)
-	$(CC) $(CFLAGS) -o genextract genextract.o rtl.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o genextract genextract.o rtl.o $(LIBS)
 
 genextract.o : genextract.c $(RTL_H)
 	$(CC) $(CFLAGS) -c genextract.c
 
 genpeep : genpeep.o rtl.o $(OBSTACK1)
-	$(CC) $(CFLAGS) -o genpeep genpeep.o rtl.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o genpeep genpeep.o rtl.o $(LIBS)
 
 genpeep.o : genpeep.c $(RTL_H)
 	$(CC) $(CFLAGS) -c genpeep.c
 
 genoutput : genoutput.o rtl.o $(OBSTACK1)
-	$(CC) $(CFLAGS) -o genoutput genoutput.o rtl.o $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o genoutput genoutput.o rtl.o $(LIBS)
 
 genoutput.o : genoutput.c $(RTL_H)
 	$(CC) $(CFLAGS) -c genoutput.c
@@ -282,12 +297,20 @@ cpp: cccp
 	-rm -f cpp
 	ln cccp cpp
 cccp: cccp.o cexp.o version.o
-	$(CC) $(CFLAGS) -o cccp cccp.o cexp.o version.o $(CLIB)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o cccp cccp.o cexp.o version.o $(CLIB)
 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
+
+cpp.info: cpp.texinfo
+	makeinfo $<
+
+internals: internals.texinfo
+	makeinfo $<
 
 # gnulib is not deleted because deleting it would be inconvenient
 # for most uses of this target.
@@ -300,9 +323,11 @@ clean:
 install: all
 	install cc1 $(libdir)/gcc-cc1
 	install -c -m 755 gnulib $(libdir)/gcc-gnulib
-	ranlib $(libdir)/gcc-gnulib
+	if [ -f /usr/bin/ranlib ] ; then  ranlib $(libdir)/gcc-gnulib ;fi
 	install cpp $(libdir)/gcc-cpp
 	install gcc $(bindir)
+	-mkdir $(libdir)/gcc-include
+	cp stddef.h stdarg.h assert.h varargs.h limits.h $(libdir)/gcc-include
 
 # do make -f ../gcc/Makefile maketest DIR=../gcc
 # in the intended test directory to make it a suitable test directory.