diff options
| -rw-r--r-- | aclocal.m4 | 32 | ||||
| -rw-r--r-- | compiler/main/DynFlags.hs | 1 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | distrib/configure-bin.ac | 5 | ||||
| -rw-r--r-- | driver/ghci/ghci.c | 4 | ||||
| -rw-r--r-- | mk/bootstrap.mk | 4 | ||||
| -rw-r--r-- | mk/config.mk.in | 2 | ||||
| -rw-r--r-- | utils/lndir/Makefile | 4 |
8 files changed, 3 insertions, 53 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 8593b89788..9622084a4d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -56,38 +56,6 @@ AC_DEFUN([FP_EVAL_STDERR], ])# FP_EVAL_STDERR -# FP_CHECK_FLAG(FLAG, [ACTION-IF-SUPPORTED], [ACTION-IF-NOT-SUPPORTED]) -# --------------------------------------------------------------------- -# Check to see whether the compiler for the current language supports a -# particular option. -# -# Implementation note: When given an unkown option, GCC issues an warning on -# stderr only, but returns an exit value of 0 nevertheless. Consequently we have -# to check stderr *and* the exit value. -# -# Used by ghc. -AC_DEFUN([FP_CHECK_FLAG], -[AC_LANG_COMPILER_REQUIRE()dnl -AC_LANG_CASE([C], [fp_compiler="$CC" m4_pushdef([fp_Flags], [CFLAGS])], - [C++], [fp_compiler="$CXX" m4_pushdef([fp_Flags], [CXXFLAGS])], - [Fortran 77], [fp_compiler="$F77" m4_pushdef([fp_Flags], [FFLAGS])]) -m4_pushdef([fp_Cache], [fp_cv_[]fp_Flags[]AS_TR_SH([$1])])[]dnl -AC_CACHE_CHECK([whether $fp_compiler accepts $1], [fp_Cache], -[AC_LANG_CONFTEST([AC_LANG_PROGRAM()]) -fp_save_flags="$fp_Flags" -fp_Flags="$fp_Flags $1" -fp_Cache=no -if FP_EVAL_STDERR([$ac_compile conftest.$ac_ext]) >/dev/null; then - test -s conftest.err || fp_Cache=yes -fi -fp_Flags="$fp_save_flags" -rm -f conftest.err conftest.$ac_ext]) -AS_IF([test $fp_Cache = yes], [$2], [$3])[]dnl -m4_popdef([fp_Cache])[]dnl -m4_popdef([fp_Flags])[]dnl -])# FP_CHECK_FLAG - - # FP_PROG_CONTEXT_DIFF # -------------------- # Figure out how to do context diffs. Sets the output variable ContextDiffCmd. diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index e631cfa758..6aef472126 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -1901,7 +1901,6 @@ machdepCCOpts _dflags sta = opt_Static in ( [ if sta then "-DDONT_WANT_WIN32_DLL_SUPPORT" else "" --- , if "mingw32" `isSuffixOf` cTARGETPLATFORM then "-mno-cygwin" else "" ], [ "-fno-defer-pop", "-fomit-frame-pointer", diff --git a/configure.ac b/configure.ac index 8645834d50..167de58cfb 100644 --- a/configure.ac +++ b/configure.ac @@ -917,10 +917,6 @@ AC_PROG_CPP dnl ** Without optimization some INLINE trickery fails for GHCi SRC_CC_OPTS="-O" -dnl ** Try to add -mno-cygwin to the C compiler options -FP_CHECK_FLAG([-mno-cygwin], [ -SRC_CC_OPTS="-mno-cygwin $SRC_CC_OPTS" -CPPFLAGS="-mno-cygwin $CPPFLAGS"]) AC_SUBST(SRC_CC_OPTS) dnl ** figure out how to do context diffs diff --git a/distrib/configure-bin.ac b/distrib/configure-bin.ac index ba0803336e..4f18013f06 100644 --- a/distrib/configure-bin.ac +++ b/distrib/configure-bin.ac @@ -53,11 +53,6 @@ i[[3456]]86-*-cygwin*) TargetPlatform=i386-unknown-cygwin32;; i[[3456]]86-*-mingw32*) exeext='.exe' - # We assume you're using mingw32 via the gcc that comes - # with cygwin, and not the native port, so let's augment - # the gcc command-line used here with -mno-cygwin -mwin32 - # to arrange for good things to happen. - CFLAGS="-mno-cygwin -mwin32 $CFLAGS" TargetPlatform=i386-unknown-mingw32 ;; i[[3456]]86-apple-darwin*) diff --git a/driver/ghci/ghci.c b/driver/ghci/ghci.c index f21a12a4ba..cad0ae5c51 100644 --- a/driver/ghci/ghci.c +++ b/driver/ghci/ghci.c @@ -18,7 +18,7 @@ * To compile: * * MSVC: cl /o ghci.exe /c ghciwrap.c - * mingw: gcc -mno-cygwin -o ghci.exe ghciwrap.c + * mingw: gcc -o ghci.exe ghciwrap.c * * If you want to associate your own icon with the wrapper, * here's how to do it: @@ -35,7 +35,7 @@ * * Add the resulting .res file to the link line of the wrapper: * * MSVC: cl /o ghci.exe /c ghciwrap.c ghci.res - * mingw: gcc -mno-cygwin -o ghci.exe ghciwrap.c ghci.res + * mingw: gcc -o ghci.exe ghciwrap.c ghci.res * */ diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk index 46267959c8..6459530e8e 100644 --- a/mk/bootstrap.mk +++ b/mk/bootstrap.mk @@ -39,10 +39,6 @@ PLATFORM_CC_OPTS += -static PLATFORM_HC_BOOT_CC_OPTS += -finhibit-size-directive endif -ifeq "$(mingw32_TARGET_OS)" "1" -PLATFORM_CC_OPTS += -mno-cygwin -endif - ifeq "$(alpha_TARGET_ARCH)" "1" PLATFORM_CC_OPTS += -static -w PLATFORM_HC_BOOT_CC_OPTS += -mieee diff --git a/mk/config.mk.in b/mk/config.mk.in index be65b243e4..6fce4518ec 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -700,7 +700,7 @@ SRC_LINT_OPTS += -axz -DLINT $(SRC_CPP_OPTS) WAY$(_way)_LINT_OPTS += WAY$(_way)_CPP_OPTS # Default fptools options for dllwrap. -SRC_BLD_DLL_OPTS += -mno-cygwin --target=i386-mingw32 +SRC_BLD_DLL_OPTS += --target=i386-mingw32 # Flags for CPP when running GreenCard on .pgc files GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__ diff --git a/utils/lndir/Makefile b/utils/lndir/Makefile index 4334c0d535..43e61c1a3a 100644 --- a/utils/lndir/Makefile +++ b/utils/lndir/Makefile @@ -15,7 +15,3 @@ DESTDIR=$(INSTBINDIR) include $(TOP)/mk/target.mk -# Win32: cygwin supports symlinks, so make sure we -# don't feed in the mingw flags here. In other -# words, lndir.exe is a cygwin-based app. -CC_OPTS := $(filter-out -mno-cygwin,$(CC_OPTS)) |