[Build][GCC] Revert -Os to -O2 .

diff --git a/source/ChangeLog b/source/ChangeLog
index 6146e8b..41c8efc 100644 (file)
--- a/source/ChangeLog
+++ b/source/ChangeLog
@@ -4,7 +4,7 @@
   * Merge upstream 2016-04-13 .
   * [General] Fix save/load state.
   * [General] Build with GCC6 for GNU/Linux .
-  * [General] Build with "-g -Os -foptimize-strlen -fvect-cost-model=dynamic -ftree-vectorize",
+  * [General] Build with "-g -O2 -fvect-cost-model=dynamic -ftree-vectorize",
     not with "-g -Og" .
   * [FM77AV] Fix not repeating with scan key mode, fixed YS2. 
   * [FM7/Display] VRAM: Fix positioning of wrote line .
@@ -16,7 +16,7 @@
   * [Qt/Sound] Fix wrong balance and volume after re-starting.
     i.e:) With 0db and panning to right, and re-starting, volume and balance hasn't kept.
 
--- Apr 28, 2016 00:09:07 +0900 K.Ohta <whatisthis.sowhat@gmail.com>
+-- Apr 28, 2016 00:51:34 +0900 K.Ohta <whatisthis.sowhat@gmail.com>
 
 * SNAPSHOT Apr 09, 2016
   * Merge upstream 2016-04-01 .

diff --git a/source/RELEASENOTE.txt b/source/RELEASENOTE.txt
index 04c04da..be270ba 100644 (file)
--- a/source/RELEASENOTE.txt
+++ b/source/RELEASENOTE.txt
@@ -88,7 +88,7 @@ Changes:
   * Merge upstream 2016-04-13 .
   * [General] Fix save/load state.
   * [General] Build with GCC6 for GNU/Linux .
-  * [General] Build with "-g -Os -foptimize-strlen -fvect-cost-model=dynamic -ftree-vectorize",
+  * [General] Build with "-g -O2 -fvect-cost-model=dynamic -ftree-vectorize",
     not with "-g -Og" .
   * [FM77AV] Fix not repeating with scan key mode, fixed YS2. 
   * [FM7/Display] VRAM: Fix positioning of wrote line .
@@ -100,7 +100,7 @@ Changes:
   * [Qt/Sound] Fix wrong balance and volume after re-starting.
     i.e:) With 0db and panning to right, and re-starting, volume and balance hasn't kept.
 
--- Apr 28, 2016 00:09:07 +0900 K.Ohta <whatisthis.sowhat@gmail.com>
+-- Apr 28, 2016 00:51:34 +0900 K.Ohta <whatisthis.sowhat@gmail.com>
 
 Upstream changes:
 -----

diff --git a/source/build-cmake/buildvars.dat b/source/build-cmake/buildvars.dat
index 152fb50..776fa99 100644 (file)
--- a/source/build-cmake/buildvars.dat
+++ b/source/build-cmake/buildvars.dat
@@ -4,11 +4,11 @@ CCMAKE_CXX=g++-6
 #CCMAKE_CC=clang-3.8
 #CCMAKE_CXX=clang++-3.8
 
-MAKEFLAGS_CXX="-g -Os -foptimize-strlen -fvect-cost-model=dynamic -ftree-vectorize -flto -DNDEBUG" 
-MAKEFLAGS_CC="-g -Os -foptimize-strlen -fvect-cost-model=dynamic -ftree-vectorize  -flto -DNDEBUG"
+MAKEFLAGS_CXX="-g -O2 -fvect-cost-model=dynamic -ftree-vectorize -flto -DNDEBUG" 
+MAKEFLAGS_CC="-g -O2 -fvect-cost-model=dynamic -ftree-vectorize  -flto -DNDEBUG"
 
-MAKEFLAGS_LIB_CXX="-g -Os -foptimize-strlen -fvect-cost-model=dynamic -ftree-vectorize -DNDEBUG" 
-MAKEFLAGS_LIB_CC="-g -Os -foptimize-strlen -fvect-cost-model=dynamic -ftree-vectorize  -DNDEBUG"
+MAKEFLAGS_LIB_CXX="-g -O2 -fvect-cost-model=dynamic -ftree-vectorize -DNDEBUG" 
+MAKEFLAGS_LIB_CC="-g -O2 -fvect-cost-model=dynamic -ftree-vectorize  -DNDEBUG"
 
 #MAKEFLAGS_CXX="-g -O4 -ftree-vectorize -DNDEBUG" 
 #MAKEFLAGS_CC="-g -O4 -ftree-vectorize -DNDEBUG"

diff --git a/source/build-cmake/buildvars_mingw.dat b/source/build-cmake/buildvars_mingw.dat
index cc49d7e..8862f8f 100644 (file)
--- a/source/build-cmake/buildvars_mingw.dat
+++ b/source/build-cmake/buildvars_mingw.dat
@@ -2,8 +2,8 @@
 CCMAKE_CC=gcc
 CCMAKE_CXX=g++
 
-MAKEFLAGS_CXX="-Os -foptimize-strlen -fvect-cost-model=dynamic -ftree-vectorize -DNDEBUG" 
-MAKEFLAGS_CC="-Os -foptimize-strlen -fvect-cost-model=dynamic -ftree-vectorize -DNDEBUG"
+MAKEFLAGS_CXX="-O2 -fvect-cost-model=dynamic -ftree-vectorize -DNDEBUG" 
+MAKEFLAGS_CC="-O2 -fvect-cost-model=dynamic -ftree-vectorize -DNDEBUG"
 MAKEFLAGS_GENERAL="-j3"
 
 #BUILD_TYPE="Relwithdebinfo"

diff --git a/source/build-cmake/config_build_cross_win32.sh b/source/build-cmake/config_build_cross_win32.sh
index fec3700..4b84fc9 100755 (executable)
--- a/source/build-cmake/config_build_cross_win32.sh
+++ b/source/build-cmake/config_build_cross_win32.sh
@@ -14,8 +14,8 @@ mkdir -p ./bin-win32/
 #if [ -e ./buildvars.dat ] ; then
 #    . ./buildvars.dat
 #fi
-MAKEFLAGS_CXX="-Os -foptimize-strlen -fvect-cost-model=dynamic -ftree-vectorize -DNDEBUG" 
-MAKEFLAGS_CC="-Os -foptimize-strlen -fvect-cost-model=dynamic -ftree-vectorize  -DNDEBUG"
+MAKEFLAGS_CXX="-O2 -fvect-cost-model=dynamic -ftree-vectorize -DNDEBUG" 
+MAKEFLAGS_CC="-O2 -fvect-cost-model=dynamic -ftree-vectorize  -DNDEBUG"
 BUILD_TYPE="Release"
 
 MAKEFLAGS_CXX="${MAKEFLAGS_CXX} -DWINVER=0x501"