[COMMON] Fix unaligned SIMD variables.Fix crash built with "-msse2" at Win32.

[csp-qt/common_source_project-fm7.git] / source / build-cmake / params / buildvars_mingw_params_gcc.dat

diff --git a/source/build-cmake/params/buildvars_mingw_params_gcc.dat b/source/build-cmake/params/buildvars_mingw_params_gcc.dat
index 71cca2b..e12a757 100644 (file)
--- a/source/build-cmake/params/buildvars_mingw_params_gcc.dat
+++ b/source/build-cmake/params/buildvars_mingw_params_gcc.dat
@@ -20,23 +20,23 @@ case ${LOCAL_ARCH_TYPE} in
       ARCH_FLAGS="-march=i686"
       ;;
    * )
-      ARCH_FLAGS="-march=generic -mtune=generic"
+      ARCH_FLAGS="-march=i686 -mtune=generic"
       ;;
  esac
 
 case ${CSP_DEBUG} in
    "Yes" | "yes" | "YES" )
-     MAKEFLAGS_BASE2="-g -ggdb ${ARCH_FLAGS} ${MAKEFLAGS_BASE} ${ADDITIONAL_CFLAGS} -DNDEBUG"
+     MAKEFLAGS_BASE2="-ggdb ${ARCH_FLAGS} ${MAKEFLAGS_BASE} ${ADDITIONAL_CFLAGS} -DNDEBUG"
      ;;
    "No" | "no" | "NO" | * )
-     MAKEFLAGS_BASE2="${MAKEFLAGS_BASE} -O3 \
+     MAKEFLAGS_BASE2="${MAKEFLAGS_BASE} -O2 \
                 ${ARCH_FLAGS} \
-                -ftree-vectorize \
-               -ftree-loop-optimize \
-               -floop-nest-optimize \
                -std=c++11 \
                ${ADDITIONAL_CFLAGS} \
                -DNDEBUG "
+#                -ftree-vectorize \
+#              -ftree-loop-optimize \
+#              -floop-nest-optimize \
      ;;
 esac
 
@@ -49,9 +49,46 @@ case ${USE_WHOLE_PROGRAM_OPTIMIZE} in
       ;;
 esac
 
+case ${USE_SANITIZER} in
+   "Yes" | "yes" | "YES" )
+      MAKEFLAGS_BASE2="${MAKEFLAGS_BASE2} \
+              -fsanitize=address \
+              -fsanitize=undefined \
+              -fsanitize=vptr \
+                  "
+                  ;;
+   "No" | "no" | "NO" | * )
+                  ;;
+esac   
+
+case ${USE_STACK_PROTECTION} in
+   "Yes" | "yes" | "YES" )
+      MAKEFLAGS_BASE3="${MAKEFLAGS_BASE3} \
+              -fstack-protector \
+                  "
+                  ;;
+   "All" | "all" | "ALL" )
+      MAKEFLAGS_BASE2="${MAKEFLAGS_BASE2} \
+              -fstack-protector-all \
+                  "
+                  ;;
+   "Strong" | "strong" | "STRONG" )
+      MAKEFLAGS_BASE2="${MAKEFLAGS_BASE2} \
+              -fstack-protector-strong \
+                  "
+                  ;;
+   "No" | "no" | "NO" )
+      MAKEFLAGS_BASE2="${MAKEFLAGS_BASE2} \
+              -fno-stack-protector \
+                  "
+                  ;;
+   "Default" | "default" | "DEFAULT" | * )
+           ;;
+esac   
+
 case ${USE_LTO} in
    "Yes" | "yes" | "YES" )
-       MAKEFLAGS_LINK_BASE="-flto ${LTO_FLAGS} ${MAKEFLAGS_BASE2}"
+       MAKEFLAGS_LINK_BASE="-flto=${LTO_THREADS} ${LTO_FLAGS} ${MAKEFLAGS_BASE2}"
        MAKEFLAGS_BASE2="-flto -ffat-lto-objects ${MAKEFLAGS_BASE2}"
        ;;
    "No" | "no" | "NO" | * )
@@ -65,8 +102,8 @@ case ${STRIP_SYMBOLS} in
      MAKEFLAGS_LINK_BASE="-s ${MAKEFLAGS_LINK_BASE}"
    ;;
    "No" | "no" | "NO" | * )
-     MAKEFLAGS_BASE2="-g -ggdb ${MAKEFLAGS_BASE2}"
-     MAKEFLAGS_LINK_BASE="-g -ggdb ${MAKEFLAGS_LINK_BASE}"
+     MAKEFLAGS_BASE2="${MAKEFLAGS_BASE2}"
+     MAKEFLAGS_LINK_BASE="${MAKEFLAGS_LINK_BASE}"
    ;;
 esac
 case ${USE_OPENMP} in
@@ -80,7 +117,8 @@ esac
 
 #CMAKE_APPENDFLAG="-DUSE_QT5_4_APIS=ON -DUSE_MOVIE_LOADER=ON \
 
-CMAKE_APPENDFLAG="-DUSE_QT5_4_APIS=ON -DUSE_MOVIE_LOADER=ON \
+CMAKE_APPENDFLAG=" -DUSE_QT5_4_APIS=ON \
+                   -DUSE_MOVIE_LOADER=ON \
                    -DUSE_MOVIE_SAVER=ON \
                    -DCMAKE_AR:STRING=i686-w64-mingw32-gcc-ar \
                    -DCMAKE_LD:STRING=i686-w64-mingw32-gcc-ld \