From 51ef3c3c86cfe5eee5a504b52e72b47675e41015 Mon Sep 17 00:00:00 2001
From: "wtchang%redhat.com" <wtchang%redhat.com>
Date: Fri, 2 Sep 2005 00:59:00 +0000
Subject: [PATCH] Bugzilla Bug 303507: changed GCC's default OPTIMIZER back to
 -O2. r=saul.edwards.

---
 security/coreconf/Linux.mk  | 2 +-
 security/coreconf/SunOS5.mk | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/security/coreconf/Linux.mk b/security/coreconf/Linux.mk
index ca0804bfeb2..1601d2606e5 100644
--- a/security/coreconf/Linux.mk
+++ b/security/coreconf/Linux.mk
@@ -148,7 +148,7 @@ ifeq ($(OS_RELEASE),2.0)
 endif
 
 ifdef BUILD_OPT
-	OPTIMIZER       = -O3
+	OPTIMIZER	= -O2
 endif
 
 ifeq ($(USE_PTHREADS),1)
diff --git a/security/coreconf/SunOS5.mk b/security/coreconf/SunOS5.mk
index 2bc5d72173f..0b8e8c1802b 100644
--- a/security/coreconf/SunOS5.mk
+++ b/security/coreconf/SunOS5.mk
@@ -112,7 +112,7 @@ ifdef NS_USE_GCC
 		OS_CFLAGS += -MDupdate $(DEPENDENCIES)
 	endif
 	ifdef BUILD_OPT
-	    OPTIMIZER = -O3
+	    OPTIMIZER = -O2
 	    # Enable this for accurate dtrace profiling
 	    # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
 	endif
@@ -183,6 +183,7 @@ ifeq ($(USE_64), 1)
 endif
 	DSO_LDOPTS += -G -h $(notdir $@)
 endif
+DSO_LDOPTS += -z combreloc -z defs -z ignore
 
 # -KPIC generates position independent code for use in shared libraries.
 # (Similarly for -fPIC in case of gcc.)
@@ -191,7 +192,6 @@ ifdef NS_USE_GCC
 else
 	DSO_CFLAGS += -KPIC
 endif
-DSO_LDOPTS += -z combreloc -z defs -z ignore
 
 NOSUCHFILE   = /solaris-rm-f-sucks