Addendum to 303507 - set default OPTIMIZER for Linux and Solaris gcc builds

to -O3, consolidate flags to Linux.mk.

security/coreconf/Linux.mk

@@ -140,9 +140,6 @@ LIBC_TAG		= _glibc
 ifeq ($(OS_RELEASE),2.0)
 	OS_REL_CFLAGS	+= -DLINUX2_0
 	MKSHLIB		= $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-	ifdef BUILD_OPT
-		OPTIMIZER	= -O2
-	endif
 	ifdef MAPFILE
 		MKSHLIB += -Wl,--version-script,$(MAPFILE)
 	endif
@@ -150,6 +147,10 @@ ifeq ($(OS_RELEASE),2.0)
          sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
 endif
 
+ifdef BUILD_OPT
+	OPTIMIZER       = -O3
+endif
+
 ifeq ($(USE_PTHREADS),1)
 OS_PTHREAD = -lpthread 
 endif

security/coreconf/Linux2.1.mk

@@ -39,9 +39,6 @@ include $(CORE_DEPTH)/coreconf/Linux.mk
 ifeq ($(OS_RELEASE),2.1)
         OS_REL_CFLAGS   += -DLINUX2_1
         MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-        ifdef BUILD_OPT
-                OPTIMIZER       = -O2
-        endif
 	ifdef MAPFILE
 		MKSHLIB += -Wl,--version-script,$(MAPFILE)
 	endif

security/coreconf/Linux2.2.mk

@@ -39,9 +39,6 @@ include $(CORE_DEPTH)/coreconf/Linux.mk
 
 OS_REL_CFLAGS   += -DLINUX2_1
 MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-ifdef BUILD_OPT
-            OPTIMIZER       = -O2
-endif
 
 ifdef MAPFILE
 	MKSHLIB += -Wl,--version-script,$(MAPFILE)

security/coreconf/Linux2.4.mk

@@ -39,9 +39,6 @@ include $(CORE_DEPTH)/coreconf/Linux.mk
 
 OS_REL_CFLAGS   += -DLINUX2_1
 MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-ifdef BUILD_OPT
-            OPTIMIZER       = -O2
-endif
 
 ifdef MAPFILE
 	MKSHLIB += -Wl,--version-script,$(MAPFILE)

security/coreconf/Linux2.5.mk

@@ -39,9 +39,6 @@ include $(CORE_DEPTH)/coreconf/Linux.mk
 
 OS_REL_CFLAGS   += -DLINUX2_1
 MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-ifdef BUILD_OPT
-            OPTIMIZER       = -O2
-endif
 
 ifdef MAPFILE
 	MKSHLIB += -Wl,--version-script,$(MAPFILE)

security/coreconf/Linux2.6.mk

@@ -39,9 +39,6 @@ include $(CORE_DEPTH)/coreconf/Linux.mk
 
 OS_REL_CFLAGS   += -DLINUX2_1
 MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-ifdef BUILD_OPT
-            OPTIMIZER       = -O2
-endif
 
 ifdef MAPFILE
 	MKSHLIB += -Wl,--version-script,$(MAPFILE)

security/coreconf/SunOS5.mk

@@ -112,7 +112,9 @@ ifdef NS_USE_GCC
 		OS_CFLAGS += -MDupdate $(DEPENDENCIES)
 	endif
 	ifdef BUILD_OPT
-	    OPTIMIZER = -O2
+	    OPTIMIZER = -O3
+	    # Enable this for accurate dtrace profiling
+	    # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
 	endif
 else
 	CC         = cc