diff -urN comm-release/mozilla/security/coreconf/WIN32.mk comm-release-sm/mozilla/security/coreconf/WIN32.mk
--- comm-release/mozilla/security/coreconf/WIN32.mk   2010-05-05 03:18:33 +0800
+++ comm-release-sm/mozilla/security/coreconf/WIN32.mk   2010-06-23 23:54:06 +0800
@@ -101,11 +101,15 @@
     _GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY)
     DLLFLAGS  += -mno-cygwin -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB))
     ifdef BUILD_OPT
+   ifeq ($(MOZ_OPTIMIZE),2)
+      OPTIMIZER += $(MOZ_OPTIMIZE_FLAGS)
+   else
    ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
       OPTIMIZER += -Os
    else
       OPTIMIZER += -O2
    endif
+   endif
    DEFINES    += -UDEBUG -U_DEBUG -DNDEBUG
     else
    OPTIMIZER  += -g
@@ -125,11 +129,15 @@
     endif
     ifdef BUILD_OPT
    OS_CFLAGS  += -MD
+   ifeq ($(MOZ_OPTIMIZE),2)
+      OPTIMIZER += $(MOZ_OPTIMIZE_FLAGS)
+   else
    ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
       OPTIMIZER += -O1
    else
       OPTIMIZER += -O2
    endif
+   endif
    DEFINES    += -UDEBUG -U_DEBUG -DNDEBUG
    DLLFLAGS   += -OUT:"$@"
    ifdef MOZ_DEBUG_SYMBOLS
diff -urN comm-release/mozilla/security/coreconf/WINCE.mk comm-release-sm/mozilla/security/coreconf/WINCE.mk
--- comm-release/mozilla/security/coreconf/WINCE.mk   2010-05-05 03:18:33 +0800
+++ comm-release-sm/mozilla/security/coreconf/WINCE.mk   2010-06-23 23:54:06 +0800
@@ -87,7 +87,11 @@
 
 ifdef BUILD_OPT
 #   OS_CFLAGS  += -MD
+    ifeq ($(MOZ_OPTIMIZE),2)
+    OPTIMIZER  += $(MOZ_OPTIMIZE_FLAGS)
+    else
     OPTIMIZER  += -O2
+    endif
     DEFINES    += -UDEBUG -U_DEBUG -DNDEBUG
     DLLFLAGS   += -OUT:"$@"
 else
diff -urN comm-release/mozilla/security/manager/Makefile.in comm-release-sm/mozilla/security/manager/Makefile.in
--- comm-release/mozilla/security/manager/Makefile.in   2010-05-05 03:18:33 +0800
+++ comm-release-sm/mozilla/security/manager/Makefile.in   2010-06-23 23:54:07 +0800
@@ -43,6 +43,8 @@
 
 include $(DEPTH)/config/autoconf.mk
 
+export MOZ_OPTIMIZE MOZ_OPTIMIZE_FLAGS MOZ_OPTIMIZE_LDFLAGS MOZ_OPTIMIZE_SIZE_TWEAK
+
 MODULE = psm
 
 ifndef MOZ_NATIVE_NSS
diff -urN comm-release/config/rules.mk comm-release-sm/config/rules.mk
--- comm-release/config/rules.mk   2010-05-05 03:14:54 +0800
+++ comm-release-sm/config/rules.mk   2010-06-23 23:54:01 +0800
@@ -963,7 +963,7 @@
      $(PROGRAM:$(BIN_SUFFIX)=) $(DIST)/$(MOZ_APP_NAME)
 endif
 ifdef SHARED_LIBRARY
-   $(PYTHON) $(topsrcdir)/build/win32/pgomerge.py \
+   $(PYTHON) $(MOZILLA_SRCDIR)/build/win32/pgomerge.py \
      $(SHARED_LIBRARY_NAME) $(DIST)/$(MOZ_APP_NAME)
 endif
 endif # SHARED_LIBRARY || PROGRAM
diff -urN comm-release/mozilla/js/src/Makefile.in comm-release-sm/mozilla/js/src/Makefile.in
--- comm-release/mozilla/js/src/Makefile.in
+++ comm-release-sm/mozilla/js/src/Makefile.in
@@ -102,19 +102,16 @@ endif
 
 MODULE          = js
 LIBRARY_NAME       = mozjs
 STATIC_LIBRARY_NAME = js_static
 GRE_MODULE       = 1
 
 LIBS      = $(NSPR_LIBS)
 
-ifeq ($(OS_ARCH),WINNT)
-NO_PROFILE_GUIDED_OPTIMIZE = 1
-endif
 
 # JavaScript must be built shared, even for static builds, as it is used by
 # other modules which are always built shared. Failure to do so results in
 # the js code getting copied into xpinstall and jsd as well as mozilla-bin,
 # and then the static data cells used for locking no longer work.
 #
 # In fact, we now build both a static and a shared library, as the
 # JS shell would like to link to the static library.