From: Thomas Pfaff Date: Mon, 29 Jan 2001 21:41:46 +0000 (+0000) Subject: mingw32.h: Override STARTFILE_SPEC and LINK_SPEC declared in cygwin.h. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9c7c6e6c1c526a934ab25345bbdf4c770327cefc;p=gcc.git mingw32.h: Override STARTFILE_SPEC and LINK_SPEC declared in cygwin.h. * mingw32.h: Override STARTFILE_SPEC and LINK_SPEC declared in cygwin.h. From-SVN: r39336 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 969ed8d37e3..accb176945d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2001-01-29 Thomas Pfaff + + * mingw32.h: Override STARTFILE_SPEC and LINK_SPEC declared in + cygwin.h. + 2001-01-29 Jeffrey Oldham * config/mips/iris6.h (SUPPORTS_INIT_PRIORITY): Revise definition diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h index f8268e21dd6..56d8fbd44df 100644 --- a/gcc/config/i386/mingw32.h +++ b/gcc/config/i386/mingw32.h @@ -56,13 +56,23 @@ Boston, MA 02111-1307, USA. */ #define LIB_SPEC "%{pg:-lgmon} %{mwindows:-lgdi32 -lcomdlg32} \ -luser32 -lkernel32 -ladvapi32 -lshell32" +/* Include in the mingw32 libraries with libgcc */ +#undef LINK_SPEC +#define LINK_SPEC "%{mwindows:--subsystem windows} \ + %{mconsole:--subsystem console} \ + %{shared: %{mdll: %eshared and mdll are not compatible}} \ + %{shared: --shared} %{mdll:--dll} \ + %{static:-Bstatic} %{!static:-Bdynamic} \ + %{shared|mdll: -e _DllMainCRTStartup@12}" + /* Include in the mingw32 libraries with libgcc */ #undef LIBGCC_SPEC #define LIBGCC_SPEC \ "%{mthreads:-lmingwthrd} -lmingw32 -lgcc -lmoldname -lmsvcrt" #undef STARTFILE_SPEC -#define STARTFILE_SPEC "%{mdll:dllcrt2%O%s} %{!mdll:crt2%O%s} %{pg:gcrt2%O%s}" +#define STARTFILE_SPEC "%{shared|mdll:dllcrt2%O%s} \ + %{!shared:%{!mdll:crt2%O%s}} %{pg:gcrt2%O%s}" /* MS runtime does not need a separate math library. */ #define MATH_LIBRARY ""