* Makefile.in: Add some missing $(exeext). Remove some obsolete

        runtime stuff.
        * Make-lang.in: Similarly.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@24508 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 19 insertions, 30 deletions

diff --git a/gcc/ch/ChangeLog b/gcc/ch/ChangeLog
index d6071c46da2..f0aa04fa24f 100644
--- a/gcc/ch/ChangeLog
+++ b/gcc/ch/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jan  6 02:53:38 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* Makefile.in: Add some missing $(exeext).  Remove some obsolete
+	runtime stuff.
+	* Make-lang.in: Similarly.
+	
 Tue Nov 24 09:57:34 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* Makefile.in (lex.c): Do not depend on hash.h.
diff --git a/gcc/ch/Make-lang.in b/gcc/ch/Make-lang.in
index 2194741a4f0..a4011f3ad7f 100644
--- a/gcc/ch/Make-lang.in
+++ b/gcc/ch/Make-lang.in
@@ -64,14 +64,14 @@ CHILL_FLAGS_TO_PASS = \
 	"GNUCHILL_VERSION=$(GNUCHILL_VERSION)"
 #
 # Define the names for selecting languages in LANGUAGES.
-CHILL: chill cc1chill chill-runtime
+CHILL: chill cc1chill$(exeext)
 
 # handle startfile in chill script and build script to install
 chill: $(srcdir)/ch/chill.in Makefile
 	thisdir=`pwd` ; \
 	sed -e "s:startfile=chillrt0:startfile=$${thisdir}/ch/runtime/chillrt0.o:" \
 	    -e "s:libpath=chillrt:libpath=-L$${thisdir}/ch/runtime/:" \
-	    -e "s:whatgcc=gcc:whatgcc=\"$${thisdir}/xgcc -B$${thisdir}/\":" \
+	    -e "s:whatgcc=gcc:whatgcc=\"$${thisdir}/xgcc$(exeext) -B$${thisdir}/\":" \
 	    -e "s:gnuchill_version=unknown:gnuchill_version=$(GNUCHILL_VERSION):" \
 	    -e "s:gnuchill_script_flags=:gnuchill_script_flags=\"$(GNUCHILL_SCRIPT_FLAGS)\":" $(srcdir)/ch/chill.in > chill ; \
 	chmod a+x chill ; \
@@ -87,24 +87,17 @@ chill: $(srcdir)/ch/chill.in Makefile
 	    -e "s:gnuchill_script_flags=:gnuchill_script_flags=\"$(GNUCHILL_SCRIPT_FLAGS)\":" $(srcdir)/ch/chill.in > chill.install ; \
 	chmod a+x chill.install
 
-# Don't depend on cc1chill, because chill-cross is always built for cross,
-# and thus a cc1chill dependence would force cc1chill to always be built.
+# Don't depend on cc1chill$(exeext), because chill-cross is always built for cross,
+# and thus a cc1chill$(exeext) dependence would force cc1chill$(exeext) to always be built.
 # Note that gcc-cross and g++-cross do not have cc1 or cc1plus dependencies.
 chill-cross: $(srcdir)/ch/chill.in
 	touch $@
 
-cc1chill: $(P) $(CHILL_SRCS) $(LIBDEPS) stamp-objlist \
+cc1chill$(exeext): $(P) $(CHILL_SRCS) $(LIBDEPS) stamp-objlist \
 	insn-config.h insn-flags.h insn-attr.h insn-codes.h \
 	c-typeck.o c-aux-info.o c-common.o c-iterate.o
