Drop unnecessary gb_COMPILERDEFAULTOPTFLAGS

Change-Id: I9e4c39c24fff8345f25729734a702667277e5dc3

32 files changed, 19 insertions, 38 deletions

diff --git a/solenv/gbuild/platform/ANDROID_AARCH64_GCC.mk b/solenv/gbuild/platform/ANDROID_AARCH64_GCC.mk
index e8d2c25778c1..d5379aef4d71 100644
--- a/solenv/gbuild/platform/ANDROID_AARCH64_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_AARCH64_GCC.mk
@@ -9,7 +9,7 @@
 
 # please make generic modifications to unxgcc.mk or android.mk
 gb_CPUDEFS += -DARM32
-gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_COMPILEROPTFLAGS := -Os
 gb_CXXFLAGS += -fno-omit-frame-pointer
 gb_CFLAGS += -fno-omit-frame-pointer
 
diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index e8d2c25778c1..d5379aef4d71 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -9,7 +9,7 @@
 
 # please make generic modifications to unxgcc.mk or android.mk
 gb_CPUDEFS += -DARM32
-gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_COMPILEROPTFLAGS := -Os
 gb_CXXFLAGS += -fno-omit-frame-pointer
 gb_CFLAGS += -fno-omit-frame-pointer
 
diff --git a/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk b/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk
index 614fa03164c6..0eb4f0a96e48 100644
--- a/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk
@@ -9,7 +9,7 @@
 
 # please make generic modifications to unxgcc.mk or android.mk
 gb_CPUDEFS += -DMIPS
-gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_COMPILEROPTFLAGS := -Os
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 include $(GBUILDDIR)/platform/android.mk
diff --git a/solenv/gbuild/platform/ANDROID_INTEL_GCC.mk b/solenv/gbuild/platform/ANDROID_INTEL_GCC.mk
index 7ccf388a5ce4..04307ab36572 100644
--- a/solenv/gbuild/platform/ANDROID_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_INTEL_GCC.mk
@@ -9,7 +9,7 @@
 
 # please make generic modifications to unxgcc.mk or android.mk
 gb_CPUDEFS += -DX86
-gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_COMPILEROPTFLAGS := -Os
 gb_CXXFLAGS += -fno-omit-frame-pointer
 gb_CFLAGS += -fno-omit-frame-pointer
 
diff --git a/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk b/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
index 8251bc73884e..00ccf8a03adc 100644
--- a/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
@@ -10,7 +10,6 @@
 #please make generic modifications to unxgcc.mk
 
 gb_CPUDEFS := -DX86
-gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
diff --git a/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk b/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
index ef2d97074501..71b53d522a84 100644
--- a/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
@@ -9,8 +9,6 @@
 
 #please make generic modifications to unxgcc.mk
 
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-
 include $(GBUILDDIR)/platform/unxgcc.mk
 
 gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:/usr/pkg/lib
diff --git a/solenv/gbuild/platform/FREEBSD_INTEL_GCC.mk b/solenv/gbuild/platform/FREEBSD_INTEL_GCC.mk
index 46afb9cd5422..5582d2dc8876 100644
--- a/solenv/gbuild/platform/FREEBSD_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/FREEBSD_INTEL_GCC.mk
@@ -10,7 +10,6 @@
 #please make generic modifications to unxgcc.mk
 
 gb_CPUDEFS := -DX86
-gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
diff --git a/solenv/gbuild/platform/FREEBSD_X86_64_GCC.mk b/solenv/gbuild/platform/FREEBSD_X86_64_GCC.mk
index aa6f55ee6718..6199f17b3015 100644
--- a/solenv/gbuild/platform/FREEBSD_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/FREEBSD_X86_64_GCC.mk
@@ -9,8 +9,6 @@
 
 #please make generic modifications to unxgcc.mk
 
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-
 include $(GBUILDDIR)/platform/unxgcc.mk
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 96920cc43835..c5938d4754db 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -26,7 +26,7 @@ ifeq ($(CXX),)
 $(error You must set CXX in the environment. See README.cross for example.)
 endif
 
-gb_COMPILERDEFAULTOPTFLAGS := -Oz
+gb_COMPILEROPTFLAGS := -Oz
 
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
 
diff --git a/solenv/gbuild/platform/LINUX_AARCH64_GCC.mk b/solenv/gbuild/platform/LINUX_AARCH64_GCC.mk
index 682199ef061a..0531389e828d 100644
--- a/solenv/gbuild/platform/LINUX_AARCH64_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_AARCH64_GCC.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_COMPILEROPTFLAGS := -Os
 
 include $(GBUILDDIR)/platform/linux.mk
 
diff --git a/solenv/gbuild/platform/LINUX_ARM_GCC.mk b/solenv/gbuild/platform/LINUX_ARM_GCC.mk
index c3649e311031..6f42f96b1ac1 100644
--- a/solenv/gbuild/platform/LINUX_ARM_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_ARM_GCC.mk
@@ -9,7 +9,7 @@
 
 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS += -DARM32
-gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_COMPILEROPTFLAGS := -Os
 gb_CXXFLAGS += -fno-omit-frame-pointer
 gb_CFLAGS += -fno-omit-frame-pointer
 
diff --git a/solenv/gbuild/platform/LINUX_AXP_GCC.mk b/solenv/gbuild/platform/LINUX_AXP_GCC.mk
index 374437f04b3c..06517eea236a 100644
--- a/solenv/gbuild/platform/LINUX_AXP_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_AXP_GCC.mk
@@ -8,7 +8,7 @@
 #
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_COMPILEROPTFLAGS := -Os
 gb_CXXFLAGS += -fno-omit-frame-pointer
 gb_CFLAGS += -fno-omit-frame-pointer
 gb_LinkTarget_LDFLAGS += -Wl,--no-relax
diff --git a/solenv/gbuild/platform/LINUX_GODSON_GCC.mk b/solenv/gbuild/platform/LINUX_GODSON_GCC.mk
index 729bba8e3faa..976aaedf97fe 100644
--- a/solenv/gbuild/platform/LINUX_GODSON_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_GODSON_GCC.mk
@@ -9,7 +9,7 @@
 
 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS += -DMIPS
-gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_COMPILEROPTFLAGS := -Os
 
 include $(GBUILDDIR)/platform/linux.mk
 
diff --git a/solenv/gbuild/platform/LINUX_HPPA_GCC.mk b/solenv/gbuild/platform/LINUX_HPPA_GCC.mk
index 61794e9c0df8..c1a1ceeeefd6 100644
--- a/solenv/gbuild/platform/LINUX_HPPA_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_HPPA_GCC.mk
@@ -8,7 +8,6 @@
 #
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/linux.mk
 
diff --git a/solenv/gbuild/platform/LINUX_IA64_GCC.mk b/solenv/gbuild/platform/LINUX_IA64_GCC.mk
index 61794e9c0df8..c1a1ceeeefd6 100644
--- a/solenv/gbuild/platform/LINUX_IA64_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_IA64_GCC.mk
@@ -8,7 +8,6 @@
 #
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/linux.mk
 
diff --git a/solenv/gbuild/platform/LINUX_INTEL_GCC.mk b/solenv/gbuild/platform/LINUX_INTEL_GCC.mk
index 4da98d6992cd..146e95cf98cf 100644
--- a/solenv/gbuild/platform/LINUX_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_INTEL_GCC.mk
@@ -9,7 +9,7 @@
 
 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS := -DX86
-gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_COMPILEROPTFLAGS := -Os
 
 include $(GBUILDDIR)/platform/linux.mk
 
diff --git a/solenv/gbuild/platform/LINUX_M68K_GCC.mk b/solenv/gbuild/platform/LINUX_M68K_GCC.mk
index 8058c52358af..0fe2ad19e159 100644
--- a/solenv/gbuild/platform/LINUX_M68K_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_M68K_GCC.mk
@@ -8,7 +8,7 @@
 #
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_COMPILEROPTFLAGS := -Os
 gb_CXXFLAGS += -fno-omit-frame-pointer
 gb_CFLAGS += -fno-omit-frame-pointer
 
diff --git a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
index f71096c8c10b..f90374fe80bc 100644
--- a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
@@ -9,7 +9,6 @@
 
 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS += -DPPC
-gb_COMPILERDEFAULTOPTFLAGS := -O2
 gb_CXXFLAGS += -mminimal-toc
 
 include $(GBUILDDIR)/platform/linux.mk
diff --git a/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk b/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
index 5ba472a516ea..1880b3bad1e4 100644
--- a/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
@@ -9,7 +9,6 @@
 
 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS += -DPPC
-gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/linux.mk
 
diff --git a/solenv/gbuild/platform/LINUX_S390X_GCC.mk b/solenv/gbuild/platform/LINUX_S390X_GCC.mk
index 1e12e621689b..a76d6640f304 100644
--- a/solenv/gbuild/platform/LINUX_S390X_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_S390X_GCC.mk
@@ -8,7 +8,6 @@
 #
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_COMPILERDEFAULTOPTFLAGS := -O2
 gb_CXXFLAGS += -fno-omit-frame-pointer
 gb_CFLAGS += -fno-omit-frame-pointer
 
diff --git a/solenv/gbuild/platform/LINUX_S390_GCC.mk b/solenv/gbuild/platform/LINUX_S390_GCC.mk
index 1e12e621689b..a76d6640f304 100644
--- a/solenv/gbuild/platform/LINUX_S390_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_S390_GCC.mk
@@ -8,7 +8,6 @@
 #
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_COMPILERDEFAULTOPTFLAGS := -O2
 gb_CXXFLAGS += -fno-omit-frame-pointer
 gb_CFLAGS += -fno-omit-frame-pointer
 
diff --git a/solenv/gbuild/platform/LINUX_SPARC_GCC.mk b/solenv/gbuild/platform/LINUX_SPARC_GCC.mk
index f870c9a1394a..9e007101d8ac 100644
--- a/solenv/gbuild/platform/LINUX_SPARC_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_SPARC_GCC.mk
@@ -8,7 +8,7 @@
 #
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_COMPILEROPTFLAGS := -Os
 
 include $(GBUILDDIR)/platform/linux.mk
 
