From: Per Bothner <bothner@gcc.gnu.org>
Date: Tue, 10 Aug 1993 02:16:16 +0000 (-0700)
Subject: Merge.  See ChangeLog.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c1b9947f062a6cabf5c0bc7883a9e067c134dfc8;p=gcc.git

Merge.  See ChangeLog.

From-SVN: r5126
---

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 81a03dfc771..a77df9cf6c8 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1427,9 +1427,10 @@ 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
-	cat deduced.h $(srcdir)/sys-protos.h |\
-	  sed -e 's/	/ /g' -e 's/ *(/ (/g' -e 's/ [ ]*/ /g' >tmp.c
-	$(GCC_FOR_TARGET) tmp.c -E | ./gen-protos >xsys-protos.h
+	cat deduced.h $(srcdir)/sys-protos.h >tmp.c
+	$(GCC_FOR_TARGET) tmp.c -E \
+	  | sed -e 's/	/ /g' -e 's/ *(/ (/g' -e 's/ [ ]*/ /g' -e 's/( )/()/' \
+	  | ./gen-protos >xsys-protos.h
 
 scan-decls: scan-decls.o scan.o
 	$(HOST_CC) -o scan-decls scan-decls.o scan.o
@@ -1511,8 +1512,8 @@ mostlyclean:
 	-rm -f specs gfloat.h float.h-* enquire SYSCALLS.c.X SYSCALLS.c
 	-rm -f collect collect2 ld mips-tfile mips-tdump alloca.s
 # Delete files generated for fixproto
-	rm -rf patch-header scan-decls xsys-protos.h deduced.h tmp-deduced.h \
-	  tmp.i tmp.c
+	-rm -rf patch-header scan-decls xsys-protos.h deduced.h tmp-deduced.h \
+	  gen-protos fixproto.list fixtmp.?
 # Delete unwanted output files from TeX.
 	-rm -f *.toc *.log *.vr *.fn *.cp *.tp *.ky *.pg
 # Delete sorted indices we don't actually use.