[lmi-commits] [lmi] master 9aabcdb 3/3: Upgrade to gcc-6.3.0

[Greg Chicares]

branch: master
commit 9aabcdba584699bc98c5e5772c05dc41639e36bf
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Upgrade to gcc-6.3.0
---
 msw_generic.make |  7 ++++++-
 workhorse.make   | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/msw_generic.make b/msw_generic.make
index de5f906..818688a 100644
--- a/msw_generic.make
+++ b/msw_generic.make
@@ -53,7 +53,12 @@ RC      := $(gcc_bin_dir)$(host_prefix)windres
 
 # Identify run-time libraries for redistribution.
 
-compiler_sysroot := /usr/lib/gcc/i686-w64-mingw32/4.9-win32
+# It might seem more robust to write something like
+#   compiler_sysroot := $(shell readlink -fn 
/usr/lib/gcc/i686-w64-mingw32/*-win32)
+# but that would actually weaken makefile portability, and there
+# is no guarantee that this directory will be named similarly in
+# future debian releases, much less on other OSs.
+compiler_sysroot := /usr/lib/gcc/i686-w64-mingw32/6.3-win32
 
 compiler_runtime_files := \
   $(compiler_sysroot)/libstdc++-6.dll \
diff --git a/workhorse.make b/workhorse.make
index 97b4532..69515f1 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -141,16 +141,18 @@ ifeq      (3.4.4,$(gnu_cpp_version))
 else ifeq (3.4.5,$(gnu_cpp_version))
 else ifeq (4.9.1,$(gnu_cpp_version))
 else ifeq (4.9.2,$(gnu_cpp_version))
+else ifeq (6.3.0,$(gnu_cpp_version))
 else
-  $(error Untested $(GNU_CPP) version '$(gnu_cpp_version)')
+  $(warning Untested $(GNU_CPP) version '$(gnu_cpp_version)')
 endif
 
 ifeq      (3.4.4,$(gnu_cxx_version))
 else ifeq (3.4.5,$(gnu_cxx_version))
 else ifeq (4.9.1,$(gnu_cxx_version))
 else ifeq (4.9.2,$(gnu_cxx_version))
+else ifeq (6.3.0,$(gnu_cxx_version))
 else
-  $(error Untested $(GNU_CXX) version '$(gnu_cxx_version)')
+  $(warning Untested $(GNU_CXX) version '$(gnu_cxx_version)')
 endif
 
 
################################################################################
@@ -368,7 +370,7 @@ else ifeq (3.4.5,$(gcc_version))
   # Use a correct snprintf() implementation:
   #   http://article.gmane.org/gmane.comp.gnu.mingw.user/27539
   cxx_standard += -posix
-else ifneq (,$(filter $(gcc_version), 4.9.1 4.9.2))
+else ifneq (,$(filter $(gcc_version), 4.9.1 4.9.2 6.3.0))
   # See:
   #   http://lists.nongnu.org/archive/html/lmi/2015-12/msg00028.html
   #   http://lists.nongnu.org/archive/html/lmi/2015-12/msg00040.html
@@ -476,6 +478,13 @@ endif
 # Since at least gcc-3.4.2, -Wmissing-prototypes is deprecated as
 # being redundant for C++.
 
+# This file contains hexadecimal floating constants. There is no
+# specific compiler option to allow them.
+
+ifeq (6.3.0,$(gcc_version))
+  value_cast_test.o: tutelary_flag := -std=gnu++11
+endif
+
 C_WARNINGS = \
   $(gcc_c_warnings) \
   $(gcc_common_extra_warnings) \