diff --git a/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
index 5f406153924..cb46469f18b 100644
--- a/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -143,11 +143,16 @@ endif
 # for gas and gcc, check comment in xptcinvoke_asm_pa32.s
 ifeq ($(OS_ARCH),HP-UX)
 ifneq ($(CC),gcc)
+ifneq ($(OS_TEST),ia64)
 CPPSRCS		:= xptcinvoke_pa32.cpp xptcstubs_pa32.cpp
 ASFILES		:= xptcstubs_asm_pa32.s xptcinvoke_asm_pa32.s
+else
+CPPSRCS		:= xptcinvoke_ipf32.cpp xptcstubs_ipf32.cpp
+ASFILES		:= xptcstubs_asm_ipf32.s xptcinvoke_asm_ipf32.s
+endif
 
 # #18875  Building the CPP's (CXX) optimized causes a crash
-CXXFLAGS 	:=  $(filter-out -O, $(CXXFLAGS))
+CXXFLAGS 	:=  $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(CXXFLAGS))
 endif
 endif