diff options
| author | dj <dj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-29 21:41:46 +0000 |
|---|---|---|
| committer | dj <dj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-29 21:41:46 +0000 |
| commit | f5b195513da98d9dc8872c7d982dc7cc0834a93d (patch) | |
| tree | b0fe4f24d3dd4f546d0f2ebdc8f020b775473ea5 | |
| parent | b69492cea1d5922b521d21845b7e617449c5c96d (diff) | |
| download | ppe42-gcc-f5b195513da98d9dc8872c7d982dc7cc0834a93d.tar.gz ppe42-gcc-f5b195513da98d9dc8872c7d982dc7cc0834a93d.zip | |
* mingw32.h: Override STARTFILE_SPEC and LINK_SPEC declared in
cygwin.h.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39336 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 969ed8d37e3..accb176945d 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 f8268e21dd6..56d8fbd44df 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 "" |
