# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1391469362 18000
# Node ID 3c7b3646d0b37335024f92fb262f6eb63fa50f76
# Parent  d621dce7de41cef4aab4c14ff9cd3d28a313d952
update to gcc 4.8.2 and allow building for MinGW-64

diff -r d621dce7de41 -r 3c7b3646d0b3 index.html
--- a/index.html	Mon Feb 03 18:13:15 2014 -0500
+++ b/index.html	Mon Feb 03 18:16:02 2014 -0500
@@ -1059,6 +1059,10 @@
         <td class="website"><a href="http://www.cgal.org/">cgal</a></td>
     </tr>
     <tr>
+        <td class="package">cloog</td>
+        <td class="website"><a href="http://www.cloog.org/">CLooG Code Generator</a></td>
+    </tr>
+    <tr>
         <td class="package">cminpack</td>
         <td class="website"><a href="http://devernay.free.fr/hacks/cminpack/cminpack.html">cminpack</a></td>
     </tr>
@@ -1159,10 +1163,18 @@
         <td class="website"><a href="http://ftp.gnome.org/pub/GNOME/sources/gcab/">gcab</a></td>
     </tr>
     <tr>
+        <td class="package">gcc-cloog</td>
+        <td class="website"><a href="http://www.cloog.org/">CLooG for GCC</a></td>
+    </tr>
+    <tr>
         <td class="package">gcc-gmp</td>
         <td class="website"><a href="http://www.gmplib.org/">GMP for GCC</a></td>
     </tr>
     <tr>
+        <td class="package">gcc-isl</td>
+        <td class="website"><a href="http://isl.gforge.inria.fr/">ISL for GCC</a></td>
+    </tr>
+    <tr>
         <td class="package">gcc-mpc</td>
         <td class="website"><a href="http://www.multiprecision.org/">MPC for GCC</a></td>
     </tr>
@@ -1327,6 +1339,10 @@
         <td class="website"><a href="https://launchpad.net/intltool/+download">intltool</a></td>
     </tr>
     <tr>
+        <td class="package">isl</td>
+        <td class="website"><a href="http://isl.gforge.inria.fr/">Integer Set Library</a></td>
+    </tr>
+    <tr>
         <td class="package">itsol</td>
         <td class="website"><a href="http://www-users.cs.umn.edu/~saad/software/ITSOL/">ITSOL</a></td>
     </tr>
@@ -1595,6 +1611,10 @@
         <td class="website"><a href="http://sourceforge.net/projects/mdbtools/">mdbtools</a></td>
     </tr>
     <tr>
+        <td class="package">mingw-w64</td>
+        <td class="website"><a href="http://mingw-w64.sourceforge.net/">MinGW-w64 Runtime</a></td>
+    </tr>
+    <tr>
         <td class="package">mingwrt</td>
         <td class="website"><a href="http://www.mingw.org/">MinGW Runtime</a></td>
     </tr>
@@ -1670,7 +1690,6 @@
         <td class="package">msys-patch</td>
         <td class="website"><a href="http://www.mingw.org/">MinGW patch</a></td>
     </tr>
-
     <tr>
         <td class="package">msys-regex</td>
         <td class="website"><a href="http://www.mingw.org/">MinGW regex</a></td>
diff -r d621dce7de41 -r 3c7b3646d0b3 src/build-gcc.mk
--- a/src/build-gcc.mk	Mon Feb 03 18:13:15 2014 -0500
+++ b/src/build-gcc.mk	Mon Feb 03 18:16:02 2014 -0500
@@ -3,17 +3,20 @@
 
 PKG             := build-gcc
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.8.1
-$(PKG)_CHECKSUM := 4e655032cda30e1928fcc3f00962f4238b502169
+$(PKG)_VERSION  := 4.8.2
+$(PKG)_CHECKSUM := 810fb70bd721e1d9f446b6503afe0a9088b62986
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_URL_2    := ftp://ftp.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
-ifeq ($(MXE_NATIVE_BUILD),yes)
-  $(PKG)_DEPS := build-cmake
-else
-  ifeq ($(MXE_SYSTEM),mingw)
-    $(PKG)_DEPS := mingwrt w32api build-binutils
+
+$(PKG)_DEPS := build-cmake
+ifeq ($(MXE_SYSTEM),mingw)
+  $(PKG)_DEPS += build-binutils
+  ifeq ($(ENABLE_64),yes)
+    $(PKG)_DEPS += gcc-cloog gcc-gmp gcc-isl gcc-mpc gcc-mpfr mingw-w64
+  else
+    $(PKG)_DEPS += mingwrt w32api
   endif
 endif
 
@@ -30,12 +33,14 @@
     --with-gnu-as \
     --disable-nls \
     --without-x \
