Commit c1b9947f by Per Bothner

Merge. See ChangeLog.

From-SVN: r5126
parent e9cd0b25
...@@ -1427,9 +1427,10 @@ gen-protos: gen-protos.o scan.o ...@@ -1427,9 +1427,10 @@ gen-protos: gen-protos.o scan.o
${HOST_CC} -o gen-protos gen-protos.o scan.o ${HOST_CC} -o gen-protos gen-protos.o scan.o
xsys-protos.h: $(srcdir)/sys-protos.h deduced.h gen-protos Makefile xsys-protos.h: $(srcdir)/sys-protos.h deduced.h gen-protos Makefile
cat deduced.h $(srcdir)/sys-protos.h |\ cat deduced.h $(srcdir)/sys-protos.h >tmp.c
sed -e 's/ / /g' -e 's/ *(/ (/g' -e 's/ [ ]*/ /g' >tmp.c $(GCC_FOR_TARGET) tmp.c -E \
$(GCC_FOR_TARGET) tmp.c -E | ./gen-protos >xsys-protos.h | sed -e 's/ / /g' -e 's/ *(/ (/g' -e 's/ [ ]*/ /g' -e 's/( )/()/' \
| ./gen-protos >xsys-protos.h
scan-decls: scan-decls.o scan.o scan-decls: scan-decls.o scan.o
$(HOST_CC) -o scan-decls scan-decls.o scan.o $(HOST_CC) -o scan-decls scan-decls.o scan.o
...@@ -1511,8 +1512,8 @@ mostlyclean: ...@@ -1511,8 +1512,8 @@ mostlyclean:
-rm -f specs gfloat.h float.h-* enquire SYSCALLS.c.X SYSCALLS.c -rm -f specs gfloat.h float.h-* enquire SYSCALLS.c.X SYSCALLS.c
-rm -f collect collect2 ld mips-tfile mips-tdump alloca.s -rm -f collect collect2 ld mips-tfile mips-tdump alloca.s
# Delete files generated for fixproto # Delete files generated for fixproto
rm -rf patch-header scan-decls xsys-protos.h deduced.h tmp-deduced.h \ -rm -rf patch-header scan-decls xsys-protos.h deduced.h tmp-deduced.h \
tmp.i tmp.c gen-protos fixproto.list fixtmp.?
# Delete unwanted output files from TeX. # Delete unwanted output files from TeX.
-rm -f *.toc *.log *.vr *.fn *.cp *.tp *.ky *.pg -rm -f *.toc *.log *.vr *.fn *.cp *.tp *.ky *.pg
# Delete sorted indices we don't actually use. # Delete sorted indices we don't actually use.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment