--- gcc/Makefile	2018/04/24 16:39:05	1.1.1.3
+++ gcc/Makefile	2018/04/24 16:43:49	1.1.1.8
@@ -39,25 +39,42 @@ 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:
-# CLIB = alloca.o
-# Get alloca.o from GNU Emacs.
+# 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:
+# ALLOCA = alloca.o
+
+# If your system has alloca() in /lib/libPW.a, un-comment the following line:
+# CLIB= -lPW
+  
+# 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
 
-# You must also change the line that uses `ranlib'.  See 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
+# Change this to a null string if obstacks are installed in the
+# system library.
 OBSTACK=obstack.o
-# Dependency on obstack
-OBSTACK1=obstack.o
 
-LIBS = $(OBSTACK) $(CLIB)
+# Dependency on obstack, alloca, malloc or whatever library facilities
+# are not installed in the system libraries.
+LIBDEPS= $(OBSTACK) $(ALLOCA) $(MALLOC)
+
+# How to link with both our special library facilities
+# and the system's installed libraries.
+LIBS = $(OBSTACK) $(ALLOCA) $(MALLOC) $(CLIB)
+
 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 \
+# Object files of CC1.
+OBJS = toplev.o version.o c-parse.tab.o tree.o print-tree.o \
+ c-decl.o c-typeck.o c-convert.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 +87,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 \
@@ -78,6 +95,9 @@ LIBFUNCS = va_end _eprintf \
    _floatsidf _floatdidf _truncdfsf2 _extendsfdf2 \
    _addsf3 _negsf2 _subsf3 _cmpsf2 _mulsf3 _divsf3
 
+# 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
+
 # If you want to recompile everything, just do rm *.o.
 # CONFIG_H = config.h tm.h
 CONFIG_H =
@@ -86,18 +106,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)
+gcc: gcc.o version.o $(LIBDEPS)
+	$(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)
+cc1: $(OBJS) $(LIBDEPS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o cc1 $(OBJS) $(LIBS)
 
 #Library of arithmetic subroutines
 # Don't compile this with gcc!
@@ -115,55 +137,65 @@ 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.
 #	mv gnulib gnulib-hp
 #	hpxt gnulib-hp gnulib
 
-decl.o : decl.c $(CONFIG_H) $(TREE_H) flags.h c-tree.h parse.h
-typecheck.o : typecheck.c $(CONFIG_H) $(TREE_H) c-tree.h flags.h
+
+# 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) -v c-parse.y
+
+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
+c-convert.o : c-convert.c $(CONFIG_H) $(TREE_H)
+
+# Language-independent files.
+
 tree.o : tree.c $(CONFIG_H) $(TREE_H)
 print-tree.o : print-tree.c $(CONFIG_H) $(TREE_H)
 stor-layout.o : stor-layout.c $(CONFIG_H) $(TREE_H)
 fold-const.o : fold-const.c $(CONFIG_H) $(TREE_H)
 toplev.o : toplev.c $(CONFIG_H) $(TREE_H) flags.h
 
-parse.tab.o : parse.tab.c $(CONFIG_H) $(TREE_H) parse.h c-tree.h flags.h
-
-parse.tab.c : parse.y
-	$(BISON) -v 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)
+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
 
 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
 
-cse.o : cse.c $(CONFIG_H) $(RTL_H) insn-config.h regs.h hard-reg-set.h
+cse.o : cse.c $(CONFIG_H) $(RTL_H) insn-config.h regs.h hard-reg-set.h flags.h
 loop.o : loop.c $(CONFIG_H) $(RTL_H) insn-config.h regs.h recog.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 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 +203,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
 
@@ -229,50 +262,50 @@ 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)
+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
 
-genflags : genflags.o rtl.o $(OBSTACK1)
-	$(CC) $(CFLAGS) -o genflags genflags.o rtl.o $(LIBS)
+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
 
-gencodes : gencodes.o rtl.o $(OBSTACK1)
-	$(CC) $(CFLAGS) -o gencodes gencodes.o rtl.o $(LIBS)
+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
 
-genemit : genemit.o rtl.o $(OBSTACK1)
-	$(CC) $(CFLAGS) -o genemit genemit.o rtl.o $(LIBS)
+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
 
-genrecog : genrecog.o rtl.o $(OBSTACK1)
-	$(CC) $(CFLAGS) -o genrecog genrecog.o rtl.o $(LIBS)
+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
 
-genextract : genextract.o rtl.o $(OBSTACK1)
-	$(CC) $(CFLAGS) -o genextract genextract.o rtl.o $(LIBS)
+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
 
-genpeep : genpeep.o rtl.o $(OBSTACK1)
-	$(CC) $(CFLAGS) -o genpeep genpeep.o rtl.o $(LIBS)
+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
 
-genoutput : genoutput.o rtl.o $(OBSTACK1)
-	$(CC) $(CFLAGS) -o genoutput genoutput.o rtl.o $(LIBS)
+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
@@ -281,13 +314,21 @@ genoutput.o : genoutput.c $(RTL_H)
 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)
+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
+
+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.
@@ -296,13 +337,22 @@ clean:
 	-rm -f *.s *.s[0-9] *.co *.greg *.lreg *.combine *.flow *.cse *.jump *.rtl *.tree *.loop
 	-rm -f core
 
+# Get rid of every file that's generated from some other file (except INSTALL).
+realclean: clean
+	-rm -f cpp.aux cpp.cps cpp.fns cpp.info cpp.kys cpp.pgs cpp.tps cpp.vrs
+	-rm -f c-parse.tab.c c-parse.output errs gnulib cexp.c TAGS 
+	-rm -f internals internals-* internals.?? internals.??s
+
 # Copy the files into directories where they will be run.
 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
+	cd $(libdir)/gcc-include; rm -f $(USER_H)
+	cp $(USER_H) $(libdir)/gcc-include
 
 # do make -f ../gcc/Makefile maketest DIR=../gcc
 # in the intended test directory to make it a suitable test directory.
@@ -323,19 +373,24 @@ maketest:
 stage1: force
 	-mkdir stage1
 	mv $(STAGESTUFF) $(STAGE_GCC) stage1
-	ln gnulib stage1
+	-rm stage1/gnulib
+	-ln gnulib stage1 || cp gnulib stage1
 
 stage2: force
 	-mkdir stage2
 	mv $(STAGESTUFF) $(STAGE_GCC) stage2
-	ln gnulib stage2
+	-rm stage2/gnulib
+	-ln gnulib stage2 || cp gnulib stage2
 
 stage3: force
 	-mkdir stage3
 	mv $(STAGESTUFF) $(STAGE_GCC) stage3
-	ln gnulib stage3
+	-rm stage3/gnulib
+	-ln gnulib stage3 || cp gnulib stage3
+
+#In GNU Make, ignore whether `stage*' exists.
+.PHONY: stage1 stage2 stage3 clean realclean
 
-.PHONY: stage1 stage2 stage3 #In GNU Make, ignore whether `stage*' exists.
 force:
 
 TAGS: force