diff --git a/solenv/gbuild/platform/LINUX_X86_64_GCC.mk b/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
index 61794e9c0df8..c1a1ceeeefd6 100644
--- a/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
@@ -8,7 +8,6 @@
 #
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/linux.mk
 
diff --git a/solenv/gbuild/platform/MACOSX_INTEL_GCC.mk b/solenv/gbuild/platform/MACOSX_INTEL_GCC.mk
index 96e71a0b0b4e..3e36b51e0f3a 100644
--- a/solenv/gbuild/platform/MACOSX_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/MACOSX_INTEL_GCC.mk
@@ -9,7 +9,6 @@
 #*************************************************************************
 
 gb_CPUDEFS := -DX86
-gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/macosx.mk
 
diff --git a/solenv/gbuild/platform/MACOSX_X86_64_GCC.mk b/solenv/gbuild/platform/MACOSX_X86_64_GCC.mk
index a31437ad84ad..d8845ccbb3f9 100644
--- a/solenv/gbuild/platform/MACOSX_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/MACOSX_X86_64_GCC.mk
@@ -8,8 +8,6 @@
 #
 #*************************************************************************
 
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-
 include $(GBUILDDIR)/platform/macosx.mk
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
index 9d61dca000b1..feb527ba9e5c 100644
--- a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
@@ -10,7 +10,7 @@
 #please make generic modifications to unxgcc.mk
 
 gb_CPUDEFS := -DX86
-gb_COMPILERDEFAULTOPTFLAGS := -O -g
+gb_COMPILEROPTFLAGS := -O -g
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
diff --git a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
index 861ac0ca49a8..fbbf7b428dbf 100644
--- a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
@@ -9,7 +9,7 @@
 
 #please make generic modifications to unxgcc.mk
 
-gb_COMPILERDEFAULTOPTFLAGS := -O -g
+gb_COMPILEROPTFLAGS := -O -g
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
diff --git a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk
index 1abf3e2ec488..50d803d2970d 100644
--- a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk
@@ -10,7 +10,6 @@
 #please make generic modifications to unxgcc.mk
 
 gb_CPUDEFS := -DX86
-gb_COMPILERDEFAULTOPTFLAGS := -O2
 gb_STDLIBS := $(PTHREAD_LIBS)
 
 include $(GBUILDDIR)/platform/unxgcc.mk
diff --git a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk
index 5a1ad2eafe44..15908054d77f 100644
--- a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk
@@ -9,7 +9,6 @@
 
 #please make generic modifications to unxgcc.mk
 
-gb_COMPILERDEFAULTOPTFLAGS := -O2
 gb_STDLIBS := $(PTHREAD_LIBS)
 
 include $(GBUILDDIR)/platform/unxgcc.mk
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 728e0426322f..9c81e34fef27 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -17,7 +17,7 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_COMPILEROPTFLAGS := -Os
 gb_CPUDEFS := -D_M_IX86
 gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp)
 
diff --git a/solenv/gbuild/platform/WNT_X86_64_GCC.mk b/solenv/gbuild/platform/WNT_X86_64_GCC.mk
index 4d2ab0017ed9..e1bb0215925f 100644
--- a/solenv/gbuild/platform/WNT_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/WNT_X86_64_GCC.mk
@@ -17,7 +17,7 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_COMPILEROPTFLAGS := -Os
 gb_CPUDEFS := -D_M_AMD64 -D_M_X64
 gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp)
 
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 9cd9b489b095..1b2ceebfbfcf 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -35,8 +35,8 @@ else
 gb_AR := $(shell $(CC) -print-prog-name=ar)
 endif
 
-ifeq ($(strip $(gb_COMPILERDEFAULTOPTFLAGS)),)
-gb_COMPILERDEFAULTOPTFLAGS := -O2
+ifeq ($(strip $(gb_COMPILEROPTFLAGS)),)
+gb_COMPILEROPTFLAGS := -O2
 endif
 
 gb_SHORTSTDC3 := 1
@@ -81,7 +81,7 @@ ifeq ($(strip $(gb_GCOV)),YES)
 gb_CFLAGS_COMMON += -fprofile-arcs -ftest-coverage
 gb_CXXFLAGS_COMMON += -fprofile-arcs -ftest-coverage
 gb_LinkTarget_LDFLAGS += -fprofile-arcs -lgcov
-gb_COMPILERDEFAULTOPTFLAGS := -O0
+gb_COMPILEROPTFLAGS := -O0
 endif
 
 
@@ -130,7 +130,6 @@ endif
 gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
 
 # optimization level
-gb_COMPILEROPTFLAGS := $(gb_COMPILERDEFAULTOPTFLAGS)
 gb_COMPILERNOOPTFLAGS := -O0 -fstrict-aliasing -fstrict-overflow
 
 # Clang does not know -ggdb2 or some other options