From 99a5e3ecc80fe3d318914f8367b02ff9ad3043d0 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Wed, 1 May 2019 13:55:56 +0200 Subject: [PATCH] Darwin compilation settings; optimiser bug requires lower compiler opt level --- wmake/rules/darwinIntel64Clang/c++ | 4 ++-- wmake/rules/darwinIntel64Clang/c++Opt | 5 +---- wmake/rules/darwinIntel64Gcc/c++ | 4 ++-- wmake/rules/darwinIntel64Gcc/c++Debug | 2 +- wmake/rules/darwinIntel64Gcc/c++Opt | 4 +--- wmake/rules/darwinIntel64Gcc/cDebug | 2 +- 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/wmake/rules/darwinIntel64Clang/c++ b/wmake/rules/darwinIntel64Clang/c++ index 0e55fe6a1..afd204ae3 100644 --- a/wmake/rules/darwinIntel64Clang/c++ +++ b/wmake/rules/darwinIntel64Clang/c++ @@ -1,8 +1,8 @@ .SUFFIXES: .C .cxx .cc .cpp -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-unused-comparison +c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wno-overloaded-virtual -Wno-unused-comparison -Wno-undefined-var-template -Wno-null-dereference -CC = $(WM_CXX) -m64 -ftrapping-math +CC = $(WM_CXX) -m64 -std=c++11 -ftrapping-math # -fsignaling-nans include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/darwinIntel64Clang/c++Opt b/wmake/rules/darwinIntel64Clang/c++Opt index 120b1006d..5319335a0 100644 --- a/wmake/rules/darwinIntel64Clang/c++Opt +++ b/wmake/rules/darwinIntel64Clang/c++Opt @@ -1,5 +1,2 @@ c++DBUG = -# c++OPT = -O4 -c++OPT = -O3 -#c++OPT = -march=nocona -O3 -# -ftree-vectorize -ftree-vectorizer-verbose=3 +c++OPT = -O1 -ftree-vectorize diff --git a/wmake/rules/darwinIntel64Gcc/c++ b/wmake/rules/darwinIntel64Gcc/c++ index f4ad3fbfa..021e26b60 100644 --- a/wmake/rules/darwinIntel64Gcc/c++ +++ b/wmake/rules/darwinIntel64Gcc/c++ @@ -1,8 +1,8 @@ .SUFFIXES: .C .cxx .cc .cpp -c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wno-overloaded-virtual -Wno-unsequenced -Wno-c++11-extensions -Wno-unused-comparison -Wno-undefined-var-template -Wno-null-dereference +c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wno-overloaded-virtual -Wno-unsequenced -Wno-unused-comparison -Wno-undefined-var-template -Wno-null-dereference -CC = $(WM_CXX) $(WM_CXXFLAGS) -ftrapping-math +CC = $(WM_CXX) -g -std=c++11 $(WM_CXXFLAGS) -ftrapping-math include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/darwinIntel64Gcc/c++Debug b/wmake/rules/darwinIntel64Gcc/c++Debug index 684957e11..83d3e4224 100644 --- a/wmake/rules/darwinIntel64Gcc/c++Debug +++ b/wmake/rules/darwinIntel64Gcc/c++Debug @@ -1,2 +1,2 @@ c++DBUG = -ggdb2 -DFULLDEBUG -c++OPT = -O0 -fdefault-inline +c++OPT = -O0 diff --git a/wmake/rules/darwinIntel64Gcc/c++Opt b/wmake/rules/darwinIntel64Gcc/c++Opt index 3446f7f58..a54f7458b 100644 --- a/wmake/rules/darwinIntel64Gcc/c++Opt +++ b/wmake/rules/darwinIntel64Gcc/c++Opt @@ -1,4 +1,2 @@ c++DBUG = -c++OPT = -O3 -#c++OPT = -march=nocona -O3 -# -ftree-vectorize -ftree-vectorizer-verbose=3 +c++OPT = -O1 diff --git a/wmake/rules/darwinIntel64Gcc/cDebug b/wmake/rules/darwinIntel64Gcc/cDebug index 72b638f45..6c71ed93e 100644 --- a/wmake/rules/darwinIntel64Gcc/cDebug +++ b/wmake/rules/darwinIntel64Gcc/cDebug @@ -1,2 +1,2 @@ cDBUG = -ggdb -DFULLDEBUG -cOPT = -O1 -fdefault-inline -finline-functions +cOPT = -O1 -finline-functions