From: K.Ohta <whatisthis.sowhat@gmail.com>
Date: Mon, 16 Jan 2017 12:20:05 +0000 (+0000)
Subject: [BUILD][LINUX][GCC] Fix crash on some VMs built with gcc-5 (or earlier).
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=61fd8019a1bab8587f6b034334ab17476f2ee752;p=csp-qt%2Fcommon_source_project-fm7.git

[BUILD][LINUX][GCC] Fix crash on some VMs built with gcc-5 (or earlier).
---

diff --git a/source/build-cmake/buildvars.dat b/source/build-cmake/buildvars.dat
index 085813559..22935ddd4 100644
--- a/source/build-cmake/buildvars.dat
+++ b/source/build-cmake/buildvars.dat
@@ -10,13 +10,20 @@ CSP_DEBUG="No"
 USE_LTO="Yes"
 # "No" or "Yes"
 STRIP_SYMBOLS="No"
+# "No" or "Yes"
+USE_RADICAL_OPTIMIZE="No"
 
 ADDITIONAL_MAKEFLAGS_LINK_EXE=""
 ADDITIONAL_MAKEFLAGS_LINK_DLL=""
 ADDITIONAL_MAKEFLAGS_LINK_LIB=""
 
-FFMPEG_DIR="/usr/local/ffmpeg-3.2"
-QT5_DIR="/opt/Qt5.5.1/5.5/gcc_64"
+FFMPEG_DIR="/usr/include/x86_64-linux-gnu/"
+QT5_DIR="/usr/include/x86_64-linux-gnu/"
+FFMPEG_DIR="/usr/include/x86_64-linux-gnu/"
+QT5_DIR="/usr/include/x86_64-linux-gnu/"
+#FFMPEG_DIR="/usr/local/ffmpeg-3.2"
+#QT5_DIR="/opt/Qt5.5.1/5.5/gcc_64"
+
 LIB_INSTALL="/usr/local/lib/x86_64-linux-gnu/"
 
 MAKEFLAGS_GENERAL="-j6"
diff --git a/source/build-cmake/params/buildvars_linux_params_gcc.dat b/source/build-cmake/params/buildvars_linux_params_gcc.dat
index 4c2717b02..923da639d 100644
--- a/source/build-cmake/params/buildvars_linux_params_gcc.dat
+++ b/source/build-cmake/params/buildvars_linux_params_gcc.dat
@@ -3,15 +3,12 @@
 # This is build-parameters fo GCC/Linux.
 # Neither for GCC/MinGW and LLVM.
 #
-CCMAKE_CC=gcc-6
-CCMAKE_CXX=g++-6
+CCMAKE_CC=gcc
+CCMAKE_CXX=g++
 
-case ${CSP_DEBUG} in
+case ${USE_RADICAL_OPTIMIZE} in
    "Yes" | "yes" | "YES" )
-      MAKEFLAGS_BASE2="-g -ggdb ${MAKEFLAGS_BASE} -DNDEBUG"
-      ;;
-   "No" | "no" | "NO" | * )
-      MAKEFLAGS_BASE2="-g -ggdb \
+   MAKEFLAGS_BASE3= "
                -O3 \
                -fvect-cost-model=dynamic -ftree-vectorize \
                -ftree-loop-distribute-patterns \
@@ -24,8 +21,27 @@ case ${CSP_DEBUG} in
 	       -msse -msse2 \
                ${MAKEFLAGS_BASE} \
 	       "
+	       
+   "No" | "no" | "NO" | * )
+   MAKEFLAGS_BASE3="-g -ggdb \
+               -O2 \
+	       -funroll-loops \
+	       -floop-nest-optimize \
+	       -msse -msse2 \
+               ${MAKEFLAGS_BASE} \
+	       "
 	       ;;
 esac
+
+case ${CSP_DEBUG} in
+   "Yes" | "yes" | "YES" )
+      MAKEFLAGS_BASE2="-g -ggdb ${MAKEFLAGS_BASE3} -DNDEBUG"
+      ;;
+   "No" | "no" | "NO" | * )
+      MAKEFLAGS_BASE2="-g -ggdb ${MAKEFLAGS_BASE3}"
+       ;;
+esac
+
 case ${USE_LTO} in
    "Yes" | "yes" | "YES" )
        MAKEFLAGS_LINK_BASE2="-flto=6 -fwhole-program ${MAKEFLAGS_BASE2}"
@@ -38,7 +54,7 @@ case ${USE_LTO} in
 esac
 
 CMAKE_APPENDFLAG="${CMAKE_APPENDFLAG} \
-                  -DCMAKE_AR:STRING=gcc-ar-6 \
-		  -DCMAKE_NM:STRING=gcc-nm-6 \
-		  -DCMAKE_RANLIB:STRING=gcc-ranlib-6 \
+                  -DCMAKE_AR:STRING=gcc-ar \
+		  -DCMAKE_NM:STRING=gcc-nm \
+		  -DCMAKE_RANLIB:STRING=gcc-ranlib \
 		  "