--- 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 \