From 5593b6482d9019262ca30c1a960ad512ec2fc368 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Thu, 4 Apr 2002 01:26:51 +0000 Subject: Add libgmon.a and libmingwex.a for cygwin -mno-cygwin * configure.in (SUBDIRS): Add profile and mingwex to cygwin target. (configdirs): Likewise. (LIBGMON_A): Define for cygwin target as well. * configure: Regenerate. * profile/configure.in (THREAD_DLL): Remove define. (LIBM_A): Remove define. (LIBGMON_A): Define for cygwin target as well. * profile/configure: Regenerate. * profile/makefile.in (install): Install to inst_libdir and inst_includedir. * mingwex/makefile.in (CFLAGS): Move -fomit-frame-pointer to... (OPTFLAGS): New define. (ALL_CFLAGS): Add $(OPTFLAGS). (ALL_CXXFLAGS): Same. (.c.o:): Remove ALL_CXXFLAGS. --- winsup/mingw/ChangeLog | 20 ++++++++++++++++++++ winsup/mingw/configure | 17 +++++------------ winsup/mingw/configure.in | 15 ++++----------- winsup/mingw/mingwex/Makefile.in | 9 +++++---- winsup/mingw/profile/Makefile.in | 10 +++++----- winsup/mingw/profile/configure | 17 +++-------------- winsup/mingw/profile/configure.in | 13 ++----------- 7 files changed, 44 insertions(+), 57 deletions(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 86ffb33d8..b24f42479 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,23 @@ +2002-04-04 Danny Smith + + Add libgmon.a and libmingwex.a for cygwin -mno-cygwin. + * configure.in (SUBDIRS): Add profile and mingwex to cygwin target. + (configdirs): Likewise. + (LIBGMON_A): Define for cygwin target as well. + * configure: Regenerate. + * profile/configure.in (THREAD_DLL): Remove define. + (LIBM_A): Remove define. + (LIBGMON_A): Define for cygwin target as well. + * profile/configure: Regenerate. + * profile/makefile.in (install): Install to inst_libdir and + inst_includedir. + + * mingwex/makefile.in (CFLAGS): Move -fomit-frame-pointer to... + (OPTFLAGS): New define. + (ALL_CFLAGS): Add $(OPTFLAGS). + (ALL_CXXFLAGS): Same. + (.c.o:): Remove ALL_CXXFLAGS. + 2002-03-29 Danny Smith * include/stdint.h: Add missing newline at eof. diff --git a/winsup/mingw/configure b/winsup/mingw/configure index cf50ebd7c..1d976f360 100755 --- a/winsup/mingw/configure +++ b/winsup/mingw/configure @@ -1659,20 +1659,16 @@ test "$host_alias" != "$target_alias" && NONENONEs,x,x, && program_prefix=${target_alias}- - -configdirs="" -SUBDIRS="" +SUBDIRS="profile mingwex" +configdirs="profile mingwex" HEADER_SUBDIR="" +LIBGMON_A=libgmon.a + case "$target_os" in *cygwin*) MNO_CYGWIN=-mno-cygwin - configdirs="$configdirs" - # FIXME MinGW versions of libm.a and libgmon.a needed for -mno-cygwin - # 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= # Install mingw headers in mingw subdirectory. HEADER_SUBDIR="mingw" ;; @@ -1680,9 +1676,6 @@ case "$target_os" in # Build it for MSVCRT by default. MNO_CYGWIN= LIBM_A=libm.a - LIBGMON_A=libgmon.a - SUBDIRS="profile mingwex" - configdirs="$configdirs profile mingwex" ;; esac @@ -1719,7 +1712,7 @@ MKINSTALLDIRS=$ac_aux_dir/mkinstalldirs # 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:1723: checking for a BSD compatible install" >&5 +echo "configure:1716: 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 diff --git a/winsup/mingw/configure.in b/winsup/mingw/configure.in index 6f4674117..3fe9e1b55 100644 --- a/winsup/mingw/configure.in +++ b/winsup/mingw/configure.in @@ -88,20 +88,16 @@ AC_SUBST(WINDRES) AC_ALLOCA AC_CANONICAL_SYSTEM - -configdirs="" -SUBDIRS="" +SUBDIRS="profile mingwex" +configdirs="profile mingwex" HEADER_SUBDIR="" +LIBGMON_A=libgmon.a + case "$target_os" in *cygwin*) MNO_CYGWIN=-mno-cygwin - configdirs="$configdirs" - # FIXME MinGW versions of libm.a and libgmon.a needed for -mno-cygwin - # 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= # Install mingw headers in mingw subdirectory. HEADER_SUBDIR="mingw" ;; @@ -109,9 +105,6 @@ case "$target_os" in # Build it for MSVCRT by default. MNO_CYGWIN= LIBM_A=libm.a - LIBGMON_A=libgmon.a - SUBDIRS="profile mingwex" - configdirs="$configdirs profile mingwex" ;; esac diff --git a/winsup/mingw/mingwex/Makefile.in b/winsup/mingw/mingwex/Makefile.in index 7334f51f2..cef4d85d7 100644 --- a/winsup/mingw/mingwex/Makefile.in +++ b/winsup/mingw/mingwex/Makefile.in @@ -86,8 +86,9 @@ CC = @CC@ # FIXME: Which is it, CC or CC_FOR_TARGET? CC_FOR_TARGET = $(CC) AS_FOR_TARGET = $(AS) -CFLAGS = @CFLAGS@ -fomit-frame-pointer -Wall +CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ +OPTFLAGS= -fomit-frame-pointer # compiling with Cygwin? MNO_CYGWIN = @MNO_CYGWIN@ @@ -96,8 +97,8 @@ MNO_CYGWIN = @MNO_CYGWIN@ INCLUDES = -I$(srcdir) -I$(srcdir)/../include \ -I$(srcdir)/../../w32api/include \ -nostdinc -nostdinc++ -ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(MNO_CYGWIN) -ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) $(MNO_CYGWIN) +ALL_CFLAGS = $(CFLAGS) $(OPTFLAGS) $(INCLUDES) $(MNO_CYGWIN) +ALL_CXXFLAGS = $(CXXFLAGS) $(OPTFLAGS) $(INCLUDES) $(MNO_CYGWIN) AS = @AS@ AR = @AR@ @@ -176,7 +177,7 @@ distclean: -rm -f config.cache config.status config.log -rm -f Makefile .c.o: - $(CC) -c $(ALL_CXXFLAGS) $(ALL_CFLAGS) $< -o $@ + $(CC) -c $(ALL_CFLAGS) $< -o $@ .S.o: $(CC) -c $< -o $@ .s.o: diff --git a/winsup/mingw/profile/Makefile.in b/winsup/mingw/profile/Makefile.in index d8825269f..07d5d54a2 100644 --- a/winsup/mingw/profile/Makefile.in +++ b/winsup/mingw/profile/Makefile.in @@ -95,17 +95,17 @@ 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 diff --git a/winsup/mingw/profile/configure b/winsup/mingw/profile/configure index cc3dcfeac..78354a83f 100755 --- a/winsup/mingw/profile/configure +++ b/winsup/mingw/profile/configure @@ -645,33 +645,26 @@ 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 ;; *cygwin*) CRT_ID=2 MNO_CYGWIN=-mno-cygwin RUNTIME=msvcrt - THREAD_DLL=mingwc # 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 ;; esac @@ -680,8 +673,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 +685,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:689: 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,8 +907,6 @@ 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%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g diff --git a/winsup/mingw/profile/configure.in b/winsup/mingw/profile/configure.in index 4f41536b9..7af332ac0 100644 --- a/winsup/mingw/profile/configure.in +++ b/winsup/mingw/profile/configure.in @@ -35,41 +35,32 @@ 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 ;; *cygwin*) CRT_ID=2 MNO_CYGWIN=-mno-cygwin RUNTIME=msvcrt - THREAD_DLL=mingwc # 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 ;; 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_PROG_INSTALL -- cgit v1.2.3