Remove deprecated -mno-cygwin flag.

diff --git a/configure.in b/configure.in
index 6ff0a7551c63a0ad87c9b4800ef34852d8f5faa9..0a632168556b6beee9fd260e7559ef7f6fb3241b 100755 (executable)
--- a/configure.in
+++ b/configure.in
@@ -114,8 +114,8 @@ case "$host" in
                # Windows 2000 is required that includes Internet Explorer 5.01
                CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024"
                LDFLAGS="$LDFLAGS -lmswsock -lws2_32 -lole32 -loleaut32 -lpsapi -lversion -ladvapi32 -lwinmm -lkernel32"
-               libmono_cflags="-mno-cygwin -mms-bitfields -mwindows"
-               libmono_ldflags="-mno-cygwin -mms-bitfields -mwindows"
+               libmono_cflags="-mms-bitfields -mwindows"
+               libmono_ldflags="-mms-bitfields -mwindows"
                libdl=
                libgc_threads=win32
                gc_default=included

diff --git a/man/mkbundle.1 b/man/mkbundle.1
index 82bfe1326290d136dd77b2fa6910b9d7f93bfdfa..ed704b89d6aea515bdfa80ec664c4709a2b2e705 100644 (file)
--- a/man/mkbundle.1
+++ b/man/mkbundle.1
@@ -124,7 +124,7 @@ gcc-mingw and as packages.
 Assembler command. The default is "as".
 .TP
 .I "CC"
-C compiler command. The default is "cc" under Linux and "gcc -mno-cygwin"
+C compiler command. The default is "cc" under Linux and "gcc"
 under Windows.
 .TP
 .I "MONO_BUNDLED_OPTIONS"

diff --git a/mcs/tools/mkbundle/mkbundle.cs b/mcs/tools/mkbundle/mkbundle.cs
index fa8e7166019ae7e69fd01327cd4affa80addab4f..69187b0a799f60bcb756b25e676de7183ef0743e 100644 (file)
--- a/mcs/tools/mkbundle/mkbundle.cs
+++ b/mcs/tools/mkbundle/mkbundle.cs
@@ -476,7 +476,7 @@ void          mono_register_config_for_assembly (const char* assembly_name, cons
 
                        string zlib = (compress ? "-lz" : "");
                        string debugging = "-g";
-                       string cc = GetEnv ("CC", IsUnix ? "cc" : "gcc -mno-cygwin");
+                       string cc = GetEnv ("CC", IsUnix ? "cc" : "gcc");
 
                        if (style == "linux")
                                debugging = "-ggdb";

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index a108e826a3b300fe009b1d0fb84efdd0ccad754a..52f636b79936da308fb3ac9d274eace58cced49d 100755 (executable)
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -8328,7 +8328,7 @@ compile_asm (MonoAotCompile *acfg)
 #elif defined(TARGET_AMD64) && defined(TARGET_MACH)
        command = g_strdup_printf ("gcc --shared -o %s %s.o", tmp_outfile_name, acfg->tmpfname);
 #elif defined(HOST_WIN32)
-       command = g_strdup_printf ("gcc -shared --dll -mno-cygwin -o %s %s.o", tmp_outfile_name, acfg->tmpfname);
+       command = g_strdup_printf ("gcc -shared --dll -o %s %s.o", tmp_outfile_name, acfg->tmpfname);
 #elif defined(TARGET_X86) && defined(TARGET_MACH) && !defined(__native_client_codegen__)
        command = g_strdup_printf ("gcc -m32 -dynamiclib -o %s %s.o", tmp_outfile_name, acfg->tmpfname);
 #else