diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
index 0c563e0..de9091a 100644
--- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -56,6 +56,14 @@ CPPSRCS = $(error XPTCall not implemented on this platform!)
 # Force use of PIC
 FORCE_USE_PIC	= 1
 
+ifeq ($(OS_ARCH),SunOS)
+ifneq (86,$(findstring 86,$(OS_TEST)))
+# disable PGO for this directory with Sun Studio on SPARC
+# because compiling with xprofile=collect will insert code into nsXPTCStubBase::Stub##n
+NO_PROFILE_GUIDED_OPTIMIZE = 1
+endif
+endif
+
 include $(topsrcdir)/config/config.mk
 
 ######################################################################
@@ -432,10 +440,6 @@ ASFILES		:= xptcinvoke_asm_sparc_solaris_GCC.s xptcstubs_asm_sparc_solaris.s
 endif
 else
 
-# disable PGO for this directory with Sun Studio on SPARC
-# because compiling with xprofile=collect will insert code into nsXPTCStubBase::Stub##n
-NO_PROFILE_GUIDED_OPTIMIZE = 1
-
 ifdef HAVE_64BIT_OS
 ASFILES		:= xptcinvoke_asm_sparcv9_solaris_SUNW.s xptcstubs_asm_sparcv9_solaris.s
 else
--- mozilla-1.9.2/configure	Tue Mar  2 15:42:39 2010
+++ mozilla-1.9.2/configure	Tue Mar  2 15:43:08 2010
@@ -19716,8 +19716,8 @@
     PROFILE_USE_CFLAGS="-xprofile=use:$_objdir/$enable_application"
     PROFILE_USE_LDFLAGS="-xprofile=use:$_objdir/$enable_application"
   else
-    PROFILE_USE_CFLAGS="-xlinkopt=2 -xprofile=use:$_objdir/$enable_application"
-    PROFILE_USE_LDFLAGS="-xlinkopt=2 -xprofile=use:$_objdir/$enable_application"
+    PROFILE_USE_CFLAGS="-xprofile=use:$_objdir/$enable_application"
+    PROFILE_USE_LDFLAGS="-xprofile=use:$_objdir/$enable_application"
   fi
 fi
 
--- mozilla-1.9.2/js/src/configure	Tue Mar  2 15:48:48 2010
+++ mozilla-1.9.2/js/src/configure	Tue Mar  2 15:49:06 2010
@@ -12869,8 +12869,8 @@
     PROFILE_USE_CFLAGS="-xprofile=use:$_objdir/$enable_application"
     PROFILE_USE_LDFLAGS="-xprofile=use:$_objdir/$enable_application"
   else
-    PROFILE_USE_CFLAGS="-xlinkopt=2 -xprofile=use:$_objdir/$enable_application"
-    PROFILE_USE_LDFLAGS="-xlinkopt=2 -xprofile=use:$_objdir/$enable_application"
+    PROFILE_USE_CFLAGS="-xprofile=use:$_objdir/$enable_application"
+    PROFILE_USE_LDFLAGS="-xprofile=use:$_objdir/$enable_application"
   fi
 fi