Stupid dlltool...

git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@523 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-crt/Makefile.am

diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 8bfdb24..371469a 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -186,17 +186,17 @@
 
 lib32_LIBRARIES += lib32/libshell32.a
 lib32_libshell32_a_SOURCES = $(src_libshell32)
-lib32_libshell32_a_AR = $(DTLIB) -m i386; $(AR) $(ARFLAGS)
+lib32_libshell32_a_AR = $(DTLIB) -m i386 --as-flags=--32; $(AR) $(ARFLAGS)
 lib32_libshell32_a_CPPFLAGS=-m32
 
 lib32_LIBRARIES += lib32/libdinput.a
 lib32_libdinput_a_SOURCES = $(src_libdinput)
-lib32_libdinput_a_AR = $(DTLIB) -m i386; $(AR) $(ARFLAGS)
+lib32_libdinput_a_AR = $(DTLIB) -m i386 --as-flags=--32; $(AR) $(ARFLAGS)
 lib32_libdinput_a_CPPFLAGS=-m32
 
 lib32_LIBRARIES += lib32/libdinput8.a
 lib32_libdinput8_a_SOURCES = $(src_libdinput8)
-lib32_libdinput8_a_AR = $(DTLIB) -m i386; $(AR) $(ARFLAGS)
+lib32_libdinput8_a_AR = $(DTLIB) -m i386 --as-flags=--32; $(AR) $(ARFLAGS)
 lib32_libdinput8_a_CPPFLAGS=-m32
 
 lib32_LIBRARIES += lib32/libdmoguids.a
@@ -218,7 +218,7 @@
 lib32_LIBRARIES += lib32/libksuser.a
 lib32_libksuser_a_SOURCES = $(src_libksuser)
 lib32_libksuser_a_CPPFLAGS=-m32
-lib32_libksuser_a_AR = $(DTLIB) -m i386; $(AR) $(ARFLAGS)
+lib32_libksuser_a_AR = $(DTLIB) -m i386 --as-flags=--32; $(AR) $(ARFLAGS)
 
 lib32_LIBRARIES += lib32/liblargeint.a
 lib32_liblargeint_a_SOURCES = $(src_liblargeint)
@@ -235,7 +235,7 @@
 lib32_LIBRARIES += lib32/libmoldname.a
 lib32_libmoldname_a_CPPFLAGS=-m32 $(extra_include) $(AM_CPPFLAGS)
 lib32_libmoldname_a_SOURCES = $(src_libmoldname)
-lib32_libmoldname_a_AR = $(DTDEF) $(top_srcdir)/lib32/moldname-msvcrt.def -U --dllname msvcrt.dll -m i386; $(AR) $(ARFLAGS)
+lib32_libmoldname_a_AR = $(DTDEF) $(top_srcdir)/lib32/moldname-msvcrt.def -U --dllname msvcrt.dll -m i386 --as-flags=--32; $(AR) $(ARFLAGS)
 
 lib32_LIBRARIES += lib32/libscrnsave.a
 lib32_libscrnsave_a_SOURCES = $(src_libscrnsave)
@@ -257,7 +257,7 @@
 lib32_LIBRARIES += lib32/libws2_32.a
 lib32_libws2_32_a_SOURCES = $(src_libws2_32)
 lib32_libws2_32_a_CPPFLAGS=-m32
-lib32_libws2_32_a_AR = $(DTLIB) -m i386; $(AR) $(ARFLAGS)
+lib32_libws2_32_a_AR = $(DTLIB) -m i386 --as-flags=--32; $(AR) $(ARFLAGS)
 
 
 #These defs have no accompanying sources.  Look into using the rule below to run the dlltool command
@@ -295,10 +295,10 @@
 # combine these two rules with the ones for lib64
 # Use two patterns, one for 32/64 in lib32/ and lib64/
 lib32/libcrtdll.a lib32/libmsvcrt.a lib32/libmsvcr80.a:
-	$(DTLIB) --dllname `echo $@ | $(SED) 's|lib32/lib||;s|\.a|.dll|'` -m i386
+	$(DTLIB) --dllname `echo $@ | $(SED) 's|lib32/lib||;s|\.a|.dll|'` -m i386 --as-flags=--32
 
 lib32/lib%.a:
-	$(DTDEF) $(top_srcdir)/lib32/$*.def -m i386
+	$(DTDEF) $(top_srcdir)/lib32/$*.def -m i386 --as-flags=--32
 
 
 endif

mingw-w64-crt/Makefile.in

diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in
index 4852266..3679dda 100644
--- a/mingw-w64-crt/Makefile.in
+++ b/mingw-w64-crt/Makefile.in
@@ -1667,13 +1667,13 @@
 @LIB32_TRUE@lib32_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
 @LIB32_TRUE@lib32_libmingwthrd_a_CPPFLAGS = -m32
 @LIB32_TRUE@lib32_libshell32_a_SOURCES = $(src_libshell32)
-@LIB32_TRUE@lib32_libshell32_a_AR = $(DTLIB) -m i386; $(AR) $(ARFLAGS)
+@LIB32_TRUE@lib32_libshell32_a_AR = $(DTLIB) -m i386 --as-flags=--32; $(AR) $(ARFLAGS)
 @LIB32_TRUE@lib32_libshell32_a_CPPFLAGS = -m32
 @LIB32_TRUE@lib32_libdinput_a_SOURCES = $(src_libdinput)
