--- nss/coreconf/Linux.mk	2010-08-13 03:32:29.000000000 +0200
+++ nss/coreconf/Linux.mk-gil	2011-01-26 01:13:01.000000000 +0100
@@ -112,11 +112,7 @@
 endif
 
 ifdef BUILD_OPT
-ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
-	OPTIMIZER = -Os
-else
-	OPTIMIZER = -O2
-endif
+   OPTIMIZER = $(OPT_FLAGS)
 ifdef MOZ_DEBUG_SYMBOLS
 	ifdef MOZ_DEBUG_FLAGS
 		OPTIMIZER += $(MOZ_DEBUG_FLAGS)