Index: osprey/instrumentation/libinstr2/Makefile.gbase
===================================================================
--- osprey/instrumentation/libinstr2/Makefile.gbase	(revision 3309)
+++ osprey/instrumentation/libinstr2/Makefile.gbase	(working copy)
@@ -102,12 +102,12 @@
 ifeq ($(BUILD_OPTIMIZE), DEBUG)
 HOSTDEFS += -DIs_True_On
 HOSTDEFS += -DInsist_On 
-else
-CXXFLAGS += -O2 -fno-exceptions -nostdinc++ $(NO_UNWIND) -D_INCLUDED_FROM_LIBINSTR_
 endif
 
+CXXFLAGS += -fno-exceptions -nostdinc++ $(NO_UNWIND) -D_INCLUDED_FROM_LIBINSTR_
+
 ifeq ($(BUILD_TARGET), SL)
-CXXFLAGS += -O2 -fno-exceptions -nostdinc++ -CG:emit_unwind_info=off -D_INCLUDED_FROM_LIBINSTR -msoft-float -gnu42 -keep -show 
+CXXFLAGS += -msoft-float -gnu42 -keep -show 
 endif
 
 #----------------------------------------------------------------------