# HG changeset patch # User John W. Eaton # Date 1412522106 14400 # Node ID 9caae5336e92c9ee5d9e2166aab5abaf36199650 # Parent 992be31094335165cb95dc8076b4db0bcfa139e8 Undo botched commit. Backed out changeset 992be3109433 diff -r 992be3109433 -r 9caae5336e92 dist-files.mk --- a/dist-files.mk Sun Oct 05 11:12:39 2014 -0400 +++ b/dist-files.mk Sun Oct 05 11:15:06 2014 -0400 @@ -26,6 +26,8 @@ build-cmake.mk \ build-flex.mk \ build-gawk.mk \ + build-gcc-1-mingw-float.patch \ + build-gcc-2-intrinsics.patch \ build-gcc.mk \ build-gperf.mk \ build-libtool.mk \ @@ -408,6 +410,7 @@ mxml.mk \ native-binutils.mk \ native-gcc-1-float.patch \ + native-gcc-2-intrinsics.patch \ native-gcc.mk \ ncurses.mk \ netcdf.mk \ @@ -562,7 +565,6 @@ stable-octave-1-fixes.patch \ stable-octave-1-gnulib-isatty.patch \ stable-octave-2-winbelloff.patch \ - stable-octave-3-fixes.patch \ stable-octave.mk \ suitesparse-1.patch \ suitesparse.mk \ diff -r 992be3109433 -r 9caae5336e92 src/build-gcc.mk --- a/src/build-gcc.mk Sun Oct 05 11:12:39 2014 -0400 +++ b/src/build-gcc.mk Sun Oct 05 11:15:06 2014 -0400 @@ -3,8 +3,8 @@ PKG := build-gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 4.8.2 -$(PKG)_CHECKSUM := 810fb70bd721e1d9f446b6503afe0a9088b62986 +$(PKG)_VERSION := 4.9.1 +$(PKG)_CHECKSUM := 3f303f403053f0ce79530dae832811ecef91197e $(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) @@ -73,13 +73,6 @@ head -1 endef -ifneq ($(MXE_NATIVE_BUILD),yes) - define $(PKG)_POST_BUILD - $(INSTALL) -d '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)' - mv $(addprefix $(HOST_PREFIX)/bin/, c++ g++ gcc gfortran) '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)' - endef -endif - define $(PKG)_CONFIGURE # configure gcc mkdir '$(1).build' @@ -91,7 +84,6 @@ $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --disable-libgomp \ - --disable-libmudflap \ --with-cloog='$(BUILD_TOOLS_PREFIX)' \ --with-gmp='$(BUILD_TOOLS_PREFIX)' \ --with-isl='$(BUILD_TOOLS_PREFIX)' \ diff -r 992be3109433 -r 9caae5336e92 src/native-gcc-1-float.patch --- a/src/native-gcc-1-float.patch Sun Oct 05 11:12:39 2014 -0400 +++ b/src/native-gcc-1-float.patch Sun Oct 05 11:15:06 2014 -0400 @@ -3,16 +3,30 @@ This patch has been taken from: http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html -http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435 +http://sourceforge.net/p/mingw/bugs/1809 -diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h ---- a/gcc/ginclude/float.h 2009-04-09 17:00:19.000000000 +0200 -+++ b/gcc/ginclude/float.h 2010-06-05 12:03:41.887724045 +0200 -@@ -275,3 +275,7 @@ +diff --git a/gcc/ginclude/float.h b/gcc/ginclude/float.h +index a8e05bf..23fbb3d 100644 +--- a/gcc/ginclude/float.h ++++ b/gcc/ginclude/float.h +@@ -275,3 +275,17 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #endif /* __STDC_WANT_DEC_FP__ */ #endif /* _FLOAT_H___ */ + +#ifdef __MINGW32__ -+#include_next ++ /* ++ * the MinGW-supplied header, which is guarded by the ++ * _MINGW_FLOAT_H_ macro, may be found first, thus... ++ */ ++#ifndef _MINGW_FLOAT_H_ ++ /* ++ * ...when we didn't find the MinGW-supplied header first, we ++ * want to pull it in now; include_next should achieve this ++ */ ++# include_next +#endif ++#endif +-- +1.8.4.5 + diff -r 992be3109433 -r 9caae5336e92 src/native-gcc.mk --- a/src/native-gcc.mk Sun Oct 05 11:12:39 2014 -0400 +++ b/src/native-gcc.mk Sun Oct 05 11:15:06 2014 -0400 @@ -3,8 +3,8 @@ PKG := native-gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 4.8.2 -$(PKG)_CHECKSUM := 810fb70bd721e1d9f446b6503afe0a9088b62986 +$(PKG)_VERSION := 4.9.1 +$(PKG)_CHECKSUM := 3f303f403053f0ce79530dae832811ecef91197e $(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) @@ -52,7 +52,11 @@ $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ --disable-libgomp \ - --disable-libmudflap \ + --with-cloog='$(HOST_PREFIX)' \ + --with-gmp='$(HOST_PREFIX)' \ + --with-isl='$(HOST_PREFIX)' \ + --with-mpc='$(HOST_PREFIX)' \ + --with-mpfr='$(HOST_PREFIX)' \ $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'") $(MAKE) -C '$(1).build' -j '$(JOBS)' diff -r 992be3109433 -r 9caae5336e92 src/stable-octave-3-fixes.patch --- a/src/stable-octave-3-fixes.patch Sun Oct 05 11:12:39 2014 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -# HG changeset patch -# User John W. Eaton -# Date 1412519047 14400 -# Sun Oct 05 10:24:07 2014 -0400 -# Branch stable -# Node ID 3ffb8f53e94019084321d065390f4d4e215fd465 -# Parent 432ffa35de136a5dfd2a717a598750b62e6944f9 -use correct HDF5 size for octave_idx_type on Windows-64 (bug #43101) - -* ls-hdf5.h: Define H5T_NATIVE_IDX to H5T_NATIVE_INT64 when using -64-bit indexing. - -diff --git a/libinterp/corefcn/ls-hdf5.h b/libinterp/corefcn/ls-hdf5.h ---- a/libinterp/corefcn/ls-hdf5.h -+++ b/libinterp/corefcn/ls-hdf5.h -@@ -204,7 +204,7 @@ - const char *attr_name, void *buf); - - #ifdef USE_64_BIT_IDX_T --#define H5T_NATIVE_IDX H5T_NATIVE_LONG -+#define H5T_NATIVE_IDX H5T_NATIVE_INT64 - #else - #define H5T_NATIVE_IDX H5T_NATIVE_INT - #endif -# HG changeset patch -# User John W. Eaton -# Date 1412520111 14400 -# Sun Oct 05 10:41:51 2014 -0400 -# Branch stable -# Node ID 0279c601b49ce5d539b1ae938e8ec562b63f1ced -# Parent 3ffb8f53e94019084321d065390f4d4e215fd465 -compute for loop indices consistently with range element results - -* pt-eval.cc (tree_evaluator::visit_simple_for_command): Use -Range::elem instead of compuiting elements directly. This change -appears to fix obscure test failures in eig.cc-tst on 64-bit Windows -systems. See also task #13313. - -diff --git a/libinterp/parse-tree/pt-eval.cc b/libinterp/parse-tree/pt-eval.cc ---- a/libinterp/parse-tree/pt-eval.cc -+++ b/libinterp/parse-tree/pt-eval.cc -@@ -336,21 +336,10 @@ - Range rng = rhs.range_value (); - - octave_idx_type steps = rng.nelem (); -- double b = rng.base (); -- double increment = rng.inc (); - - for (octave_idx_type i = 0; i < steps; i++) - { -- // Use multiplication here rather than declaring a -- // temporary variable outside the loop and using -- // -- // tmp_val += increment -- // -- // to avoid problems with limited precision. Also, this -- // is consistent with the way Range::matrix_value is -- // implemented. -- -- octave_value val (b + i * increment); -+ octave_value val (rng.elem (i)); - - ult.assign (octave_value::op_asn_eq, val); -