-@LIB32_TRUE@lib32_libdinput_a_AR = $(DTLIB) -m i386; $(AR) $(ARFLAGS)
+@LIB32_TRUE@lib32_libdinput_a_AR = $(DTLIB) -m i386 --as-flags=--32; $(AR) $(ARFLAGS)
 @LIB32_TRUE@lib32_libdinput_a_CPPFLAGS = -m32
 @LIB32_TRUE@lib32_libdinput8_a_SOURCES = $(src_libdinput8)
-@LIB32_TRUE@lib32_libdinput8_a_AR = $(DTLIB) -m i386; $(AR) $(ARFLAGS)
+@LIB32_TRUE@lib32_libdinput8_a_AR = $(DTLIB) -m i386 --as-flags=--32; $(AR) $(ARFLAGS)
 @LIB32_TRUE@lib32_libdinput8_a_CPPFLAGS = -m32
 @LIB32_TRUE@lib32_libdmoguids_a_SOURCES = $(src_libdmoguids)
 @LIB32_TRUE@lib32_libdmoguids_a_CPPFLAGS = -m32
@@ -1685,7 +1685,7 @@
 @LIB32_TRUE@lib32_libdxguid_a_CPPFLAGS = -m32
 @LIB32_TRUE@lib32_libksuser_a_SOURCES = $(src_libksuser)
 @LIB32_TRUE@lib32_libksuser_a_CPPFLAGS = -m32
-@LIB32_TRUE@lib32_libksuser_a_AR = $(DTLIB) -m i386; $(AR) $(ARFLAGS)
+@LIB32_TRUE@lib32_libksuser_a_AR = $(DTLIB) -m i386 --as-flags=--32; $(AR) $(ARFLAGS)
 @LIB32_TRUE@lib32_liblargeint_a_SOURCES = $(src_liblargeint)
 @LIB32_TRUE@lib32_liblargeint_a_CPPFLAGS = -m32
 @LIB32_TRUE@lib32_libmingw32_a_CPPFLAGS = -m32 -D_SYSCRT=1 -DCRTDLL=1 $(extra_include) $(AM_CPPFLAGS)
@@ -1694,7 +1694,7 @@
 @LIB32_TRUE@lib32_libmingwex_a_SOURCES = $(src_libmingwex)
 @LIB32_TRUE@lib32_libmoldname_a_CPPFLAGS = -m32 $(extra_include) $(AM_CPPFLAGS)
 @LIB32_TRUE@lib32_libmoldname_a_SOURCES = $(src_libmoldname)
-@LIB32_TRUE@lib32_libmoldname_a_AR = $(DTDEF) $(top_srcdir)/lib32/moldname-msvcrt.def -U --dllname msvcrt.dll -m i386; $(AR) $(ARFLAGS)
+@LIB32_TRUE@lib32_libmoldname_a_AR = $(DTDEF) $(top_srcdir)/lib32/moldname-msvcrt.def -U --dllname msvcrt.dll -m i386 --as-flags=--32; $(AR) $(ARFLAGS)
 @LIB32_TRUE@lib32_libscrnsave_a_SOURCES = $(src_libscrnsave)
 @LIB32_TRUE@lib32_libscrnsave_a_CPPFLAGS = -m32
 @LIB32_TRUE@lib32_libscrnsavw_a_SOURCES = $(src_libscrnsavw)
@@ -1706,7 +1706,7 @@
 @LIB32_TRUE@lib32_libuuid_a_CPPFLAGS = -m32
 @LIB32_TRUE@lib32_libws2_32_a_SOURCES = $(src_libws2_32)
 @LIB32_TRUE@lib32_libws2_32_a_CPPFLAGS = -m32
-@LIB32_TRUE@lib32_libws2_32_a_AR = $(DTLIB) -m i386; $(AR) $(ARFLAGS)
+@LIB32_TRUE@lib32_libws2_32_a_AR = $(DTLIB) -m i386 --as-flags=--32; $(AR) $(ARFLAGS)
 
 #These defs have no accompanying sources.  Look into using the rule below to run the dlltool command
 #for all libraries, including those with sources.
@@ -17384,10 +17384,10 @@
 # combine these two rules with the ones for lib64
 # Use two patterns, one for 32/64 in lib32/ and lib64/
 @LIB32_TRUE@lib32/libcrtdll.a lib32/libmsvcrt.a lib32/libmsvcr80.a:
-@LIB32_TRUE@	$(DTLIB) --dllname `echo $@ | $(SED) 's|lib32/lib||;s|\.a|.dll|'` -m i386
+@LIB32_TRUE@	$(DTLIB) --dllname `echo $@ | $(SED) 's|lib32/lib||;s|\.a|.dll|'` -m i386 --as-flags=--32
 
 @LIB32_TRUE@lib32/lib%.a:
-@LIB32_TRUE@	$(DTDEF) $(top_srcdir)/lib32/$*.def -m i386
+@LIB32_TRUE@	$(DTDEF) $(top_srcdir)/lib32/$*.def -m i386 --as-flags=--32
 @LIB64_TRUE@lib64/crt1.o: crt/crtexe.c
 @LIB64_TRUE@	$(COMPILE64) -c $< -o $@ -D__CRTDLL__ -U__MSVCRT__
 @LIB64_TRUE@lib64/crt2.o: crt/crtexe.c