-	cd ch; $(MAKE) $(FLAGS_TO_PASS) $(CHILL_FLAGS_TO_PASS) ../cc1chill
-
-chill-runtime: stmp-headers $(GCC_PASSES)
-	case "$(LANGUAGES)" in \
-	*CHILL*) if [ -f ch/runtime/Makefile -a -z "$(CROSS)" ] ; then \
-		   thisdir1=`pwd`; \
-		   cd ch/runtime; $(MAKE) $(FLAGS_TO_PASS) $(CHILL_FLAGS_TO_PASS) GCC_FOR_TARGET="$${thisdir1}/xgcc -B$${thisdir1}/" all ; \
-		 else true; fi ;; \
-	esac
+	cd ch; $(MAKE) $(FLAGS_TO_PASS) $(CHILL_FLAGS_TO_PASS) ../cc1chill$(exeext)
+
 #
 # Build hooks:
 
@@ -127,21 +120,11 @@ chill.dvi: $(srcdir)/ch/chill.texi $(srcdir)/extend.texi $(srcdir)/invoke.texi $
 # Install hooks:
 # cc1chill is installed elsewhere as part of $(COMPILERS).
 
-CHILL.install-normal: install-libchill
-
-# Install the CHILL run time library.
-install-libchill: chill-runtime
-	if [ -f ch/runtime/libchill.a ] ; then \
-	  $(INSTALL_DATA) ch/runtime/libchill.a $(libsubdir)/libchill.a; \
-	  if $(RANLIB_TEST) ; then \
-	    (cd $(libsubdir); $(RANLIB) libchill.a); else true; fi; \
-	  chmod a-x $(libsubdir)/libchill.a; \
-	  $(INSTALL_DATA) ch/runtime/chillrt0.o $(libsubdir)/chillrt0.o; \
-	else true; fi
+CHILL.install-normal:
 
 # Install the driver program
 CHILL.install-common:
-	-if [ -f cc1chill ] ; then \
+	-if [ -f cc1chill$(exeext) ] ; then \
 	  if [ -f chill.install ] ; then \
 	    if [ -f gcc-cross$(exeext) ]; then \
 	      rm -f $(bindir)/$(CHILL_CROSS_NAME); \
diff --git a/gcc/ch/Makefile.in b/gcc/ch/Makefile.in
index a9ed5f6a0b8..24ac23ba287 100644
--- a/gcc/ch/Makefile.in
+++ b/gcc/ch/Makefile.in
@@ -126,7 +126,7 @@ all: all.indirect
 
 # Now figure out from those variables how to compile and link.
 
-all.indirect: Makefile ../chill ../cc1chill
+all.indirect: Makefile ../chill ../cc1chill$(exeext)
 
 # IN_GCC tells obstack.h that we are using gcc's <stddef.h> file.
 INTERNAL_CFLAGS = $(CROSS) -DIN_GCC
@@ -202,7 +202,7 @@ CHILL_OBJS = parse.o actions.o except.o grant.o lang.o \
 OBJS = `cat ../stamp-objlist`
 OBJDEPS = ../stamp-objlist
 
-../cc1chill: $(P) $(CHILL_OBJS) $(OBJDEPS) $(LIBDEPS)
+../cc1chill$(exeext): $(P) $(CHILL_OBJS) $(OBJDEPS) $(LIBDEPS)
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(CHILL_OBJS) \
 	      $(OBJS) $(C_OBJS) $(LIBS)
 
@@ -215,7 +215,7 @@ utils/printf : $(srcdir)/utils/printf.c
 # This is the top-level trigger for a CHILL regression test.
 # It also builds those tools needed for CHILL regression testing.
 #
-check: ../cc1chill utils/printf
+check: ../cc1chill$(exeext) utils/printf
 	cd ..; $(MAKE) $(FLAGS_TO_PASS) xgcc gcov cpp cc1 ld
 	$(srcdir)/regression.sh -d -p
 
@@ -238,7 +238,7 @@ clean:  mostlyclean
 Makefile: $(srcdir)/Makefile.in $(srcdir)/../configure
 	cd ..; $(SHELL) config.status
 
-native: config.status ../cc1chill ../chill
+native: config.status ../cc1chill$(exeext) ../chill
 
 # Compiling object files from source files.