From 54f6fe8f801d3b2fc2db22cf58646a07ccfbb389 Mon Sep 17 00:00:00 2001 From: "saul.edwards%sun.com" Date: Wed, 24 Aug 2005 23:58:36 +0000 Subject: [PATCH] Addendum to 303507 - set default OPTIMIZER for Linux and Solaris gcc builds to -O3, consolidate flags to Linux.mk. --- security/coreconf/Linux.mk | 7 ++++--- security/coreconf/Linux2.1.mk | 3 --- security/coreconf/Linux2.2.mk | 3 --- security/coreconf/Linux2.4.mk | 3 --- security/coreconf/Linux2.5.mk | 3 --- security/coreconf/Linux2.6.mk | 3 --- security/coreconf/SunOS5.mk | 4 +++- 7 files changed, 7 insertions(+), 19 deletions(-) diff --git a/security/coreconf/Linux.mk b/security/coreconf/Linux.mk index 50c8af544a93..75fe4d60399d 100644 --- a/security/coreconf/Linux.mk +++ b/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 diff --git a/security/coreconf/Linux2.1.mk b/security/coreconf/Linux2.1.mk index 93d2d8eb6d29..eaba97ab6f71 100644 --- a/security/coreconf/Linux2.1.mk +++ b/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 diff --git a/security/coreconf/Linux2.2.mk b/security/coreconf/Linux2.2.mk index a2a72d2693c7..bcbddb8f88b3 100644 --- a/security/coreconf/Linux2.2.mk +++ b/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) diff --git a/security/coreconf/Linux2.4.mk b/security/coreconf/Linux2.4.mk index a2a72d2693c7..bcbddb8f88b3 100644 --- a/security/coreconf/Linux2.4.mk +++ b/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) diff --git a/security/coreconf/Linux2.5.mk b/security/coreconf/Linux2.5.mk index a2a72d2693c7..bcbddb8f88b3 100644 --- a/security/coreconf/Linux2.5.mk +++ b/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) diff --git a/security/coreconf/Linux2.6.mk b/security/coreconf/Linux2.6.mk index a2a72d2693c7..bcbddb8f88b3 100644 --- a/security/coreconf/Linux2.6.mk +++ b/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) diff --git a/security/coreconf/SunOS5.mk b/security/coreconf/SunOS5.mk index c7c36da62f7c..858e0d97d631 100644 --- a/security/coreconf/SunOS5.mk +++ b/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