# HG changeset patch
# User John Donoghue
# Date 1432121807 14400
# Node ID d83f02205481f0d329cf2bdd1b86ff7f2526ffd3
# Parent  cbefb206115eb91dc3b6eda393337c7cc21f6540
native-gcc: compile as multilib in win64

* src/native-binutils.mk: in win64 mode, enable multilib and targets=targets=x86_64-w64-mingw32,i686-w64-mingw32

* src/native-gcc.mk: in win64, enable mutilib, copy lib32 file to correct splot

diff -r cbefb206115e -r d83f02205481 src/native-binutils.mk
--- a/src/native-binutils.mk	Tue May 19 08:10:12 2015 -0400
+++ b/src/native-binutils.mk	Wed May 20 07:36:47 2015 -0400
@@ -11,6 +11,14 @@
 $(PKG)_URL_2    := ftp://ftp.cs.tu-berlin.de/pub/gnu/binutils/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
+$(PKG)_SYSDEP_OPTIONS :=
+ifeq ($(ENABLE_WINDOWS_64),yes)
+    $(PKG)_SYSDEP_OPTIONS += \
+      --enable-multilib \
+      --enable-targets=x86_64-w64-mingw32,i686-w64-mingw32
+endif
+
+
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://ftp.gnu.org/gnu/binutils/?C=M;O=D' | \
     $(SED) -n 's,.*<a href="binutils-\([0-9][^"]*\)\.tar.*,\1,p' | \
@@ -29,6 +37,7 @@
 
     cd '$(1)' && ./configure \
         --target='$(TARGET)' \
+        $($(PKG)_SYSDEP_OPTIONS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         --with-gcc \
diff -r cbefb206115e -r d83f02205481 src/native-gcc.mk
--- a/src/native-gcc.mk	Tue May 19 08:10:12 2015 -0400
+++ b/src/native-gcc.mk	Wed May 20 07:36:47 2015 -0400
@@ -28,8 +28,15 @@
     --enable-threads=win32 
   ifneq ($(ENABLE_WINDOWS_64),yes)
     $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
+      --disable-multilib \
       --disable-sjlj-exceptions
+  else
+    $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
+      --enable-multilib --enable-64bit
   endif
+else
+  $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
+    --disable-multilib
 endif
 
 define $(PKG)_UPDATE
@@ -47,7 +54,6 @@
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
         --enable-languages='c,c++,fortran' \
-        --disable-multilib \
         --disable-libsanitizer \
         $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
@@ -65,4 +71,9 @@
     if [ -f $(HOST_PREFIX)/lib/gcc/$(TARGET)/lib/libgcc_s.a ]; then \
       mv $(HOST_PREFIX)/lib/gcc/$(TARGET)/lib/libgcc_s.a $(HOST_PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/libgcc_s.a; \
     fi
+
+    if [ -f $(HOST_PREFIX)/lib/gcc/$(TARGET)/lib32/libgcc_s.a ]; then \
+      mv $(HOST_PREFIX)/lib/gcc/$(TARGET)/lib32/libgcc_s.a $(HOST_PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/32/libgcc_s.a; \
+    fi
+
 endef