--- a/sbsv2/raptor/lib/flm/e32abiv2.flm Mon Jan 18 20:59:13 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2.flm Tue Jan 19 19:11:02 2010 +0000
@@ -385,9 +385,7 @@
ifneq ($(DOPOSTLINK),)
# Capabilities
-ADDED_CAPABILITIES:=$(subst $(CHAR_SPACE),+,$(filter-out -%,$(CAPABILITY)))
-SUBTRACTED_CAPABILITIES:=$(subst $(CHAR_SPACE),,$(filter -%,$(CAPABILITY)))
-FINAL_CAPABILITIES:=$(if $(ADDED_CAPABILITIES),$(ADDED_CAPABILITIES)$(SUBTRACTED_CAPABILITIES),NONE)
+FINAL_CAPABILITIES:=$(if $(CAPABILITIES),$(CAPABILITIES),NONE)
# Paging options for the old postlinker
POSTLINKER_PAGEDOPTION:=--defaultpaged