-    --disable-sjlj-exceptions \
     --disable-win32-registry \
     --enable-threads=win32
+  ifneq ($(ENABLE_64),yes)
+    $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
+      --disable-sjlj-exceptions
+  endif
 endif
 
-
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://ftp.gnu.org/gnu/gcc/?C=M;O=D' | \
     $(SED) -n 's,.*<a href="gcc-\([0-9][^"]*\)/".*,\1,p' | \
@@ -43,8 +48,8 @@
     head -1
 endef
 
-define $(PKG)_BUILD
-    cd '$(1)' && ./contrib/download_prerequisites
+define $(PKG)_CONFIGURE
+    # configure gcc
     mkdir '$(1).build'
     cd    '$(1).build' && '$(1)/configure' \
         --target='$(TARGET)' \
@@ -52,15 +57,55 @@
         --prefix='$(BUILD_TOOLS_PREFIX)' \
         --enable-languages='c,c++,fortran' \
         --disable-multilib \
+        $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
-        $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \
         --disable-libgomp \
         --disable-libmudflap \
+        --with-cloog='$(BUILD_TOOLS_PREFIX)' \
+        --with-gmp='$(BUILD_TOOLS_PREFIX)' \
+        --with-isl='$(BUILD_TOOLS_PREFIX)' \
+        --with-mpc='$(BUILD_TOOLS_PREFIX)' \
+        --with-mpfr='$(BUILD_TOOLS_PREFIX)' \
         $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'")
+endef
+
+ifeq ($(ENABLE_64),yes)
+  define $(PKG)_BUILD_1
+    # build standalone gcc
+    $($(PKG)_CONFIGURE)
+    $(MAKE) -C '$(1).build' -j '$(JOBS)' all-gcc
+    $(MAKE) -C '$(1).build' -j 1 install-gcc
+
+    # build mingw-w64-crt
+    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,mingw-w64,$(TAR))
+    mkdir '$(1).crt-build'
+    cd '$(1).crt-build' && '$(1)/$(mingw-w64_SUBDIR)/mingw-w64-crt/configure' \
+        --host='$(TARGET)' \
+        --prefix='$(HOST_PREFIX)'
+    $(MAKE) -C '$(1).crt-build' -j '$(JOBS)' || $(MAKE) -C '$(1).crt-build' -j '$(JOBS)'
+    $(MAKE) -C '$(1).crt-build' -j 1 install
+
+    # build rest of gcc
+    cd '$(1).build'
+    $(MAKE) -C '$(1).build' -j '$(JOBS)'
+    $(MAKE) -C '$(1).build' -j 1 install
+
+    if [ -f $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/lib/libgcc_s.a ]; then \
+      mv $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/lib/libgcc_s.a $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/4.8.2/libgcc_s.a; \
+    fi
+  endef
+else
+  define $(PKG)_BUILD_1
+    $($(PKG)_CONFIGURE)
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
     mkdir -p $(TOP_DIR)/cross-tools/$(HOST_BINDIR)
     $(MAKE) -C '$(1).build' -j 1 DESTDIR=$(TOP_DIR)/cross-tools install
+  endef
+endif
+
+define $(PKG)_BUILD
+    $($(PKG)_BUILD_1)
 
     # create pkg-config script
     if [ '$(MXE_NATIVE_BUILD)' = 'no' ]; then \
diff -r d621dce7de41 -r 3c7b3646d0b3 src/cloog.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cloog.mk	Mon Feb 03 18:16:02 2014 -0500
@@ -0,0 +1,30 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := cloog
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.18.0
+$(PKG)_CHECKSUM := 85f620a26aabf6a934c44ca40a9799af0952f863
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc gmp isl
+
+# stick to tested versions from gcc
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'ftp://gcc.gnu.org/pub/gcc/infrastructure/' | \
+    $(SED) -n 's,.*cloog-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    $(SORT) -V |
+    tail -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        $(ENABLE_SHARED_OR_STATIC) \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --with-gmp-prefix='$(PREFIX)/$(TARGET)' \
+        --with-isl-prefix='$(PREFIX)/$(TARGET)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+endef
diff -r d621dce7de41 -r 3c7b3646d0b3 src/gcc-cloog.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gcc-cloog.mk	Mon Feb 03 18:16:02 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := gcc-cloog
+$(PKG)_IGNORE    = $(cloog_IGNORE)
+$(PKG)_VERSION   = $(cloog_VERSION)
+$(PKG)_CHECKSUM  = $(cloog_CHECKSUM)
+$(PKG)_SUBDIR    = $(cloog_SUBDIR)
+$(PKG)_FILE      = $(cloog_FILE)
+$(PKG)_URL       = $(cloog_URL)
+$(PKG)_URL_2     = $(cloog_URL_2)
+$(PKG)_DEPS     := gcc-gmp gcc-isl
+
+define $(PKG)_UPDATE
+    echo $(cloog_VERSION)
+endef
+
+define $(PKG)_BUILD
+    mkdir '$(1).build'
+    cd    '$(1).build' && '$(1)/configure' \
+        --prefix='$(BUILD_TOOLS_PREFIX)' \
+        $(ENABLE_SHARED_OR_STATIC) \
+        --with-gmp-prefix='$(BUILD_TOOLS_PREFIX)' \
+        --with-isl-prefix='$(BUILD_TOOLS_PREFIX)'
+    $(MAKE) -C '$(1).build' -j '$(JOBS)'
+    $(MAKE) -C '$(1).build' -j 1 install
+endef
diff -r d621dce7de41 -r 3c7b3646d0b3 src/gcc-gmp.mk
--- a/src/gcc-gmp.mk	Mon Feb 03 18:13:15 2014 -0500
+++ b/src/gcc-gmp.mk	Mon Feb 03 18:16:02 2014 -0500
@@ -14,3 +14,12 @@
 define $(PKG)_UPDATE
     echo $(gmp_VERSION)
 endef
