diff options
| author | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2008-04-26 15:39:14 +0400 |
|---|---|---|
| committer | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2008-04-26 15:39:14 +0400 |
| commit | 6c9c2a071cb066babb23f9a9865592240f2f8e06 (patch) | |
| tree | b9dce6f03bd6d387b0d95ac4f4c6db62ce395d28 /winsup | |
| parent | 78970a51f33f72488632d423a65f566e999f8aa5 (diff) | |
2008-04-26 Chuck Wilson <cwilso11@users.sourceforge.net>
* Makefile.in: correct issues with mingw10.dll having multiple relocs.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/mingw/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/mingw/Makefile.in | 23 |
2 files changed, 7 insertions, 20 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 7b4757abc..ccb5e0017 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,7 @@ +2008-04-26 Chuck Wilson <cwilso11@users.sourceforge.net> + + * Makefile.in: correct issues with mingw10.dll having multiple relocs. + 2008-04-25 Danny Smith <dannysmith@users.sourceforge.net> * include/process.h: Include stdint.h for intptr_t definition. diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in index e92e6c681..84ea03e21 100644 --- a/winsup/mingw/Makefile.in +++ b/winsup/mingw/Makefile.in @@ -243,32 +243,15 @@ libmingwthrd.a: crtmt.o mingwthrd.def $(AR) $(ARFLAGS) $@ crtmt.o $(RANLIB) $@ -# Using dllwrap would be so much easier, but Cygnus top-level configure -# Makefile.in etc don't pass the right variables yet. -xx_$(THREAD_DLL_NAME) xx_mingwthrd.def: mthr.o mthr_init.o - $(DLLWRAP) $(DLLWRAP_FLAGS) -o $(THREAD_DLL_NAME) \ - --output-def mingwthrd.def \ - mthr.o mthr_init.o - DLL_OFILES = mthr.o mthr_init.o -DLL_CC_STUFF = -B./ -mdll $(MNO_CYGWIN) -Wl,--image-base,0x6FBC0000 \ +DLL_CC_STUFF = -B./ -shared $(MNO_CYGWIN) -Wl,--image-base,0x6FBC0000 \ -Wl,--entry,_DllMainCRTStartup@12 \ - $(DLL_OFILES) \ + $(DLL_OFILES) mingwthrd.def \ -Lmingwex -DLL_DLLTOOL_STUFF = --as=$(AS) --dllname $(THREAD_DLL_NAME) \ - --def mingwthrd.def \ - --base-file mingwthrd.base --output-exp mingwthrd.exp $(THREAD_DLL_NAME) mingwthrd.def: $(DLL_OFILES) Makefile $(SUBDIRS) $(DLLTOOL) --as $(AS) --output-def mingwthrd.def $(DLL_OFILES) - $(CC) -Wl,--base-file=mingwthrd.base $(DLL_CC_STUFF) \ - -o mingwthrd_dummy.exe - $(DLLTOOL) $(DLL_DLLTOOL_STUFF) - $(CC) -Wl,--base-file=mingwthrd.base mingwthrd.exp $(DLL_CC_STUFF) \ - -o mingwthrd_dummy.exe - $(DLLTOOL) $(DLL_DLLTOOL_STUFF) - $(CC) mingwthrd.exp -o $(THREAD_DLL_NAME) $(DLL_CC_STUFF) - rm -f mingwthrd_dummy.exe + $(CC) $(DLL_CC_STUFF) -o $(THREAD_DLL_NAME) libmingw32.a: $(MINGW_OBJS) $(AR) rc $@ $(MINGW_OBJS) |