* profile/configure.in (CRT0S): Configure name of gcrt?.o

	based on target, building gcrt0.o for cygwin -mno-cygwin.
	* profile/configure: Regenerate.
	* profile/Makefile.in (CRT0S): Use name from configure.
	(gcrt0.o): New rule.
	(ALL_CRT0S): New define, used to cleanup all gcrt?.o's.

4 files changed, 27 insertions, 3 deletions

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index a27d89b52..87996def7 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-09  Danny Smith  <dannysmith@sourceforge.users.net>
+
+	* profile/configure.in (CRT0S): Configure name of gcrt?.o
+	based on target, building gcrt0.o for cygwin -mno-cygwin.
+	* profile/configure: Regenerate.
+	* profile/Makefile.in (CRT0S): Use name from configure.
+	(gcrt0.o): New rule.   
+	(ALL_CRT0S): New define, used to cleanup all gcrt?.o's.
+
 2002-04-04  Danny Smith  <dannysmith@sourceforge.users.net>
 
 	* include/math.h (DOMAIN, SING, OVERFLOW, UNDERFLOW,
diff --git a/winsup/mingw/profile/Makefile.in b/winsup/mingw/profile/Makefile.in
index 07d5d54a2..eb89fe24d 100644
--- a/winsup/mingw/profile/Makefile.in
+++ b/winsup/mingw/profile/Makefile.in
@@ -65,7 +65,8 @@ DLLTOOL_FLAGS = --as $(AS_FOR_TARGET)
 
 LIBGMON_A = @LIBGMON_A@
 LIBGMON_OBJS = gmon.o mcount.o profil.o
-CRT0S = gcrt1.o gcrt2.o
+CRT0S = @CRT0S@
+ALL_CRT0S = gcrt0.o gcrt1.o gcrt2.o
 
 LIBS = $(LIBGMON_A)
 DLLS = 
@@ -76,6 +77,11 @@ $(LIBGMON_A): $(LIBGMON_OBJS) $(CRT0S)
 	$(AR) $(ARFLAGS) $@ $(LIBGMON_OBJS)
 	$(RANLIB) $@
 
+# FIXME: These are really the same, but gcc specs want different names.
+# The only CRT dependency is atexit.
+gcrt0.o: gcrt0.c
+	$(CC)  -c -o $@ $(CPPFLAGS) $(CFLAGS) $?
+
 gcrt1.o: gcrt0.c
 	$(CC) -U__MSVCRT__ -c -o $@ $(CPPFLAGS) $(CFLAGS) $?
 
@@ -110,7 +116,7 @@ install: all
 	done
 
 clean:
-	-rm -f $(LIBGMON_OBJS) $(CRT0S) $(LIBGMON_A)
+	-rm -f $(LIBGMON_OBJS) $(ALL_CRT0S) $(LIBGMON_A)
 
 distclean:
 	-rm -f *.o *.a *~ core a.out
diff --git a/winsup/mingw/profile/configure b/winsup/mingw/profile/configure
index 78354a83f..8f6491008 100755
--- a/winsup/mingw/profile/configure
+++ b/winsup/mingw/profile/configure
@@ -652,11 +652,13 @@ case "$target_os" in
   CRT_ID=1
   MNO_CYGWIN=
   RUNTIME=crtdll
+  CRT0S=gcrt1.o
   ;;
 *cygwin*)
   CRT_ID=2
   MNO_CYGWIN=-mno-cygwin
   RUNTIME=msvcrt
+  CRT0S=gcrt0.o
   # Do not build libm.a when building under Cygwin winsup. Otherwise, it'll
   # overwrite Cygwin's one. Likewise for libgmon.a.
   ;;
@@ -665,6 +667,7 @@ case "$target_os" in
   CRT_ID=2
   MNO_CYGWIN=
   RUNTIME=msvcrt
+  CRT0S=gcrt2.o
   ;;
 esac
 
@@ -673,6 +676,7 @@ esac
 
 
 
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -685,7 +689,7 @@ esac
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:689: checking for a BSD compatible install" >&5
+echo "configure:693: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -908,6 +912,7 @@ s%@CRT_ID@%$CRT_ID%g
 s%@RUNTIME@%$RUNTIME%g
 s%@MNO_CYGWIN@%$MNO_CYGWIN%g
 s%@LIBGMON_A@%$LIBGMON_A%g
+s%@CRT0S@%$CRT0S%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
diff --git a/winsup/mingw/profile/configure.in b/winsup/mingw/profile/configure.in
index 7af332ac0..b54eca3ed 100644
--- a/winsup/mingw/profile/configure.in
+++ b/winsup/mingw/profile/configure.in
@@ -42,11 +42,13 @@ case "$target_os" in
   CRT_ID=1
   MNO_CYGWIN=
   RUNTIME=crtdll
+  CRT0S=gcrt1.o
   ;;
 *cygwin*)
   CRT_ID=2
   MNO_CYGWIN=-mno-cygwin
   RUNTIME=msvcrt
+  CRT0S=gcrt0.o
   # Do not build libm.a when building under Cygwin winsup. Otherwise, it'll
   # overwrite Cygwin's one. Likewise for libgmon.a.
   ;;
@@ -55,6 +57,7 @@ case "$target_os" in
   CRT_ID=2
   MNO_CYGWIN=
   RUNTIME=msvcrt
+  CRT0S=gcrt2.o
   ;;
 esac
 
@@ -62,6 +65,7 @@ AC_SUBST(CRT_ID)
 AC_SUBST(RUNTIME)
 AC_SUBST(MNO_CYGWIN)
 AC_SUBST(LIBGMON_A)
+AC_SUBST(CRT0S)
 
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile)