[Pkg-ace-commits] [pkg-ace] r593 - trunk/debian

[tgg at alioth.debian.org]

Author: tgg
Date: 2008-04-19 20:11:29 +0000 (Sat, 19 Apr 2008)
New Revision: 593

Modified:
   trunk/debian/platform_macros.GNU.in
Log:
don't optimize over -O2 for Debian


Modified: trunk/debian/platform_macros.GNU.in
===================================================================
--- trunk/debian/platform_macros.GNU.in	2008-04-19 20:07:52 UTC (rev 592)
+++ trunk/debian/platform_macros.GNU.in	2008-04-19 20:11:29 UTC (rev 593)
@@ -97,7 +97,7 @@
 LIBS     += @LIBS@
 
 ifeq ($(optimize),1)
-  SOFLAGS += -Wl,-O3
+  SOFLAGS += -Wl,-O2
 endif
 
 SOFLAGS += $(CPPFLAGS) -shared
@@ -110,15 +110,8 @@
 #
 include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
 
-# TAO with GCC 4.0.2 and -O3 seems to result in runtime issues, for example
-# the ForwardRequest PI test will fail. For GCC 4.0.2 we default to -O2
-ifeq ($(CXX_VERSION),4.0.2)
-  OCFLAGS ?= -O2
-  OCCFLAGS ?=-O2
-else
-  OCFLAGS ?= -O3
-  OCCFLAGS ?= -O3
-endif
+OCFLAGS  ?= -O2
+OCCFLAGS ?= -O2
 
 CFLAGS  += $(FLAGS_C_CC)
 CCFLAGS += $(FLAGS_C_CC) $(TEMPLATES_FLAG)