+
+define $(PKG)_BUILD
+    mkdir '$(1).build'
+    cd    '$(1).build' && '$(1)/configure' \
+        --prefix='$(BUILD_TOOLS_PREFIX)' \
+        $(ENABLE_SHARED_OR_STATIC)
+    $(MAKE) -C '$(1).build' -j '$(JOBS)'
+    $(MAKE) -C '$(1).build' -j 1 install
+endef
diff -r d621dce7de41 -r 3c7b3646d0b3 src/gcc-isl.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gcc-isl.mk	Mon Feb 03 18:16:02 2014 -0500
@@ -0,0 +1,26 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := gcc-isl
+$(PKG)_IGNORE    = $(isl_IGNORE)
+$(PKG)_VERSION   = $(isl_VERSION)
+$(PKG)_CHECKSUM  = $(isl_CHECKSUM)
+$(PKG)_SUBDIR    = $(isl_SUBDIR)
+$(PKG)_FILE      = $(isl_FILE)
+$(PKG)_URL       = $(isl_URL)
+$(PKG)_URL_2     = $(isl_URL_2)
+$(PKG)_DEPS     := gcc-gmp
+
+define $(PKG)_UPDATE
+    echo $(isl_VERSION)
+endef
+
+define $(PKG)_BUILD
+    mkdir '$(1).build'
+    cd    '$(1).build' && '$(1)/configure' \
+        --prefix='$(BUILD_TOOLS_PREFIX)' \
+        $(ENABLE_SHARED_OR_STATIC) \
+        --with-gmp-prefix='$(PREFIX)'
+    $(MAKE) -C '$(1).build' -j '$(JOBS)'
+    $(MAKE) -C '$(1).build' -j 1 install
+endef
diff -r d621dce7de41 -r 3c7b3646d0b3 src/isl.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/isl.mk	Mon Feb 03 18:16:02 2014 -0500
@@ -0,0 +1,29 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := isl
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.11.1
+$(PKG)_CHECKSUM := d7936929c3937e03f09b64c3c54e49422fa8ddb3
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc gmp
+
+# stick to tested versions from gcc
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'ftp://gcc.gnu.org/pub/gcc/infrastructure/' | \
+    $(SED) -n 's,.*isl-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    $(SORT) -V |
+    tail -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
+        $(ENABLE_SHARED_OR_STATIC) \
+        --prefix='$(HOST_PREFIX)' \
+        --with-gmp-prefix='$(HOST_PREFIX)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+endef
diff -r d621dce7de41 -r 3c7b3646d0b3 src/mingw-w64.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mingw-w64.mk	Mon Feb 03 18:16:02 2014 -0500
@@ -0,0 +1,27 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := mingw-w64
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 3.1.0
+$(PKG)_CHECKSUM := c167b1dc114a13c465fe6adcce9dc65c509baf75
+$(PKG)_SUBDIR   := $(PKG)-v$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-v$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE)
+$(PKG)_DEPS     :=
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'http://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/' | \
+    $(SED) -n 's,.*mingw-w64-v\([0-9.]*\)\.tar.*,\1,p' | \
+    $(SORT) -V | \
+    tail -1
+endef
+
+define $(PKG)_BUILD
+    mkdir '$(1).headers-build'
+    cd '$(1).headers-build' && '$(1)/mingw-w64-headers/configure' \
+        --host='$(TARGET)' \
+        --prefix='$(HOST_PREFIX)' \
+        --enable-sdk=all
+    $(MAKE) -C '$(1).headers-build' install
+endef