diff options
| author | Thomas Pfaff <tpfaff@gmx.net> | 2001-01-29 21:41:46 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@gcc.gnu.org> | 2001-01-29 16:41:46 -0500 |
| commit | 9c7c6e6c1c526a934ab25345bbdf4c770327cefc (patch) | |
| tree | b0fe4f24d3dd4f546d0f2ebdc8f020b775473ea5 | |
| parent | f1e9980ad4dcf64014142e825642247d766b24c0 (diff) | |
| download | gcc-9c7c6e6c1c526a934ab25345bbdf4c770327cefc.zip gcc-9c7c6e6c1c526a934ab25345bbdf4c770327cefc.tar.gz gcc-9c7c6e6c1c526a934ab25345bbdf4c770327cefc.tar.bz2 | |
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
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/i386/mingw32.h | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 969ed8d..accb176 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2001-01-29 Thomas Pfaff <tpfaff@gmx.net> + + * mingw32.h: Override STARTFILE_SPEC and LINK_SPEC declared in + cygwin.h. + 2001-01-29 Jeffrey Oldham <oldham@codesourcery.com> * config/mips/iris6.h (SUPPORTS_INIT_PRIORITY): Revise definition diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h index f8268e2..56d8fbd 100644 --- a/gcc/config/i386/mingw32.h +++ b/gcc/config/i386/mingw32.h @@ -57,12 +57,22 @@ Boston, MA 02111-1307, USA. */ -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 "" |