зеркало из https://github.com/mozilla/gecko-dev.git
Bug 680792 - Remove support for Irix from our build system. r=ted
This commit is contained in:
Matheus Kerschbaum
Родитель
80c76492b3
Коммит
ca0293b46f
10
build/hcpp
10
build/hcpp
|
|
@ -101,11 +101,6 @@ do
|
|||
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
|
||||
|
|
@ -135,11 +130,6 @@ 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}
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ endif
|
|||
# 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.
|
||||
|
|
|
|||
72
configure.in
72
configure.in
|
|
@ -1367,9 +1367,6 @@ BSD_386)
|
|||
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
|
||||
|
|
@ -1441,9 +1438,6 @@ BSD_386)
|
|||
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
|
||||
|
|
@ -2192,66 +2186,6 @@ ia64*-hpux*)
|
|||
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
|
||||
|
|
@ -8069,7 +8003,7 @@ 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,
|
||||
|
|
@ -8086,9 +8020,9 @@ 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()])
|
||||
|
|
|
|||
|
|
@ -815,11 +815,6 @@ 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
|
||||
|
|
@ -879,16 +874,6 @@ 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)
|
||||
|
|
|
|||
|
|
@ -101,11 +101,6 @@ do
|
|||
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
|
||||
|
|
@ -135,11 +130,6 @@ 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}
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ endif
|
|||
# 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.
|
||||
|
|
|
|||
|
|
@ -1348,9 +1348,6 @@ BSD_386)
|
|||
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
|
||||
|
|
@ -1427,9 +1424,6 @@ BSD_386)
|
|||
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
|
||||
|
|
@ -2099,66 +2093,6 @@ ia64*-hpux*)
|
|||
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
|
||||
|
|
@ -5344,7 +5278,7 @@ 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,
|
||||
|
|
@ -5361,9 +5295,9 @@ 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()])
|
||||
|
|
|
|||
|
|
@ -288,9 +288,3 @@ LOCAL_INCLUDES += -I$(srcdir)/../base \
|
|||
$(NULL)
|
||||
|
||||
DEFINES += -D_IMPL_NS_LAYOUT
|
||||
|
||||
ifeq ($(OS_ARCH),IRIX)
|
||||
ifeq ($(GNU_CXX),1)
|
||||
LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=50
|
||||
endif
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -72,13 +72,6 @@ CPPSRCS = \
|
|||
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 \
|
||||
|
|
|
|||
|
|
@ -572,9 +572,6 @@ 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
|
||||
|
|
|
|||
|
|
@ -283,24 +283,6 @@ 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)))
|
||||
|
|
@ -519,18 +501,6 @@ xptcstubs_asm_ppc_aix.o: xptcstubs_asm_ppc_aix.s.m4 $(DIST)/include/xptcstubsdef
|
|||
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
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче