Merge GH #2455 Switch to C++17 mode and prune CI configurations

9 files changed, 8 insertions, 64 deletions

diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index ab37b33d5..c0e4eda5f 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -2,7 +2,7 @@ macro_name CLANG
 
 binary_name clang++
 
-lang_flags "-std=c++11 -D_REENTRANT"
+lang_flags "-std=c++17 -D_REENTRANT"
 
 warning_flags "-Wall -Wextra -Wpedantic -Wshadow -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual"
 
diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt
deleted file mode 100644
index 490396ac4..000000000
--- a/src/build-data/cc/ekopath.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-macro_name PATHSCALE
-
-binary_name pathCC
-
-optimization_flags "-O3"
-
-lang_flags "-D_REENTRANT -ansi -Wno-long-long"
-warning_flags "-W -Wall"
-
-ar_command pathCC
-ar_options "-ar -o"
-
-shared_flags "-fPIC"
-
-<so_link_commands>
-default -> "$(CXX) -shared -fPIC -Wl,-soname,{soname_abi}"
-</so_link_commands>
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index d7e019212..3848fb0dd 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -2,15 +2,15 @@ macro_name GCC
 
 binary_name g++
 
-lang_flags "-std=c++11 -D_REENTRANT"
+lang_flags "-std=c++17 -D_REENTRANT"
 
-# This should only contain flags which are included in GCC 4.8
-warning_flags "-Wall -Wextra -Wpedantic -Wstrict-aliasing -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wzero-as-null-pointer-constant -Wnon-virtual-dtor"
+# This should only contain flags which are included in GCC 9
+warning_flags "-Wall -Wextra -Wpedantic -Wstrict-aliasing -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wzero-as-null-pointer-constant -Wnon-virtual-dtor -Wold-style-cast -Wsuggest-override -Wshadow -Wextra-semi"
 
 # Boost headers have 0 as nullptr and non-virtual-dtor issues so we can't werror on them
 werror_flags "-Werror -Wno-error=strict-overflow -Wno-error=zero-as-null-pointer-constant -Wno-error=non-virtual-dtor"
 
-maintainer_warning_flags "-Wstrict-overflow=5 -Wold-style-cast -Wsuggest-override -Wshadow -Wextra-semi"
+maintainer_warning_flags "-Wstrict-overflow=5"
 
 optimization_flags "-O3"
 sanitizer_optimization_flags "-O1 -fno-optimize-sibling-calls -fno-omit-frame-pointer"
diff --git a/src/build-data/cc/hpcc.txt b/src/build-data/cc/hpcc.txt
deleted file mode 100644
index cbe50c37d..000000000
--- a/src/build-data/cc/hpcc.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-macro_name HP_ACC
-
-binary_name aCC
-
-lang_flags "-AA -ext +eh -z"
-optimization_flags "+O2"
-warning_flags "+w"
-shared_flags "+Z"
-
-<mach_abi_linking>
-hppa1.0 -> "+DAportable"
-hppa1.1 -> "+DA1.1"
-hppa2.0 -> "+DA2.0W"
-</mach_abi_linking>
-
-<so_link_commands>
-default -> "$(CXX) +Z -b -Wl,+h,{soname_abi}" # Documented in cc(1), but not CC(1) (?)
-</so_link_commands>
diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index c8a1aa3dc..fcf5786d7 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -5,7 +5,7 @@ binary_name icpc
 optimization_flags "-O2"
 size_optimization_flags "-Os"
 
-lang_flags "-std=c++11"
+lang_flags "-std=c++17"
 warning_flags "-w1"
 shared_flags "-fPIC"
 
diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt
deleted file mode 100644
index 811578cdc..000000000
--- a/src/build-data/cc/pgi.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-macro_name PGI
-
-binary_name pgc++
-
-lang_flags "-std=c++11"
-
-optimization_flags "-O3"
-shared_flags "-fPIC"
-
-visibility_build_flags "-fvisibility=hidden"
-visibility_attribute '__attribute__((visibility("default")))'
-
-<so_link_commands>
-default -> "$(CXX) -shared -fPIC -Wl,-soname,{soname_abi}"
-</so_link_commands>
diff --git a/src/build-data/cc/sunstudio.txt b/src/build-data/cc/sunstudio.txt
index 3dd8e00b0..094a74ef0 100644
--- a/src/build-data/cc/sunstudio.txt
+++ b/src/build-data/cc/sunstudio.txt
@@ -6,7 +6,7 @@ optimization_flags "-xO2"
 
 shared_flags "-KPIC"
 warning_flags "+w -erroff=truncwarn,wnoretvalue,wlessrestrictedthrow"
-lang_flags "-std=c++11 +p -features=extensions"
+lang_flags "-std=c++17 +p -features=extensions"
 
 ar_command CC
 ar_options "-xar -o"
diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt
index a54b7f91f..8a7b46d15 100644
--- a/src/build-data/cc/xlc.txt
+++ b/src/build-data/cc/xlc.txt
@@ -4,7 +4,7 @@ binary_name xlC
 
 optimization_flags "-O2"
 
-lang_flags "-std=c++11"
+lang_flags "-std=c++17"
 
 visibility_build_flags "-fvisibility=hidden"
 visibility_attribute '__attribute__((visibility("default")))'
diff --git a/src/build-data/os/nacl.txt b/src/build-data/os/nacl.txt
deleted file mode 100644
index 0cb08ab93..000000000
--- a/src/build-data/os/nacl.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-<target_features>
-threads
-thread_local
-</target_features>