Index: gcc/gcc/doc/invoke.texi
===================================================================
--- gcc.orig/gcc/doc/invoke.texi
+++ gcc/gcc/doc/invoke.texi
@@ -826,6 +826,10 @@ See RS/6000 and PowerPC Options.
 @emph{x86-64 Options}
 See i386 and x86-64 Options.
 
+@emph{i386 and x86-64 Windows Options}
+@gccoptlist{-mconsole -mcygwin -mno-cygwin -mdll
+-mnop-fun-dllimport -mthread -mwin32 -mwindows}
+
 @emph{Xstormy16 Options}
 @gccoptlist{-msim}
 
@@ -8827,6 +8831,7 @@ platform.
 * H8/300 Options::
 * HPPA Options::
 * i386 and x86-64 Options::
+* i386 and x86-64 Windows Options::
 * IA-64 Options::
 * M32C Options::
 * M32R/D Options::
@@ -9140,10 +9145,6 @@ long_calls_off} directive.  Note these s
 the compiler generates code to handle function calls via function
 pointers.
 
-@item -mnop-fun-dllimport
-@opindex mnop-fun-dllimport
-Disable support for the @code{dllimport} attribute.
-
 @item -msingle-pic-base
 @opindex msingle-pic-base
 Treat the register used for PIC addressing as read-only, rather than
@@ -15460,6 +15461,62 @@ is defined for compatibility with Diab.
 
 These are listed under @xref{i386 and x86-64 Options}.
 
+@node i386 and x86-64 Windows Options
+@subsection i386 and x86-64 Windows Options
+@cindex i386 and x86-64 Windows Options
+
+These options are additonal available for Windows targets:
+
+@table @gcctabopt
+@item -mconsole
+@opindex mconsole
+This option is available for cygwin and mingw targets. It
+specifies that a console application has to be generated.
+This is the default behaviour for cygwin and mingw targets.
+
+@item -mcygwin
+@opindex mcygwin
+This option is available for cygwin target. It specifies that
+the cygwin internal interface has to be used. For cygwin target
+this is default behaviour.
+This option is deprecated and will be removed in a future release.
+
+@item -mno-cygwin
+@opindex mno-cygwin
+This option is available for cygwin target. It specifies that
+instead of the cygwin internal interface the mingw internal
+interface has to be used.
+This option is deprecated and will be removed in a future release.
+
+@item -mdll
+@opindex mdll
+This option is available for cygwin and mingw targets. It
+specifies that a DLL - dynamic link library - has to be
+generated.
+
+@item -mnop-fun-dllimport
+@opindex mnop-fun-dllimport
+This option is available for cygwin and mingw targets. It
+specifies that the dllimport attribute should be ignored.
+
+@item -mthread
+@opindex mthread
+This option is available for mingw targets. It specifies
+that the mingw specific thread support has to be used.
+
+@item -mwin32
+@opindex mwin32
+This option is available for cygwin and mingw targets. It
+specifies that the typical windows defines have to be set.
+
+@item -mwindows
+@opindex mwindows
+This option is available for cygwin and mingw targets. It
+specifies that a GUI application has to be generated.
+@end table
+
+See also under @xref{i386 and x86-64 Options} for standard options.
+
 @node Xstormy16 Options
 @subsection Xstormy16 Options
 @cindex Xstormy16 Options