* include/_mingw.h: Increment version to 2.0.

	* Makefile.in: Ditto.
	Merge in mingwex branch.

3 files changed, 28 insertions, 32 deletions

diff --git a/winsup/mingw/profile/Makefile.in b/winsup/mingw/profile/Makefile.in
index d8825269f..c7f3a0c7f 100644
--- a/winsup/mingw/profile/Makefile.in
+++ b/winsup/mingw/profile/Makefile.in
@@ -49,7 +49,8 @@ THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_DLL_VERSION).dll
 
 INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
   -I$(srcdir)/../../w32api/include \
-  -nostdinc -nostdinc++
+  -nostdinc -nostdinc++ \
+  -iwithprefixbefore include
 ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(MNO_CYGWIN)
 ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) $(MNO_CYGWIN)
 
@@ -65,7 +66,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 +78,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) $?
 
@@ -95,22 +102,22 @@ info-html:
 install-info: info
 
 install: all
-	$(mkinstalldirs) $(tooldir)/lib 
+	$(mkinstalldirs) $(inst_libdir) 
 	for i in $(LIBS); do \
-		$(INSTALL_DATA) $$i $(tooldir)/lib/$$i ; \
+		$(INSTALL_DATA) $$i $(inst_libdir)/$$i ; \
 	done
 	for i in $(CRT0S); do \
-		$(INSTALL_DATA) $$i $(tooldir)/lib/$$i ; \
+		$(INSTALL_DATA) $$i $(inst_libdir)/$$i ; \
 	done
 	for sub in . ; do \
-	$(mkinstalldirs) $(tooldir)/include/$$sub ; \
+	$(mkinstalldirs) $(inst_includedir)/$$sub ; \
 		for i in $(srcdir)/$$sub/*.h ; do \
-		  $(INSTALL_DATA) $$i $(tooldir)/include/$$sub/`basename $$i` ; \
+		  $(INSTALL_DATA) $$i $(inst_includedir)/$$sub/`basename $$i` ; \
 		done ; \
 	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 cc3dcfeac..f9c64e084 100755
--- a/winsup/mingw/profile/configure
+++ b/winsup/mingw/profile/configure
@@ -645,33 +645,29 @@ test "$host_alias" != "$target_alias" &&
   program_prefix=${target_alias}-
 
 
+LIBGMON_A=libgmon.a
+
 case "$target_os" in
 *mingw32crt*)
   CRT_ID=1
   MNO_CYGWIN=
   RUNTIME=crtdll
-  THREAD_DLL=mingwc
-  LIBM_A=libm.a
-  LIBGMON_A=libgmon.a
+  CRT0S="gcrt1.o gcrt2.o"
   ;;
 *cygwin*)
   CRT_ID=2
   MNO_CYGWIN=-mno-cygwin
   RUNTIME=msvcrt
-  THREAD_DLL=mingwc
+  CRT0S=gcrt0.o
   # Do not build libm.a when building under Cygwin winsup. Otherwise, it'll
   # overwrite Cygwin's one. Likewise for libgmon.a.
-  LIBM_A=
-  LIBGMON_A=
   ;;
 *)
   # Build it for MSVCRT by default.
   CRT_ID=2
   MNO_CYGWIN=
   RUNTIME=msvcrt
-  THREAD_DLL=mingwm
-  LIBM_A=libm.a
-  LIBGMON_A=libgmon.a
+  CRT0S="gcrt1.o gcrt2.o"
   ;;
 esac
 
@@ -681,7 +677,6 @@ 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:
@@ -694,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:698: 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
@@ -916,9 +911,8 @@ s%@build_os@%$build_os%g
 s%@CRT_ID@%$CRT_ID%g
 s%@RUNTIME@%$RUNTIME%g
 s%@MNO_CYGWIN@%$MNO_CYGWIN%g
-s%@THREAD_DLL@%$THREAD_DLL%g
-s%@LIBM_A@%$LIBM_A%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 4f41536b9..e688a67c6 100644
--- a/winsup/mingw/profile/configure.in
+++ b/winsup/mingw/profile/configure.in
@@ -35,42 +35,37 @@ DLLWRAP=${DLLWRAP-dllwrap}
 AC_SUBST(DLLWRAP)
 AC_CANONICAL_SYSTEM
 
+LIBGMON_A=libgmon.a
+
 case "$target_os" in
 *mingw32crt*)
   CRT_ID=1
   MNO_CYGWIN=
   RUNTIME=crtdll
-  THREAD_DLL=mingwc
-  LIBM_A=libm.a
-  LIBGMON_A=libgmon.a
+  CRT0S="gcrt1.o gcrt2.o"
   ;;
 *cygwin*)
   CRT_ID=2
   MNO_CYGWIN=-mno-cygwin
   RUNTIME=msvcrt
-  THREAD_DLL=mingwc
+  CRT0S=gcrt0.o
   # Do not build libm.a when building under Cygwin winsup. Otherwise, it'll
   # overwrite Cygwin's one. Likewise for libgmon.a.
-  LIBM_A=
-  LIBGMON_A=
   ;;
 *)
   # Build it for MSVCRT by default.
   CRT_ID=2
   MNO_CYGWIN=
   RUNTIME=msvcrt
-  THREAD_DLL=mingwm
-  LIBM_A=libm.a
-  LIBGMON_A=libgmon.a
+  CRT0S="gcrt1.o gcrt2.o"
   ;;
 esac
 
 AC_SUBST(CRT_ID)
 AC_SUBST(RUNTIME)
 AC_SUBST(MNO_CYGWIN)
-AC_SUBST(THREAD_DLL)
-AC_SUBST(LIBM_A)
 AC_SUBST(LIBGMON_A)
+AC_SUBST(CRT0S)
 
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile)