Bug 680792 - Remove support for Irix from our build system. r=ted
authorMatheus Kerschbaum <matjk7@gmail.com>
Fri, 26 Aug 2011 00:34:45 +0100
changeset 75984 a80fe3a6586f0b4123b562731dfa5e4afb7d7ba9
parent 75983 844bfd249e6a42b860c7cbf2c48c41cf356ce928
child 75985 706c0a4feec232daab369c002d8af05c2e2fe2b9
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
reviewersted
bugs680792
milestone9.0a1
Bug 680792 - Remove support for Irix from our build system. r=ted
build/hcpp
config/config.mk
configure.in
js/src/Makefile.in
js/src/build/hcpp
js/src/config/config.mk
js/src/configure.in
layout/build/Makefile.in
netwerk/protocol/ftp/Makefile.in
toolkit/mozapps/installer/packager.mk
xpcom/reflect/xptcall/src/md/unix/Makefile.in
--- a/build/hcpp
+++ b/build/hcpp
@@ -96,21 +96,16 @@ do
 			;;
 		+.*)
 			OPTS="${OPTS} $i"
 			;;
 		*.cpp)
 			CPP_SRC="$i"
 			if [ "${PLATFORM}" = "SCO_SV" ]; then
 				OPTS="${OPTS} +.cpp $i"
-			elif [ "${PLATFORM}" = "IRIX" ]; then
-				NEW_i=`basename ${CPP_SRC} .cpp`.C
-				rm -f ${NEW_i}
-				cp $i ${NEW_i}
-				OPTS="${OPTS} ${NEW_i}"
 			else
 				OPTS="${OPTS} $i"
 			fi
 # cc always creates the .o from the .cpp name
 			OBJ=`basename ${CPP_SRC} .cpp`.o
 			;;
 		*.cc)
 			CC_SRC="$i"
@@ -130,21 +125,16 @@ do
    		*) 	OPTS="${OPTS} $i"
 			;;
 	esac
 done
 
 ${CXX} ${OPTS} || exit $?
 rm -f ${NEW_i}
 
-# Really only needed for NSPR now.
-if [ "${PLATFORM}" = "IRIX" -a "$OBJ" != "$OBJECT" ]; then
-	OBJ=$OBJECT
-fi
-
 # LAME!!!
 if [ -f -O ]; then
 	mv -f -- -O ${OBJECT}
 fi
 
 # if there was no -c and -o we're done
 [ ${DASH_C} -eq 1 -a ${DASH_O} -eq 1 ] || exit 0
 
--- a/config/config.mk
+++ b/config/config.mk
@@ -124,17 +124,17 @@ LD		:= $(CC)
 endif
 endif
 
 #
 # Strip off the excessively long version numbers on these platforms,
 # but save the version to allow multiple versions of the same base
 # platform to be built in the same tree.
 #
-ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
+ifneq (,$(filter FreeBSD HP-UX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
 OS_RELEASE	:= $(basename $(OS_RELEASE))
 
 # Allow the user to ignore the OS_VERSION, which is usually irrelevant.
 ifdef WANT_MOZILLA_CONFIG_OS_VERSION
 OS_VERS		:= $(suffix $(OS_RELEASE))
 OS_VERSION	:= $(shell echo $(OS_VERS) | sed 's/-.*//')
 endif
 
--- a/configure.in
+++ b/configure.in
@@ -1362,19 +1362,16 @@ solaris*)
     AC_SUBST(SOLARIS_SUNPRO_CXX)
     ;;
 BSD_386)
     HOST_OS_ARCH=BSD
     ;;
 dgux)
     HOST_OS_ARCH=DGUX
     ;;
-IRIX64)
-    HOST_OS_ARCH=IRIX
-    ;;
 UNIX_SV)
     if "`cat /etc/bcheckrc | grep -c NCR 2>/dev/null`" != "0"; then
         HOST_OS_ARCH=NCR
     else
         HOST_OS_ARCH=UNIXWARE
     fi
     ;;
 ncr)
@@ -1436,19 +1433,16 @@ AIX)
     OS_TEST=${target_cpu}
     ;;
 BSD_386)
     OS_ARCH=BSD
     ;;
 dgux)
     OS_ARCH=DGUX
     ;;
-IRIX64)
-    OS_ARCH=IRIX
-    ;;
 UNIX_SV)
     if "`cat /etc/bcheckrc | grep -c NCR 2>/dev/null`" != "0"; then
         OS_ARCH=NCR
     else
         OS_ARCH=UNIXWARE
         OS_RELEASE=`uname -v`
     fi
     ;;
@@ -2187,76 +2181,16 @@ ia64*-hpux*)
         DSO_LDOPTS='-b -E +s'
         MKSHLIB='$(LD) $(DSO_LDOPTS) -L$(LIBXUL_DIST)/bin -L$(LIBXUL_DIST)/lib -o $@'
         MKCSHLIB='$(LD) $(DSO_LDOPTS) -L$(LIBXUL_DIST)/bin -L$(LIBXUL_DIST)/lib -o $@'
     fi
     MOZ_POST_PROGRAM_COMMAND='chatr +s enable'
     AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
     ;;
 
-*-irix5*)
-    AC_DEFINE(IRIX)
-    DSO_LDOPTS='-elf -shared'
-
-    if test "$GNU_CC"; then
-       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-       MKSHLIB_FORCE_ALL='-Wl,-all'
-       MKSHLIB_UNFORCE_ALL='-Wl,-none'
-       CXXFLAGS="$CXXFLAGS -D_LANGUAGE_C_PLUS_PLUS"
-    else
-       MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-       MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-       MKSHLIB_FORCE_ALL='-all'
-       MKSHLIB_UNFORCE_ALL='-none'
-    fi
-    ;;
-
-*-irix6*)
-    AC_DEFINE(IRIX)
-    dnl the irix specific xptcinvoke code is written against the n32 ABI so we *must* 
-    dnl compile and link using -n32
-    USE_N32=1
-    TARGET_COMPILER_ABI=n32
-    DSO_LDOPTS='-elf -shared'
-    MKSHLIB='$(CCC) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-    _MOZ_EXCEPTIONS_FLAGS_OFF="-LANG:exceptions=OFF"
-    _MOZ_EXCEPTIONS_FLAGS_ON="-LANG:exceptions=ON"
-    if test "$GNU_CC"; then
-       MKSHLIB_FORCE_ALL='-Wl,-all'
-       MKSHLIB_UNFORCE_ALL='-Wl,-none'
-       _WARNINGS_CFLAGS="-Wall"
-       _WARNINGS_CXXFLAGS="-Wall"
-       CXXFLAGS="$CXXFLAGS -D_LANGUAGE_C_PLUS_PLUS"
-    else
-       MKSHLIB_FORCE_ALL='-all'
-       MKSHLIB_UNFORCE_ALL='-none'
-	   AR_LIST="$AR t"
-	   AR_EXTRACT="$AR x"
-	   AR_DELETE="$AR d"
-	   AR='$(CXX) -ar'
-	   AR_FLAGS='-o $@'
-       CFLAGS="$CFLAGS -woff 3262 -G 4"
-       CXXFLAGS="$CXXFLAGS -woff 3262 -G 4"
-       if test -n "$USE_N32"; then
-	   ASFLAGS="$ASFLAGS -n32"
-	   CFLAGS="$CFLAGS -n32"
-	   CXXFLAGS="$CXXFLAGS -n32"
-	   LDFLAGS="$LDFLAGS -n32"
-       fi
-       AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
-       AC_MSG_WARN([Clearing MOZ_FIX_LINK_PATHS for OSF/1 as fix for bug 333545 (till the reference bug 332075 is fixed.])
-       MOZ_FIX_LINK_PATHS=
-    fi
-    if test -z "$GNU_CXX"; then
-      MIPSPRO_CXX=1
-    fi
-    ;;
-
 *-android*|*-linuxandroid*)
     AC_DEFINE(NO_PW_GECOS)
     no_x=yes
     _PLATFORM_DEFAULT_TOOLKIT=cairo-android
     TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
 
     MOZ_GFX_OPTIMIZE_MOBILE=1
     # If we're building with --enable-profiling, we need a frame pointer.
@@ -8064,36 +7998,36 @@ AC_CACHE_CHECK(for correct overload reso
 CXXFLAGS="$_SAVE_CXXFLAGS"
 
 if test "$ac_nscap_nonconst_opeq_bug" = "yes" ; then
     AC_DEFINE(NSCAP_DONT_PROVIDE_NONCONST_OPEQ)
 fi
 fi # ! SKIP_COMPILER_CHECKS
 
 dnl ========================================================
-dnl C++ exceptions (g++/VC/irix6/Sun only - for now)
+dnl C++ exceptions (g++/VC/Sun only - for now)
 dnl Should be smarter and check that the compiler does indeed have exceptions
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(cpp-exceptions,
 [  --enable-cpp-exceptions Enable C++ exceptions ],
 [ _MOZ_CPP_EXCEPTIONS=1 ],
 [ _MOZ_CPP_EXCEPTIONS= ])
 
 if test "$_MOZ_CPP_EXCEPTIONS"; then
     _MOZ_EXCEPTIONS_FLAGS=$_MOZ_EXCEPTIONS_FLAGS_ON
     AC_DEFINE(MOZ_CPP_EXCEPTIONS)
 else
     _MOZ_EXCEPTIONS_FLAGS=$_MOZ_EXCEPTIONS_FLAGS_OFF
 fi
 
 AC_SUBST(_MOZ_EXCEPTIONS_FLAGS_ON)
 
-# Irix & OSF native compilers do not like exception declarations 
+# OSF native compilers do not like exception declarations 
 # when exceptions are disabled
-if test -n "$MIPSPRO_CXX" -o -n "$COMPAQ_CXX" -o -n "$VACPP"; then
+if test -n "$COMPAQ_CXX" -o -n "$VACPP"; then
     AC_DEFINE(CPP_THROW_NEW, [])
 else
     AC_DEFINE(CPP_THROW_NEW, [throw()])
 fi
 AC_LANG_C
 
 dnl ========================================================
 dnl =
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -810,21 +810,16 @@ CFLAGS += -Op
 else
 CFLAGS += -fp:precise
 endif
 endif # WINNT
 
 ifeq ($(OS_ARCH),FreeBSD)
 EXTRA_LIBS	+= -pthread
 endif
-ifeq ($(OS_ARCH),IRIX)
-ifdef USE_N32
-DASH_R		+= -n32
-endif
-endif
 ifeq ($(OS_ARCH),Linux)
 EXTRA_LIBS	+= -ldl
 endif
 ifeq ($(OS_ARCH),OSF1)
 EXTRA_LIBS	+= -lc_r
 endif
 # Silence warnings on AIX/HP-UX from non-GNU compilers
 ifndef GNU_CC
@@ -874,26 +869,16 @@ jslock.o: jslock.cpp Makefile.in lock_sp
 ifeq (sparcv9,$(findstring sparcv9,$(OS_TEST)))
 	$(CXX) -o $@ -c $(COMPILE_CFLAGS) $(srcdir)/lock_sparcv9.il $<
 else
 	$(CXX) -o $@ -c $(COMPILE_CFLAGS) $(srcdir)/lock_sparcv8plus.il $<
 endif # sparcv9
 endif # sparc
 endif # SOLARIS_SUNPRO_CXX
 
-ifeq ($(OS_ARCH),IRIX)
-ifndef GNU_CC
-_COMPILE_CFLAGS  = $(patsubst -O%,-O1,$(COMPILE_CFLAGS))
-jsapi.o jsxdrapi.o jsarena.o jsarray.o jsatom.o jsemit.o jsfun.o jsinterp.o jsreflect.o jsregexp.o jsparse.o jsopcode.o jsscript.o: %.o: %.cpp Makefile.in
-	$(REPORT_BUILD)
-	@$(MAKE_DEPS_AUTO_CXX)
-	$(CXX) -o $@ -c $(_COMPILE_CFLAGS) $<
-endif
-endif
-
 # An AIX Optimization bug causes PR_dtoa() & JS_dtoa to produce wrong result.
 # This suppresses optimization for this single compilation unit.
 ifeq ($(OS_ARCH),AIX)
 jsatom.o: jsatom.cpp Makefile.in
 	$(REPORT_BUILD)
 	@$(MAKE_DEPS_AUTO_CXX)
 	$(CXX) -o $@ -c $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(COMPILE_CFLAGS)) $<
 jsdtoa.o: jsdtoa.cpp Makefile.in
--- a/js/src/build/hcpp
+++ b/js/src/build/hcpp
@@ -96,21 +96,16 @@ do
 			;;
 		+.*)
 			OPTS="${OPTS} $i"
 			;;
 		*.cpp)
 			CPP_SRC="$i"
 			if [ "${PLATFORM}" = "SCO_SV" ]; then
 				OPTS="${OPTS} +.cpp $i"
-			elif [ "${PLATFORM}" = "IRIX" ]; then
-				NEW_i=`basename ${CPP_SRC} .cpp`.C
-				rm -f ${NEW_i}
-				cp $i ${NEW_i}
-				OPTS="${OPTS} ${NEW_i}"
 			else
 				OPTS="${OPTS} $i"
 			fi
 # cc always creates the .o from the .cpp name
 			OBJ=`basename ${CPP_SRC} .cpp`.o
 			;;
 		*.cc)
 			CC_SRC="$i"
@@ -130,21 +125,16 @@ do
    		*) 	OPTS="${OPTS} $i"
 			;;
 	esac
 done
 
 ${CXX} ${OPTS} || exit $?
 rm -f ${NEW_i}
 
-# Really only needed for NSPR now.
-if [ "${PLATFORM}" = "IRIX" -a "$OBJ" != "$OBJECT" ]; then
-	OBJ=$OBJECT
-fi
-
 # LAME!!!
 if [ -f -O ]; then
 	mv -f -- -O ${OBJECT}
 fi
 
 # if there was no -c and -o we're done
 [ ${DASH_C} -eq 1 -a ${DASH_O} -eq 1 ] || exit 0
 
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -124,17 +124,17 @@ LD		:= $(CC)
 endif
 endif
 
 #
 # Strip off the excessively long version numbers on these platforms,
 # but save the version to allow multiple versions of the same base
 # platform to be built in the same tree.
 #
-ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
+ifneq (,$(filter FreeBSD HP-UX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
 OS_RELEASE	:= $(basename $(OS_RELEASE))
 
 # Allow the user to ignore the OS_VERSION, which is usually irrelevant.
 ifdef WANT_MOZILLA_CONFIG_OS_VERSION
 OS_VERS		:= $(suffix $(OS_RELEASE))
 OS_VERSION	:= $(shell echo $(OS_VERS) | sed 's/-.*//')
 endif
 
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1343,19 +1343,16 @@ solaris*)
     AC_SUBST(SOLARIS_SUNPRO_CXX)
     ;;
 BSD_386)
     HOST_OS_ARCH=BSD
     ;;
 dgux)
     HOST_OS_ARCH=DGUX
     ;;
-IRIX64)
-    HOST_OS_ARCH=IRIX
-    ;;
 UNIX_SV)
     if "`cat /etc/bcheckrc | grep -c NCR 2>/dev/null`" != "0"; then
         HOST_OS_ARCH=NCR
     else
         HOST_OS_ARCH=UNIXWARE
     fi
     ;;
 ncr)
@@ -1422,19 +1419,16 @@ AIX)
     fi
     ;;
 BSD_386)
     OS_ARCH=BSD
     ;;
 dgux)
     OS_ARCH=DGUX
     ;;
-IRIX64)
-    OS_ARCH=IRIX
-    ;;
 UNIX_SV)
     if "`cat /etc/bcheckrc | grep -c NCR 2>/dev/null`" != "0"; then
         OS_ARCH=NCR
     else
         OS_ARCH=UNIXWARE
         OS_RELEASE=`uname -v`
     fi
     ;;
@@ -2094,76 +2088,16 @@ ia64*-hpux*)
         DSO_LDOPTS='-b -E +s'
         MKSHLIB='$(LD) $(DSO_LDOPTS) -L$(LIBXUL_DIST)/bin -L$(LIBXUL_DIST)/lib -o $@'
         MKCSHLIB='$(LD) $(DSO_LDOPTS) -L$(LIBXUL_DIST)/bin -L$(LIBXUL_DIST)/lib -o $@'
     fi
     MOZ_POST_PROGRAM_COMMAND='chatr +s enable'
     AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
     ;;
 
-*-irix5*)
-    AC_DEFINE(IRIX)
-    DSO_LDOPTS='-elf -shared'
-
-    if test "$GNU_CC"; then
-       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-       MKSHLIB_FORCE_ALL='-Wl,-all'
-       MKSHLIB_UNFORCE_ALL='-Wl,-none'
-       CXXFLAGS="$CXXFLAGS -D_LANGUAGE_C_PLUS_PLUS"
-    else
-       MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-       MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
-       MKSHLIB_FORCE_ALL='-all'
-       MKSHLIB_UNFORCE_ALL='-none'
-    fi
-    ;;
-
-*-irix6*)
-    AC_DEFINE(IRIX)
-    dnl the irix specific xptcinvoke code is written against the n32 ABI so we *must* 
-    dnl compile and link using -n32
-    USE_N32=1
-    TARGET_COMPILER_ABI=n32
-    DSO_LDOPTS='-elf -shared'
-    MKSHLIB='$(CCC) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-    _MOZ_EXCEPTIONS_FLAGS_OFF="-LANG:exceptions=OFF"
-    _MOZ_EXCEPTIONS_FLAGS_ON="-LANG:exceptions=ON"
-    if test "$GNU_CC"; then
-       MKSHLIB_FORCE_ALL='-Wl,-all'
-       MKSHLIB_UNFORCE_ALL='-Wl,-none'
-       _WARNINGS_CFLAGS="-Wall"
-       _WARNINGS_CXXFLAGS="-Wall"
-       CXXFLAGS="$CXXFLAGS -D_LANGUAGE_C_PLUS_PLUS"
-    else
-       MKSHLIB_FORCE_ALL='-all'
-       MKSHLIB_UNFORCE_ALL='-none'
-	   AR_LIST="$AR t"
-	   AR_EXTRACT="$AR x"
-	   AR_DELETE="$AR d"
-	   AR='$(CXX) -ar'
-	   AR_FLAGS='-o $@'
-       CFLAGS="$CFLAGS -woff 3262 -G 4"
-       CXXFLAGS="$CXXFLAGS -woff 3262 -G 4"
-       if test -n "$USE_N32"; then
-	   ASFLAGS="$ASFLAGS -n32"
-	   CFLAGS="$CFLAGS -n32"
-	   CXXFLAGS="$CXXFLAGS -n32"
-	   LDFLAGS="$LDFLAGS -n32"
-       fi
-       AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
-       AC_MSG_WARN([Clearing MOZ_FIX_LINK_PATHS for OSF/1 as fix for bug 333545 (till the reference bug 332075 is fixed.])
-       MOZ_FIX_LINK_PATHS=
-    fi
-    if test -z "$GNU_CXX"; then
-      MIPSPRO_CXX=1
-    fi
-    ;;
-
 *-android*|*-linuxandroid*)
     AC_DEFINE(NO_PW_GECOS)
     no_x=yes
     _PLATFORM_DEFAULT_TOOLKIT=cairo-android
     TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
 
     MOZ_GFX_OPTIMIZE_MOBILE=1
     # If we're building with --enable-profiling, we need a frame pointer.
@@ -5339,36 +5273,36 @@ if test "$_MOZ_USE_RTTI"; then
    _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_ON
 else
    _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_OFF
 fi
 
 AC_SUBST(_MOZ_RTTI_FLAGS_ON)
 
 dnl ========================================================
-dnl C++ exceptions (g++/VC/irix6/Sun only - for now)
+dnl C++ exceptions (g++/VC/Sun only - for now)
 dnl Should be smarter and check that the compiler does indeed have exceptions
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(cpp-exceptions,
 [  --enable-cpp-exceptions Enable C++ exceptions ],
 [ _MOZ_CPP_EXCEPTIONS=1 ],
 [ _MOZ_CPP_EXCEPTIONS= ])
 
 if test "$_MOZ_CPP_EXCEPTIONS"; then
     _MOZ_EXCEPTIONS_FLAGS=$_MOZ_EXCEPTIONS_FLAGS_ON
     AC_DEFINE(MOZ_CPP_EXCEPTIONS)
 else
     _MOZ_EXCEPTIONS_FLAGS=$_MOZ_EXCEPTIONS_FLAGS_OFF
 fi
 
 AC_SUBST(_MOZ_EXCEPTIONS_FLAGS_ON)
 
-# Irix & OSF native compilers do not like exception declarations 
+# OSF native compilers do not like exception declarations 
 # when exceptions are disabled
-if test -n "$MIPSPRO_CXX" -o -n "$COMPAQ_CXX" -o -n "$VACPP"; then
+if test -n "$COMPAQ_CXX" -o -n "$VACPP"; then
     AC_DEFINE(CPP_THROW_NEW, [])
 else
     AC_DEFINE(CPP_THROW_NEW, [throw()])
 fi
 AC_LANG_C
 
 dnl ========================================================
 dnl =
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -283,14 +283,8 @@ LOCAL_INCLUDES	+= -I$(srcdir)/../base \
 		   -I$(topsrcdir)/js/src/xpconnect/src \
 		   -I$(topsrcdir)/js/src/xpconnect/loader \
 		   -I$(topsrcdir)/caps/include \
 		   -I$(topsrcdir)/netwerk/base/src \
 		   -I$(topsrcdir)/content/svg/content/src \
 		   $(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
-
-ifeq ($(OS_ARCH),IRIX)
-ifeq ($(GNU_CXX),1)
-LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=50
-endif
-endif
--- a/netwerk/protocol/ftp/Makefile.in
+++ b/netwerk/protocol/ftp/Makefile.in
@@ -67,23 +67,16 @@ CPPSRCS = \
   nsFtpProtocolHandler.cpp \
   nsFTPChannel.cpp \
   nsFtpConnectionThread.cpp \
   nsFtpControlConnection.cpp \
   FTPChannelParent.cpp \
   FTPChannelChild.cpp \
   $(NULL)
 
-# Use -g for Irix mipspro builds as workaround for bug 92099
-ifneq (,$(filter IRIX IRIX64,$(OS_ARCH)))
-ifndef GNU_CC
-MODULE_OPTIMIZE_FLAGS=-O -g
-endif
-endif
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/xpcom/ds \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -567,19 +567,16 @@ MOZ_PKG_REMOVALS_GEN = removed-files
 	sed -e 's/^[ \t]*//' | \
 	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) > $(MOZ_PKG_REMOVALS_GEN)
 
 GARBAGE += $(MOZ_PKG_REMOVALS_GEN)
 endif
 
 GARBAGE		+= $(DIST)/$(PACKAGE) $(PACKAGE)
 
-ifeq ($(OS_ARCH),IRIX)
-STRIP_FLAGS	= -f
-endif
 ifeq ($(OS_ARCH),OS2)
 STRIP		= $(MOZILLA_DIR)/toolkit/mozapps/installer/os2/strip.cmd
 endif
 
 ifneq (,$(filter WINNT OS2,$(OS_ARCH)))
 PKGCP_OS = dos
 else
 PKGCP_OS = unix
--- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -278,34 +278,16 @@ endif
 # Linux/m68k
 #
 ifeq ($(OS_ARCH),Linux)
 ifeq ($(OS_TEST),m68k)
 CPPSRCS		:= xptcinvoke_linux_m68k.cpp xptcstubs_linux_m68k.cpp
 endif
 endif
 
-######################################################################
-# MIPS
-######################################################################
-#
-# IRIX/MIPS
-#
-ifeq ($(OS_ARCH),IRIX)
-ifneq ($(basename $(OS_RELEASE)),5)
-CPPSRCS		:= xptcinvoke_irix.cpp xptcstubs_irix.cpp
-ASFILES		:= xptcinvoke_asm_irix.s xptcstubs_asm_irix.s
-ifdef GNU_CC
-ASFLAGS		+= -Wa,-D__GNUC__
-else
-CXXFLAGS	:= $(shell echo $(CXXFLAGS) | sed 's/-O\(3\|fast\)/-O2/g')
-endif
-endif
-endif
-
 ifeq ($(OS_ARCH),Linux)
 ifneq (,$(findstring mips, $(OS_TEST)))
 ifneq (,$(findstring mips64, $(OS_TEST)))
 CPPSRCS		:= xptcinvoke_mips64.cpp xptcstubs_mips64.cpp
 ASFILES		:= xptcinvoke_asm_mips64.s xptcstubs_asm_mips64.s
 else
 CPPSRCS		:= xptcinvoke_mips.cpp xptcstubs_mips.cpp
 ASFILES		:= xptcinvoke_asm_mips.s xptcstubs_asm_mips.s
@@ -514,28 +496,16 @@ xptcstubs_asm_ppc_aix64.o: xptcstubs_asm
 else
 xptcstubs_asm_ppc_aix.o: xptcstubs_asm_ppc_aix.s.m4 $(DIST)/include/xptcstubsdef.inc Makefile
 	m4 -DAIX_OBJMODEL=$(AIX_OBJMODEL) $(INCLUDES) -I. $< > ./xptcstubs_asm_ppc_aix.s && \
 	$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) ./xptcstubs_asm_ppc_aix.s
 	$(RM) ./xptcstubs_asm_ppc_aix.s
 endif
 endif
 
-ifeq ($(OS_ARCH),IRIX)
-# The assembler on IRIX (6.3 only?) seems to have trouble with the default command,
-# but works fine if we first copy the header and source file into the current dir.
-xptcstubs_asm_irix.o: $(DIST)/include/xptcstubsdef.inc $(srcdir)/xptcstubs_asm_irix.s
-	@rm -f ./xptcstubsdef.inc
-	@cp $(DIST)/include/xptcstubsdef.inc .
-	@if test ! -f ./Makefile.in; then rm -f ./xptcstubs_asm_irix.s; cp $(srcdir)/xptcstubs_asm_irix.s .; else true; fi
-	$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) ./xptcstubs_asm_irix.s
-	@rm -f ./xptcstubsdef.inc
-	@if test ! -f ./Makefile.in; then rm -f ./xptcstubs_asm_irix.s; else true; fi
-endif
-
 ifeq ($(OS_ARCH),SunOS)
 ifeq (86,$(findstring 86,$(OS_TEST)))
 ifndef GNU_CC
 ifeq (x86_64,$(OS_TEST))
 xptcstubs_asm_x86_64_solaris_SUNW.o: $(DIST)/include/xptcstubsdef.inc $(srcdir)/xptcstubs_asm_x86_64_solaris_SUNW.s
 	sed \
 	  -e 's/^\(STUB_ENTRY\)(\([0-9]\))/\11\(\2\)/' \
 	  -e 's/^\(STUB_ENTRY\)(\([0-9][0-9]\))/\12\(\2\)/' \