--- a/build/autoconf/ffi.m4
+++ b/build/autoconf/ffi.m4
@@ -64,32 +64,16 @@ if test -z "$BUILDING_JS" -o -n "$JS_STA
;;
*)
ac_configure_args="$ac_configure_args \
CC=\"$_topsrcdir/js/src/ctypes/libffi/msvcc.sh$flags\" \
CXX=\"$_topsrcdir/js/src/ctypes/libffi/msvcc.sh$flags\""
;;
esac
fi
- if test "$SOLARIS_SUNPRO_CC"; then
- # Always use gcc for libffi on Solaris
- if test ! "$HAVE_64BIT_BUILD"; then
- ac_configure_args="$ac_configure_args CC=gcc CFLAGS=-m32 LD= LDFLAGS="
- else
- ac_configure_args="$ac_configure_args CC=gcc CFLAGS=-m64 LD= LDFLAGS="
- fi
- fi
- if test "$AIX_IBM_XLC"; then
- # Always use gcc for libffi on IBM AIX5/AIX6
- if test ! "$HAVE_64BIT_BUILD"; then
- ac_configure_args="$ac_configure_args CC=gcc CFLAGS=-maix32"
- else
- ac_configure_args="$ac_configure_args CC=gcc CFLAGS=-maix64"
- fi
- fi
# Use a separate cache file for libffi, since it does things differently
# from our configure.
old_config_files=$CONFIG_FILES
unset CONFIG_FILES
AC_OUTPUT_SUBDIRS(js/src/ctypes/libffi)
ac_configure_args="$_SUBDIR_CONFIG_ARGS"
CONFIG_FILES=$old_config_files
--- a/build/autoconf/icu.m4
+++ b/build/autoconf/icu.m4
@@ -94,17 +94,17 @@ if test -n "$USE_ICU"; then
case "$OS_TARGET" in
WINNT)
ICU_LIB_NAMES="icuin icuuc icudt"
MOZ_ICU_DBG_SUFFIX=
if test -n "$MOZ_DEBUG" -a -z "$MOZ_NO_DEBUG_RTL"; then
MOZ_ICU_DBG_SUFFIX=d
fi
;;
- Darwin|Linux|DragonFly|FreeBSD|NetBSD|OpenBSD|GNU/kFreeBSD|SunOS|Android)
+ Darwin|Linux|DragonFly|FreeBSD|NetBSD|OpenBSD|GNU/kFreeBSD|Android)
ICU_LIB_NAMES="icui18n icuuc icudata"
;;
*)
AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform])
esac
fi
fi
deleted file mode 100644
--- a/build/unix/add_phony_targets.py
+++ /dev/null
@@ -1,33 +0,0 @@
-import pymake.data
-import pymake.parser
-import pymake.parserdata
-import sys
-
-'''
-Modifies the output of Sun Studio's -xM to look more like the output
-of gcc's -MD -MP, adding phony targets for dependencies.
-'''
-
-
-def add_phony_targets(path):
- print path
- deps = set()
- targets = set()
- for stmt in pymake.parser.parsefile(path):
- if isinstance(stmt, pymake.parserdata.Rule):
- assert isinstance(stmt.depexp, pymake.data.StringExpansion)
- assert isinstance(stmt.targetexp, pymake.data.StringExpansion)
- for d in stmt.depexp.s.split():
- deps.add(d)
- for t in stmt.targetexp.s.split():
- targets.add(t)
- phony_targets = deps - targets
- if not phony_targets:
- return
- with open(path, 'a') as f:
- f.writelines('%s:\n' % d for d in phony_targets)
-
-
-if __name__ == '__main__':
- for f in sys.argv[1:]:
- add_phony_targets(f)
deleted file mode 100644
--- a/build/unix/gnu-ld-scripts/components-mapfile
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- global:
- NSModule;
- NSGetModule;
- __RLD_MAP;
- local: *;
-};
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -202,22 +202,16 @@ endif # !GNU_CC
endif # WINNT
ifeq (arm-Darwin,$(CPU_ARCH)-$(OS_TARGET))
ifdef PROGRAM
MOZ_PROGRAM_LDFLAGS += -Wl,-rpath -Wl,@executable_path/Frameworks
endif
endif
-ifeq ($(SOLARIS_SUNPRO_CXX),1)
-ifeq (86,$(findstring 86,$(OS_TEST)))
-OS_LDFLAGS += -M $(MOZILLA_DIR)/config/solaris_ia32.map
-endif # x86
-endif # Solaris Sun Studio C++
-
ifeq ($(HOST_OS_ARCH),WINNT)
HOST_PDBFILE=$(basename $(@F)).pdb
HOST_PDB_FLAG ?= -Fd$(HOST_PDBFILE)
HOST_CFLAGS += $(HOST_PDB_FLAG)
HOST_CXXFLAGS += $(HOST_PDB_FLAG)
endif
# Don't build SIMPLE_PROGRAMS during the MOZ_PROFILE_GENERATE pass
@@ -287,24 +281,16 @@ endif
ifdef SIMPLE_PROGRAMS
GARBAGE += $(SIMPLE_PROGRAMS:%=%.$(OBJ_SUFFIX))
endif
ifdef HOST_SIMPLE_PROGRAMS
GARBAGE += $(HOST_SIMPLE_PROGRAMS:%=%.$(OBJ_SUFFIX))
endif
-#
-# the Solaris WorkShop template repository cache. it occasionally can get
-# out of sync, so targets like clobber should kill it.
-#
-ifeq ($(SOLARIS_SUNPRO_CXX),1)
-GARBAGE_DIRS += SunWS_cache
-endif
-
ifdef MOZ_UPDATE_XTERM
# Its good not to have a newline at the end of the titlebar string because it
# makes the make -s output easier to read. Echo -n does not work on all
# platforms, but we can trick printf into doing it.
ifeq (.,$(relativesrcdir))
UPDATE_TITLE = printf '\033]0;%s in %s\007' $(1) $(2) ;
else
UPDATE_TITLE = printf '\033]0;%s in %s\007' $(1) $(relativesrcdir)/$(2) ;
@@ -858,35 +844,16 @@ ifdef MOZ_PROFILE_GENERATE
touch -t `date +%Y%m%d%H%M.%S -d 'now+5seconds'` pgo.relink
endif
endif # WINNT && !GCC
chmod +x $@
ifdef ENABLE_STRIP
$(STRIP) $(STRIP_FLAGS) $@
endif
-ifeq ($(SOLARIS_SUNPRO_CC),1)
-_MDDEPFILE = $(MDDEPDIR)/$(@F).pp
-
-define MAKE_DEPS_AUTO_CC
-if test -d $(@D); then \
- echo 'Building deps for $< using Sun Studio cc'; \
- $(CC) $(COMPILE_CFLAGS) -xM $< >$(_MDDEPFILE) ; \
- $(PYTHON) $(MOZILLA_DIR)/build/unix/add_phony_targets.py $(_MDDEPFILE) ; \
-fi
-endef
-define MAKE_DEPS_AUTO_CXX
-if test -d $(@D); then \
- echo 'Building deps for $< using Sun Studio CC'; \
- $(CXX) $(COMPILE_CXXFLAGS) -xM $< >$(_MDDEPFILE) ; \
- $(PYTHON) $(MOZILLA_DIR)/build/unix/add_phony_targets.py $(_MDDEPFILE) ; \
-fi
-endef
-endif # Sun Studio on Solaris
-
# The object file is in the current directory, and the source file can be any
# relative path. This macro adds the dependency obj: src for each source file.
# This dependency must be first for the $< flag to work correctly, and the
# rules that have commands for these targets must not list any other
# prerequisites, or they will override the $< variable.
define src_objdep
$(basename $2$(notdir $1)).$(OBJ_SUFFIX): $1 $$(call mkdir_deps,$$(MDDEPDIR))
endef
@@ -916,17 +883,16 @@ src_libdep = $(call mk_libname,$1): $1 $
$(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
$(HOST_CMMOBJS):
$(REPORT_BUILD)
$(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
$(COBJS):
$(REPORT_BUILD)
- @$(MAKE_DEPS_AUTO_CC)
$(ELOG) $(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) $($(notdir $<)_FLAGS) $(TARGET_LOCAL_INCLUDES) $(_VPATH_SRCS)
# DEFINES and ACDEFINES are needed here to enable conditional compilation of Q_OBJECTs:
# 'moc' only knows about #defines it gets on the command line (-D...), not in
# included headers like mozilla-config.h
$(filter moc_%.cpp,$(CPPSRCS)): moc_%.cpp: %.h
$(REPORT_BUILD)
$(ELOG) $(MOC) $(DEFINES) $(ACDEFINES) $< $(OUTOPTION)$@
@@ -957,27 +923,24 @@ endif
$(SOBJS):
$(REPORT_BUILD)
$(AS) -o $@ $(ASFLAGS) $($(notdir $<)_FLAGS) $(LOCAL_INCLUDES) $(TARGET_LOCAL_INCLUDES) -c $<
$(CPPOBJS):
$(REPORT_BUILD)
$(call BUILDSTATUS,OBJECT_FILE $@)
- @$(MAKE_DEPS_AUTO_CXX)
$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) $(TARGET_LOCAL_INCLUDES) $(_VPATH_SRCS)
$(CMMOBJS):
$(REPORT_BUILD)
- @$(MAKE_DEPS_AUTO_CXX)
$(ELOG) $(CCC) -o $@ -c $(COMPILE_CXXFLAGS) $(COMPILE_CMMFLAGS) $($(notdir $<)_FLAGS) $(TARGET_LOCAL_INCLUDES) $(_VPATH_SRCS)
$(CMOBJS):
$(REPORT_BUILD)
- @$(MAKE_DEPS_AUTO_CC)
$(ELOG) $(CC) -o $@ -c $(COMPILE_CFLAGS) $(COMPILE_CMFLAGS) $($(notdir $<)_FLAGS) $(TARGET_LOCAL_INCLUDES) $(_VPATH_SRCS)
$(filter %.s,$(CPPSRCS:%.cpp=%.s)): %.s: %.cpp $(call mkdir_deps,$(MDDEPDIR))
$(REPORT_BUILD)
$(CCC) -S $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) $(TARGET_LOCAL_INCLUDES) $(_VPATH_SRCS)
$(filter %.s,$(CPPSRCS:%.cc=%.s)): %.s: %.cc $(call mkdir_deps,$(MDDEPDIR))
$(REPORT_BUILD)
deleted file mode 100644
--- a/config/solaris_ia32.map
+++ /dev/null
@@ -1,5 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-hwcap_1 = OVERRIDE;
--- a/db/sqlite3/src/moz.build
+++ b/db/sqlite3/src/moz.build
@@ -73,18 +73,14 @@ if CONFIG['OS_TARGET'] == 'Android':
DEFINES['SQLITE_DEFAULT_FILE_PERMISSIONS'] = '0600'
# Force using malloc_usable_size when building with jemalloc because _msize
# causes assertions on Win64. See bug 719579.
if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['MOZ_MEMORY']:
DEFINES['HAVE_MALLOC_USABLE_SIZE'] = True
DEFINES['SQLITE_WITHOUT_MSIZE'] = True
-# disable PGO for Sun Studio
-if CONFIG['SOLARIS_SUNPRO_CC']:
- NO_PGO = True
-
# Suppress warnings in third-party code.
if CONFIG['GNU_CC']:
CFLAGS += [
'-Wno-sign-compare',
'-Wno-type-limits',
]
--- a/gfx/qcms/moz.build
+++ b/gfx/qcms/moz.build
@@ -34,30 +34,16 @@ if '86' in CONFIG['OS_TEST']:
use_sse1 = True
elif 'ppc' in CONFIG['CPU_ARCH']:
if CONFIG['GNU_CC']:
use_altivec = True
if use_sse1:
SOURCES += ['transform-sse1.c']
SOURCES['transform-sse1.c'].flags += CONFIG['SSE_FLAGS']
- if CONFIG['SOLARIS_SUNPRO_CC']:
- if '64' in CONFIG['OS_TEST']:
- # Sun Studio doesn't work correctly for x86 intristics
- # with -m64 and without optimization.
- SOURCES['transform-sse1.c'].flags += ['-xO4']
- else:
- SOURCES['transform-sse1.c'].flags += ['-xarch=sse']
if use_sse2:
SOURCES += ['transform-sse2.c']
SOURCES['transform-sse2.c'].flags += CONFIG['SSE2_FLAGS']
- if CONFIG['SOLARIS_SUNPRO_CC']:
- if '64' in CONFIG['OS_TEST']:
- # Sun Studio doesn't work correctly for x86 intristics
- # with -m64 and without optimization.
- SOURCES['transform-sse2.c'].flags += ['-xO4']
- else:
- SOURCES['transform-sse2.c'].flags += ['-xarch=sse2']
if use_altivec:
SOURCES += ['transform-altivec.c']
SOURCES['transform-altivec.c'].flags += ['-maltivec']
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -687,47 +687,16 @@ DIRENT_INO=d_ino
MOZ_USER_DIR=".mozilla"
MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin -Wl,-rpath-link,${prefix}/lib"
USE_DEPENDENT_LIBS=1
_PLATFORM_DEFAULT_TOOLKIT=cairo-gtk2
-case "$HOST_OS_ARCH" in
-SunOS)
- SOLARIS_SUNPRO_CC=
- SOLARIS_SUNPRO_CXX=
- if test -z "$GNU_CC"; then
- if test "`$CC -V 2>&1 | egrep -c 'Sun.*C '`" != "0"; then
- SOLARIS_SUNPRO_CC=1
- fi
- fi
-
- if test -z "$GNU_CXX"; then
- if test "`$CXX -V 2>&1 | egrep -c 'Sun.*C\+\+ '`" != "0"; then
- SOLARIS_SUNPRO_CXX=1
- fi
- fi
- AC_SUBST(SOLARIS_SUNPRO_CC)
- AC_SUBST(SOLARIS_SUNPRO_CXX)
- ;;
-esac
-
-case "$OS_ARCH" in
-AIX)
- if test -z "$GNU_CC"; then
- if test "`$CC -qversion 2>&1 | egrep -c 'IBM XL'`" != "0"; then
- AIX_IBM_XLC=1
- fi
- fi
- ;;
-esac
-
-
dnl Configure platform-specific CPU architecture compiler options.
dnl ==============================================================
MOZ_ARCH_OPTS
dnl =================================================================
dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
dnl which is bad when cross compiling.
dnl =================================================================
@@ -910,25 +879,16 @@ if test "$GNU_CC"; then
AC_MSG_RESULT([no])
LDFLAGS=$_SAVE_LDFLAGS)
MOZ_SET_WARNINGS_CFLAGS
_DEFINES_CFLAGS='-include $(topobjdir)/js/src/js-confdefs.h -DMOZILLA_CLIENT'
_USE_CPP_INCLUDE_FLAG=1
-elif test "$SOLARIS_SUNPRO_CC"; then
- DSO_CFLAGS=''
- if test "$CPU_ARCH" = "sparc"; then
- # for Sun Studio on Solaris/SPARC
- DSO_PIC_CFLAGS='-xcode=pic32'
- else
- DSO_PIC_CFLAGS='-KPIC'
- fi
- _DEFINES_CFLAGS='$(ACDEFINES) -D_JS_CONFDEFS_H_ -DMOZILLA_CLIENT'
else
MKSHLIB='$(LD) $(DSO_LDOPTS) -h $(DSO_SONAME) -o $@'
MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $(DSO_SONAME) -o $@'
DSO_LDOPTS='-shared'
if test "$GNU_LD"; then
# Don't allow undefined symbols in libraries
DSO_LDOPTS="$DSO_LDOPTS -z defs"
@@ -1026,71 +986,16 @@ esac
MOZ_DOING_LTO(lto_is_enabled)
dnl ========================================================
dnl System overrides of the defaults for target
dnl ========================================================
case "$target" in
-*-aix*)
- AC_DEFINE(AIX)
- if test ! "$GNU_CC"; then
- if test ! "$HAVE_64BIT_BUILD"; then
- # Compiling with Visual Age C++ object model compat is the
- # default. To compile with object model ibm, add
- # AIX_OBJMODEL=ibm to .mozconfig.
- if test "$AIX_OBJMODEL" = "ibm"; then
- CXXFLAGS="$CXXFLAGS -qobjmodel=ibm"
- else
- AIX_OBJMODEL=compat
- fi
- else
- AIX_OBJMODEL=compat
- fi
- AC_SUBST(AIX_OBJMODEL)
- DSO_LDOPTS='-qmkshrobj=1'
- DSO_CFLAGS='-qflag=w:w'
- DSO_PIC_CFLAGS=
- LDFLAGS="$LDFLAGS -Wl,-brtl -blibpath:/usr/lib:/lib"
- MOZ_FIX_LINK_PATHS=
- MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
- MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- if test "$COMPILE_ENVIRONMENT"; then
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_MSG_CHECKING([for IBM XLC/C++ compiler version >= 9.0.0.7])
- AC_TRY_COMPILE([],
- [#if (__IBMCPP__ < 900)
- #error "Bad compiler"
- #endif],
- _BAD_COMPILER=,_BAD_COMPILER=1)
- if test -n "$_BAD_COMPILER"; then
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([IBM XLC/C++ 9.0.0.7 or higher is required to build.])
- else
- AC_MSG_RESULT([yes])
- fi
- AC_LANG_RESTORE
- TARGET_COMPILER_ABI="ibmc"
- CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'`
- CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'`
- fi
- fi
- case "${target_os}" in
- aix4.1*)
- DLL_SUFFIX='_shr.a'
- ;;
- esac
- if test "$COMPILE_ENVIRONMENT"; then
- MOZ_CHECK_HEADERS(sys/inttypes.h)
- fi
- AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
- ;;
-
*-darwin*)
AC_DEFINE(XP_DARWIN)
MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
MOZ_OPTIMIZE_FLAGS="-O3 -fno-stack-protector"
CFLAGS="$CFLAGS -fno-common"
CXXFLAGS="$CXXFLAGS -fno-common"
DLL_SUFFIX=".dylib"
@@ -1132,53 +1037,16 @@ case "$target" in
AC_MSG_RESULT([no])
fi
LDFLAGS=$_SAVE_LDFLAGS
fi
MOZ_FIX_LINK_PATHS="-Wl,-executable_path,${DIST}/bin"
;;
-ia64*-hpux*)
- DLL_SUFFIX=".so"
- if test ! "$GNU_CC"; then
- DSO_LDOPTS='-b'
- DSO_CFLAGS=""
- DSO_PIC_CFLAGS=
- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@'
- CXXFLAGS="$CXXFLAGS -Wc,-ansi_for_scope,on"
- else
- DSO_LDOPTS='-b -E'
- MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
- MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
- fi
- MOZ_FIX_LINK_PATHS=
- AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
- AC_DEFINE(_LARGEFILE64_SOURCE)
- ;;
-
-*-hpux*)
- DLL_SUFFIX=".sl"
- if test ! "$GNU_CC"; then
- DSO_LDOPTS='-b -Wl,+s'
- DSO_CFLAGS=""
- DSO_PIC_CFLAGS="+Z"
- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -L$(DIST)/bin -o $@'
- MKCSHLIB='$(LD) -b +s -L$(DIST)/bin -o $@'
- CXXFLAGS="$CXXFLAGS -Wc,-ansi_for_scope,on"
- else
- DSO_LDOPTS='-b -E +s'
- MKSHLIB='$(LD) $(DSO_LDOPTS) -L$(DIST)/bin -L$(DIST)/lib -o $@'
- MKCSHLIB='$(LD) $(DSO_LDOPTS) -L$(DIST)/bin -L$(DIST)/lib -o $@'
- fi
- MOZ_POST_PROGRAM_COMMAND='chatr +s enable'
- AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
- ;;
-
*-android*|*-linuxandroid*)
AC_DEFINE(NO_PW_GECOS)
no_x=yes
_PLATFORM_DEFAULT_TOOLKIT=cairo-android
MOZ_GFX_OPTIMIZE_MOBILE=1
MOZ_OPTIMIZE_FLAGS="-O3 -fno-reorder-functions"
if test -z "$CLANG_CC"; then
@@ -1475,129 +1343,29 @@ ia64*-hpux*)
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
if test "$LIBRUNPATH"; then
DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
fi
;;
-*-solaris*)
- AC_DEFINE(SOLARIS)
- if test -z "$CROSS_COMPILE" && pkginfo -q SUNWpr && pkginfo -q SUNWprd; then
- NO_NSPR_CONFIG_SYSTEM_LDFLAGS="-L/usr/lib/mps -R/usr/lib/mps -lnspr4"
- NO_NSPR_CONFIG_SYSTEM_CFLAGS="-I/usr/include/mps"
- NO_NSPR_CONFIG_SYSTEM_VERSION=["`pkgparam SUNWpr SUNW_PRODVERS | sed -e 's/^[1-9][0-9]*\.[0-9][0-9]*$/&.0/'`"]
- fi
- MOZ_FIX_LINK_PATHS=
- # $ORIGIN/.. is for shared libraries under components/ to locate shared
- # libraries one level up (e.g. libnspr4.so)
- if test "$SOLARIS_SUNPRO_CC"; then
- LDFLAGS="$LDFLAGS -z ignore -R '\$\$ORIGIN:\$\$ORIGIN/..' -z lazyload -z combreloc -z muldefs"
- LIBS="-lCrun -lCstd -lc $LIBS"
- AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
- CFLAGS="$CFLAGS -xlibmieee -xstrconst -xbuiltin=%all -D__FUNCTION__=__func__"
- CXXFLAGS="$CXXFLAGS -xlibmieee -xbuiltin=%all -features=tmplife,tmplrefstatic,extensions,no%except -norunpath -D__FUNCTION__=__func__ -template=no%extdef"
- LDFLAGS="-xildoff $LDFLAGS"
- if test -z "$CROSS_COMPILE" -a -f /usr/lib/ld/map.noexstk; then
- _SAVE_LDFLAGS=$LDFLAGS
- LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS"
- AC_TRY_LINK([#include <stdio.h>],
- [printf("Hello World\n");],
- ,
- [LDFLAGS=$_SAVE_LDFLAGS])
- fi
- MOZ_OPTIMIZE_FLAGS="-xO4"
- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $(DSO_SONAME) -o $@'
- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $(DSO_SONAME) -o $@'
- DSO_LDOPTS='-G'
- AR_LIST="$AR t"
- AR_EXTRACT="$AR x"
- AR_DELETE="$AR d"
- AR='$(CXX) -xar'
- AR_FLAGS='-o $@'
- AS='/usr/ccs/bin/as'
- ASFLAGS="$ASFLAGS -K PIC -L -P -D_ASM -D__STDC__=0"
- AS_DASH_C_FLAG=''
- TARGET_COMPILER_ABI="sunc"
- CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
- CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
- AC_MSG_CHECKING([for Sun C++ compiler version >= 5.9])
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_TRY_COMPILE([],
- [#if (__SUNPRO_CC < 0x590)
- #error "Denied"
- #endif],
- _BAD_COMPILER=,_BAD_COMPILER=1)
- if test -n "$_BAD_COMPILER"; then
- _res="no"
- AC_MSG_ERROR([Sun C++ 5.9 (Sun Studio 12) or higher is required to build. Your compiler version is $CXX_VERSION .])
- else
- _res="yes"
- fi
- AC_TRY_COMPILE([],
- [#if (__SUNPRO_CC >= 0x5100)
- #error "Sun C++ 5.10 or above"
- #endif],
- _ABOVE_SS12U1=,_ABOVE_SS12U1=1)
- if test "$_ABOVE_SS12U1"; then
- # disable xannotate
- CXXFLAGS="$CXXFLAGS -xannotate=no"
- fi
- AC_MSG_RESULT([$_res])
- AC_LANG_RESTORE
- else
- LDFLAGS="$LDFLAGS -Wl,-z,ignore -Wl,-R,'\$\$ORIGIN:\$\$ORIGIN/..' -Wl,-z,lazyload -Wl,-z,combreloc -Wl,-z,muldefs"
- LIBS="-lc $LIBS"
- ASFLAGS="$ASFLAGS -fPIC"
- DSO_LDOPTS='-shared'
- WARNINGS_AS_ERRORS='-Werror'
- _WARNINGS_CFLAGS=''
- _WARNINGS_CXXFLAGS=''
- fi
- ;;
-
-*-sunos*)
- DSO_LDOPTS='-Bdynamic'
- MKSHLIB='-$(LD) $(DSO_LDOPTS) -o $@'
- MKCSHLIB='-$(LD) $(DSO_LDOPTS) -o $@'
- AC_DEFINE(SUNOS4)
- AC_DEFINE(SPRINTF_RETURNS_STRING)
- case "$(target_os)" in
- sunos4.1*)
- DLL_SUFFIX='.so.1.0'
- ;;
- esac
- ;;
-
esac
dnl Only one oddball right now (QNX), but this gives us flexibility
dnl if any other platforms need to override this in the future.
AC_DEFINE_UNQUOTED(D_INO,$DIRENT_INO)
dnl ========================================================
dnl = Flags to strip unused symbols from .so components
dnl ========================================================
case "$target" in
*-linux*|*-kfreebsd*-gnu|*-gnu*)
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
;;
- *-solaris*)
- if test -z "$GNU_CC"; then
- MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-M $(BUILD_TOOLS)/gnu-ld-scripts/components-mapfile'
- else
- if test -z "$GCC_USE_GNU_LD"; then
- MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,-M -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-mapfile'
- else
- MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
- fi
- fi
- ;;
*-darwin*)
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,-exported_symbols_list -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-export-list'
;;
*-mingw*)
if test -n "$GNU_CC"; then
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
fi
;;
@@ -1714,21 +1482,16 @@ if test "$GNU_CC" -a "$OS_TARGET" != WIN
VISIBILITY_FLAGS="-I${DIST}/system_wrappers -include ${_topsrcdir}/config/gcc_hidden.h"
;;
esac
WRAP_SYSTEM_INCLUDES=1
;;
esac
fi # GNU_CC
-# visibility hidden flag for Sun Studio on Solaris
-if test "$SOLARIS_SUNPRO_CC"; then
-VISIBILITY_FLAGS='-xldscope=hidden'
-fi # Sun Studio on Solaris
-
case "${OS_TARGET}" in
WINNT|Darwin|Android)
;;
*)
STL_FLAGS="-I${DIST}/stl_wrappers"
WRAP_STL_INCLUDES=1
;;
esac
@@ -1762,35 +1525,23 @@ if test "x$enable_dtrace" = "xyes"; then
if test -n "$HAVE_DTRACE"; then
AC_DEFINE(INCLUDE_MOZILLA_DTRACE)
else
AC_MSG_ERROR([dtrace enabled but sys/sdt.h not found]);
fi
fi
AC_SUBST(HAVE_DTRACE)
-case $target in
-*-aix4.3*|*-aix5*)
- ;;
-*)
- MOZ_CHECK_HEADERS(sys/cdefs.h)
- ;;
-esac
+MOZ_CHECK_HEADERS(sys/cdefs.h)
MOZ_LINUX_PERF_EVENT
dnl Checks for libraries.
dnl ========================================================
-case $target in
-*-hpux11.*)
- ;;
-*)
- AC_CHECK_LIB(c_r, gethostbyname_r)
- ;;
-esac
+AC_CHECK_LIB(c_r, gethostbyname_r)
dnl We don't want to link with libdl even if it's present on OS X, since
dnl it's not used and not part of the default installation. OS/2 has dlfcn
dnl in libc.
dnl We don't want to link against libm or libpthread on Darwin since
dnl they both are just symlinks to libSystem and explicitly linking
dnl against libSystem causes issues when debugging (see bug 299601).
case $target in
@@ -1799,25 +1550,17 @@ case $target in
*)
AC_SEARCH_LIBS(dlopen, dl,
MOZ_CHECK_HEADER(dlfcn.h,
AC_DEFINE(HAVE_DLOPEN)))
;;
esac
if test ! "$GNU_CXX"; then
-
- case $target in
- *-aix*)
- AC_CHECK_LIB(C_r, demangle)
- ;;
- *)
- AC_CHECK_LIB(C, demangle)
- ;;
- esac
+ AC_CHECK_LIB(C, demangle)
fi
AC_CHECK_LIB(socket, socket)
dnl ========================================================
dnl = pthread support
dnl = Start by checking whether the system support pthreads
dnl ========================================================
@@ -1920,31 +1663,16 @@ then
_PTHREAD_LDFLAGS="-pthread"
fi
;;
*-*-linux*|*-*-kfreebsd*-gnu|*-*-gnu*)
AC_DEFINE(_REENTRANT)
;;
- *-aix4.3*|*-aix5*)
- AC_DEFINE(_REENTRANT)
- ;;
-
- *-hpux11.*)
- AC_DEFINE(_REENTRANT)
- ;;
-
- *-*-solaris*)
- AC_DEFINE(_REENTRANT)
- if test "$SOLARIS_SUNPRO_CC"; then
- CFLAGS="$CFLAGS -mt"
- CXXFLAGS="$CXXFLAGS -mt"
- fi
- ;;
esac
LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}"
fi
dnl Checks for library functions.
dnl ========================================================
AC_PROG_GCC_TRADITIONAL
@@ -2502,19 +2230,16 @@ if test "$MOZ_MEMORY"; then
AC_DEFINE(MOZ_MEMORY_ANDROID)
;;
*-*linux*)
AC_DEFINE(MOZ_MEMORY_LINUX)
;;
*-netbsd*)
AC_DEFINE(MOZ_MEMORY_BSD)
;;
- *-solaris*)
- AC_DEFINE(MOZ_MEMORY_SOLARIS)
- ;;
*-mingw*)
AC_DEFINE(MOZ_MEMORY_WINDOWS)
;;
*)
AC_MSG_ERROR([--enable-jemalloc not supported on ${target}])
;;
esac
fi
@@ -2939,24 +2664,16 @@ CFLAGS="$_SAVE_CFLAGS"
if test -n "$INTEL_CC"; then
PROFILE_GEN_CFLAGS="-prof-gen -prof-dir ."
PROFILE_GEN_LDFLAGS=
PROFILE_USE_CFLAGS="-prof-use -prof-dir ."
PROFILE_USE_LDFLAGS=
fi
-dnl Sun Studio on Solaris
-if test "$SOLARIS_SUNPRO_CC"; then
- PROFILE_GEN_CFLAGS="-xprofile=collect:$_objdir/$enable_application"
- PROFILE_GEN_LDFLAGS="-xprofile=collect:$_objdir/$enable_application"
- PROFILE_USE_CFLAGS="-xprofile=use:$_objdir/$enable_application"
- PROFILE_USE_LDFLAGS="-xprofile=use:$_objdir/$enable_application"
-fi
-
AC_SUBST(PROFILE_GEN_CFLAGS)
AC_SUBST(PROFILE_GEN_LDFLAGS)
AC_SUBST(PROFILE_USE_CFLAGS)
AC_SUBST(PROFILE_USE_LDFLAGS)
AC_LANG_CPLUSPLUS
dnl ========================================================
@@ -2982,19 +2699,16 @@ dnl ====================================
dnl =
dnl = Build depencency options
dnl =
dnl ========================================================
MOZ_ARG_HEADER(Build dependencies)
if test "$GNU_CC" -a "$GNU_CXX"; then
_DEPEND_CFLAGS='-MD -MP -MF $(MDDEPDIR)/$(@F).pp'
-dnl Sun Studio on Solaris use -xM instead of -MD, see config/rules.mk
-elif test "$SOLARIS_SUNPRO_CC"; then
- _DEPEND_CFLAGS=
else
dnl Don't override this for MSVC
if test -z "$_WIN32_MSVC"; then
_USE_CPP_INCLUDE_FLAG=
_DEFINES_CFLAGS='$(ACDEFINES) -D_JS_CONFDEFS_H_ -DMOZILLA_CLIENT'
_DEFINES_CXXFLAGS='$(ACDEFINES) -D_JS_CONFDEFS_H_ -DMOZILLA_CLIENT'
else
echo '#include <stdio.h>' > dummy-hello.c
--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -15,20 +15,8 @@ ifdef VPX_AS_CONVERSION
GENERATED_DIRS += $(dir $(ASFILES))
%.asm.$(ASM_SUFFIX): %.asm $(ASM_OFFSETS)
$(VPX_AS_CONVERSION) < $< > $@
endif
endif
-
-include $(topsrcdir)/config/rules.mk
-
-# Workaround a bug of Sun Studio (CR 6963410)
-ifdef SOLARIS_SUNPRO_CC
-ifeq (86,$(findstring 86,$(OS_TEST)))
-filter.o: filter.c Makefile.in
- $(REPORT_BUILD)
- @$(MAKE_DEPS_AUTO_CC)
- $(CC) -o $@ -c $(patsubst -xO[45],-xO3,$(COMPILE_CFLAGS)) $<
-endif
-endif
--- a/old-configure.in
+++ b/old-configure.in
@@ -890,36 +890,16 @@ MOZ_USER_DIR=".mozilla"
MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin -Wl,-rpath-link,${prefix}/lib"
MOZ_FS_LAYOUT=unix
USE_DEPENDENT_LIBS=1
_PLATFORM_DEFAULT_TOOLKIT=cairo-gtk3
-case "$HOST_OS_ARCH" in
-SunOS)
- SOLARIS_SUNPRO_CC=
- SOLARIS_SUNPRO_CXX=
- if test -z "$GNU_CC"; then
- if test "`$CC -V 2>&1 | egrep -c 'Sun.*C '`" != "0"; then
- SOLARIS_SUNPRO_CC=1
- fi
- fi
-
- if test -z "$GNU_CXX"; then
- if test "`$CXX -V 2>&1 | egrep -c 'Sun.*C\+\+ '`" != "0"; then
- SOLARIS_SUNPRO_CXX=1
- fi
- fi
- AC_SUBST(SOLARIS_SUNPRO_CC)
- AC_SUBST(SOLARIS_SUNPRO_CXX)
- ;;
-esac
-
dnl Configure platform-specific CPU architecture compiler options.
dnl ==============================================================
if test "$COMPILE_ENVIRONMENT"; then
MOZ_ARCH_OPTS
else
if test "$OS_TARGET" = Android -a x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then
dnl Default Android builds to ARMv7.
MOZ_ARCH=armv7-a
@@ -1185,25 +1165,16 @@ if test "$GNU_CC"; then
MOZ_SET_WARNINGS_CFLAGS
_DEFINES_CFLAGS='-include $(topobjdir)/mozilla-config.h -DMOZILLA_CLIENT'
_USE_CPP_INCLUDE_FLAG=1
ASFLAGS="$ASFLAGS $_DEFINES_CFLAGS"
-elif test "$SOLARIS_SUNPRO_CC"; then
- DSO_CFLAGS=''
- if test "$CPU_ARCH" = "sparc"; then
- # for Sun Studio on Solaris/SPARC
- DSO_PIC_CFLAGS='-xcode=pic32'
- else
- DSO_PIC_CFLAGS='-KPIC'
- fi
- _DEFINES_CFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
else
MKSHLIB='$(LD) $(DSO_LDOPTS) -h $(DSO_SONAME) -o $@'
MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $(DSO_SONAME) -o $@'
DSO_LDOPTS='-shared'
if test "$GNU_LD"; then
# Don't allow undefined symbols in libraries
DSO_LDOPTS="$DSO_LDOPTS -z defs"
@@ -1535,71 +1506,16 @@ AC_SUBST(MOZILLA_SYMBOLVERSION)
MOZ_DOING_LTO(lto_is_enabled)
dnl ========================================================
dnl System overrides of the defaults for target
dnl ========================================================
case "$target" in
-*-aix*)
- AC_DEFINE(AIX)
- if test ! "$GNU_CC"; then
- if test ! "$HAVE_64BIT_BUILD"; then
- # Compiling with Visual Age C++ object model compat is the
- # default. To compile with object model ibm, add
- # AIX_OBJMODEL=ibm to .mozconfig.
- if test "$AIX_OBJMODEL" = "ibm"; then
- CXXFLAGS="$CXXFLAGS -qobjmodel=ibm"
- else
- AIX_OBJMODEL=compat
- fi
- else
- AIX_OBJMODEL=compat
- fi
- AC_SUBST(AIX_OBJMODEL)
- DSO_LDOPTS='-qmkshrobj=1'
- DSO_CFLAGS='-qflag=w:w'
- DSO_PIC_CFLAGS=
- LDFLAGS="$LDFLAGS -Wl,-brtl -blibpath:/usr/lib:/lib"
- MOZ_FIX_LINK_PATHS=
- MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
- MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- if test "$COMPILE_ENVIRONMENT"; then
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_MSG_CHECKING([for IBM XLC/C++ compiler version >= 9.0.0.7])
- AC_TRY_COMPILE([],
- [#if (__IBMCPP__ < 900)
- #error "Bad compiler"
- #endif],
- _BAD_COMPILER=,_BAD_COMPILER=1)
- if test -n "$_BAD_COMPILER"; then
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([IBM XLC/C++ 9.0.0.7 or higher is required to build.])
- else
- AC_MSG_RESULT([yes])
- fi
- AC_LANG_RESTORE
- TARGET_COMPILER_ABI="ibmc"
- CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'`
- CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'`
- fi # COMPILE_ENVIRONMENT
- fi
- case "${target_os}" in
- aix4.1*)
- DLL_SUFFIX='_shr.a'
- ;;
- esac
- if test "$COMPILE_ENVIRONMENT"; then
- MOZ_CHECK_HEADERS(sys/inttypes.h)
- fi # COMPILE_ENVIRONMENT
- AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
- ;;
-
*-darwin*)
MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
MOZ_OPTIMIZE_FLAGS="-O3"
# Statically disable jemalloc on 10.5 and 32-bit 10.6. See bug 702250.
if test "$HAVE_64BIT_BUILD"; then
MOZ_MEMORY=1
fi
@@ -1669,53 +1585,16 @@ case "$target" in
else
AC_MSG_RESULT([no])
fi
LDFLAGS=$_SAVE_LDFLAGS
MOZ_FIX_LINK_PATHS="-Wl,-executable_path,${DIST}/bin"
;;
-ia64*-hpux*)
- DLL_SUFFIX=".so"
- if test ! "$GNU_CC"; then
- DSO_LDOPTS='-b'
- DSO_CFLAGS=""
- DSO_PIC_CFLAGS=
- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@'
- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@'
- CXXFLAGS="$CXXFLAGS -Wc,-ansi_for_scope,on"
- else
- DSO_LDOPTS='-b -E'
- MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
- MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
- fi
- MOZ_FIX_LINK_PATHS=
- AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
- AC_DEFINE(_LARGEFILE64_SOURCE)
- ;;
-
-*-hpux*)
- DLL_SUFFIX=".sl"
- if test ! "$GNU_CC"; then
- DSO_LDOPTS='-b -Wl,+s'
- DSO_CFLAGS=""
- DSO_PIC_CFLAGS="+Z"
- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -L$(DIST)/bin -o $@'
- MKCSHLIB='$(LD) -b +s -L$(DIST)/bin -o $@'
- CXXFLAGS="$CXXFLAGS -Wc,-ansi_for_scope,on"
- else
- DSO_LDOPTS='-b -E +s'
- MKSHLIB='$(LD) $(DSO_LDOPTS) -L$(DIST)/bin -L$(DIST)/lib -o $@'
- MKCSHLIB='$(LD) $(DSO_LDOPTS) -L$(DIST)/bin -L$(DIST)/lib -o $@'
- fi
- MOZ_POST_PROGRAM_COMMAND='chatr +s enable'
- AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
- ;;
-
*-android*|*-linuxandroid*)
AC_DEFINE(NO_PW_GECOS)
no_x=yes
if test -n "$gonkdir"; then
_PLATFORM_DEFAULT_TOOLKIT=cairo-gonk
_PLATFORM_HAVE_RIL=1
MOZ_B2G_FM=1
MOZ_SYNTH_PICO=1
@@ -2077,103 +1956,16 @@ ia64*-hpux*)
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
if test "$LIBRUNPATH"; then
DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
fi
;;
-*-solaris*)
- AC_DEFINE(SOLARIS)
- MOZ_FIX_LINK_PATHS=
- # $ORIGIN/.. is for shared libraries under components/ to locate shared
- # libraries one level up (e.g. libnspr4.so)
- if test "$SOLARIS_SUNPRO_CC"; then
- LDFLAGS="$LDFLAGS -z ignore -R '\$\$ORIGIN:\$\$ORIGIN/..' -z lazyload -z combreloc -z muldefs"
- LIBS="-lCrun -lCstd -lc $LIBS"
- AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
- CFLAGS="$CFLAGS -xlibmieee -xstrconst -xbuiltin=%all -D__FUNCTION__=__func__"
- CXXFLAGS="$CXXFLAGS -xlibmieee -xbuiltin=%all -features=tmplife,tmplrefstatic,extensions,no%except -norunpath -D__FUNCTION__=__func__ -template=no%extdef"
- LDFLAGS="-xildoff $LDFLAGS"
- MMX_FLAGS="-xarch=mmx -xO4"
- SSE_FLAGS="-xarch=sse"
- SSE2_FLAGS="-xarch=ssei2 -xO4"
- if test -z "$CROSS_COMPILE" -a -f /usr/lib/ld/map.noexstk; then
- _SAVE_LDFLAGS=$LDFLAGS
- LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS"
- AC_TRY_LINK([#include <stdio.h>],
- [printf("Hello World\n");],
- ,
- [LDFLAGS=$_SAVE_LDFLAGS])
- fi
- MOZ_OPTIMIZE_FLAGS="-xO4"
- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $(DSO_SONAME) -o $@'
- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $(DSO_SONAME) -o $@'
- DSO_LDOPTS='-G'
- AR_LIST="$AR t"
- AR_EXTRACT="$AR x"
- AR_DELETE="$AR d"
- AR='$(CXX) -xar'
- AR_FLAGS='-o $@'
- AS='/usr/ccs/bin/as'
- ASFLAGS="$ASFLAGS -K PIC -L -P -D_ASM -D__STDC__=0"
- AS_DASH_C_FLAG=''
- TARGET_COMPILER_ABI="sunc"
- CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
- CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
- AC_MSG_CHECKING([for Sun C++ compiler version >= 5.9])
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_TRY_COMPILE([],
- [#if (__SUNPRO_CC < 0x590)
- #error "Denied"
- #endif],
- _BAD_COMPILER=,_BAD_COMPILER=1)
- if test -n "$_BAD_COMPILER"; then
- _res="no"
- AC_MSG_ERROR([Sun C++ 5.9 (Sun Studio 12) or higher is required to build. Your compiler version is $CXX_VERSION .])
- else
- _res="yes"
- fi
- AC_TRY_COMPILE([],
- [#if (__SUNPRO_CC >= 0x5100)
- #error "Sun C++ 5.10 or above"
- #endif],
- _ABOVE_SS12U1=,_ABOVE_SS12U1=1)
- if test "$_ABOVE_SS12U1"; then
- # disable xannotate
- CXXFLAGS="$CXXFLAGS -xannotate=no"
- fi
- AC_MSG_RESULT([$_res])
- AC_LANG_RESTORE
- else
- LDFLAGS="$LDFLAGS -Wl,-z,ignore -Wl,-R,'\$\$ORIGIN:\$\$ORIGIN/..' -Wl,-z,lazyload -Wl,-z,combreloc -Wl,-z,muldefs"
- LIBS="-lc $LIBS"
- ASFLAGS="$ASFLAGS -fPIC"
- DSO_LDOPTS='-shared'
- WARNINGS_AS_ERRORS='-Werror'
- _WARNINGS_CFLAGS=''
- _WARNINGS_CXXFLAGS=''
- fi
- ;;
-
-*-sunos*)
- DSO_LDOPTS='-Bdynamic'
- MKSHLIB='-$(LD) $(DSO_LDOPTS) -o $@'
- MKCSHLIB='-$(LD) $(DSO_LDOPTS) -o $@'
- AC_DEFINE(SUNOS4)
- AC_DEFINE(SPRINTF_RETURNS_STRING)
- case "$(target_os)" in
- sunos4.1*)
- DLL_SUFFIX='.so.1.0'
- ;;
- esac
- ;;
-
esac
AC_SUBST_LIST(MMX_FLAGS)
AC_SUBST_LIST(SSE_FLAGS)
AC_SUBST_LIST(SSE2_FLAGS)
case "$target" in
*-*linux*)
@@ -2194,27 +1986,16 @@ AC_DEFINE_UNQUOTED(D_INO,$DIRENT_INO)
dnl ========================================================
dnl = Flags to strip unused symbols from .so components and
dnl = to export jemalloc symbols when linking a program
dnl ========================================================
case "$target" in
*-linux*|*-kfreebsd*-gnu|*-gnu*)
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
;;
- *-solaris*)
- if test -z "$GNU_CC"; then
- MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-M $(BUILD_TOOLS)/gnu-ld-scripts/components-mapfile'
- else
- if test -z "$GCC_USE_GNU_LD"; then
- MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,-M -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-mapfile'
- else
- MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
- fi
- fi
- ;;
*-darwin*)
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,-exported_symbols_list -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-export-list'
;;
*-mingw*)
if test -n "$GNU_CC"; then
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
fi
;;
@@ -2258,21 +2039,16 @@ if test "$GNU_CC" -a "$OS_TARGET" != WIN
;;
*)
VISIBILITY_FLAGS="-I${DIST}/system_wrappers -include ${_topsrcdir}/config/gcc_hidden.h"
WRAP_SYSTEM_INCLUDES=1
;;
esac
fi # GNU_CC
-# visibility hidden flag for Sun Studio on Solaris
-if test "$SOLARIS_SUNPRO_CC"; then
-VISIBILITY_FLAGS='-xldscope=hidden'
-fi # Sun Studio on Solaris
-
case "${OS_TARGET}" in
WINNT|Darwin|Android)
;;
*)
STL_FLAGS="-I${DIST}/stl_wrappers"
WRAP_STL_INCLUDES=1
;;
esac
@@ -2364,23 +2140,17 @@ if test "x$enable_dtrace" = "xyes"; then
fi
fi
AC_SUBST(HAVE_DTRACE)
MOZ_LINUX_PERF_EVENT
dnl Checks for libraries.
dnl ========================================================
-case $target in
-*-hpux11.*)
- ;;
-*)
- AC_CHECK_LIB(c_r, gethostbyname_r)
- ;;
-esac
+AC_CHECK_LIB(c_r, gethostbyname_r)
dnl We don't want to link with libdl even if it's present on OS X, since
dnl it's not used and not part of the default installation. OS/2 has dlfcn
dnl in libc.
dnl We don't want to link against libm or libpthread on Darwin since
dnl they both are just symlinks to libSystem and explicitly linking
dnl against libSystem causes issues when debugging (see bug 299601).
case $target in
@@ -2394,25 +2164,17 @@ case $target in
esac
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -D_GNU_SOURCE"
AC_CHECK_FUNCS(dladdr memmem)
CFLAGS="$_SAVE_CFLAGS"
if test ! "$GNU_CXX"; then
-
- case $target in
- *-aix*)
- AC_CHECK_LIB(C_r, demangle)
- ;;
- *)
- AC_CHECK_LIB(C, demangle)
- ;;
- esac
+ AC_CHECK_LIB(C, demangle)
fi
AC_CHECK_LIB(socket, socket)
XLDFLAGS="$X_LIBS"
XLIBS="$X_EXTRA_LIBS"
dnl ========================================================
@@ -2435,24 +2197,16 @@ else
AC_CHECK_LIB(Xt, XtFree, [ XT_LIBS="-lXt"], [
unset ac_cv_lib_Xt_XtFree
AC_CHECK_LIB(ICE, IceFlush, [XT_LIBS="-lICE $XT_LIBS"],, $XT_LIBS $XLIBS)
AC_CHECK_LIB(SM, SmcCloseConnection, [XT_LIBS="-lSM $XT_LIBS"],, $XT_LIBS $XLIBS)
AC_CHECK_LIB(Xt, XtFree, [ XT_LIBS="-lXt $XT_LIBS"],
[MISSING_X="$MISSING_X -lXt"], $X_PRE_LIBS $XT_LIBS $XLIBS)
])
- # AIX needs the motif library linked before libXt to prevent
- # crashes in plugins linked against Motif - Bug #98892
- case "${target_os}" in
- aix*)
- XT_LIBS="-lXm $XT_LIBS"
- ;;
- esac
-
dnl ========================================================
dnl = Check for XShm
dnl ========================================================
AC_CHECK_LIB(Xext, XShmCreateImage, _HAVE_XSHM_XEXT=1,,
$XLIBS $XEXT_LIBS)
dnl ========================================================
dnl = Check for Xss
@@ -2575,31 +2329,16 @@ then
_PTHREAD_LDFLAGS="-pthread"
fi
;;
*-*-linux*|*-*-kfreebsd*-gnu|*-*-gnu*)
AC_DEFINE(_REENTRANT)
;;
- *-aix4.3*|*-aix5*)
- AC_DEFINE(_REENTRANT)
- ;;
-
- *-hpux11.*)
- AC_DEFINE(_REENTRANT)
- ;;
-
- *-*-solaris*)
- AC_DEFINE(_REENTRANT)
- if test "$SOLARIS_SUNPRO_CC"; then
- CFLAGS="$CFLAGS -mt"
- CXXFLAGS="$CXXFLAGS -mt"
- fi
- ;;
esac
LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}"
AC_SUBST(MOZ_USE_PTHREADS)
MOZ_CHECK_HEADERS(pthread.h)
fi
dnl Checks for library functions.
@@ -5622,19 +5361,16 @@ i?86-apple-darwin*|x86_64-apple-darwin*)
i?86-*-linux*|x86_64-*-linux*|arm-*-linux*)
if test "$MOZ_ENABLE_GTK"; then
MOZ_CRASHREPORTER=1
fi
;;
*-android*|*-linuxandroid*)
MOZ_CRASHREPORTER=1
;;
-*solaris*)
- MOZ_CRASHREPORTER=1
- ;;
esac
MOZ_ARG_DISABLE_BOOL(crashreporter,
[ --disable-crashreporter Disable breakpad crash reporting],
[MOZ_CRASHREPORTER=],
[MOZ_CRASHREPORTER=F # Force enable breakpad])
if test "$OS_ARCH" != "$HOST_OS_ARCH" -a "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "Darwin"; then
@@ -5642,17 +5378,17 @@ if test "$OS_ARCH" != "$HOST_OS_ARCH" -a
AC_MSG_ERROR([Cannot --enable-crashreporter, as breakpad tools do not support compiling on $HOST_OS_ARCH while targeting $OS_ARCH.])
fi
MOZ_CRASHREPORTER=
fi
if test -n "$MOZ_CRASHREPORTER"; then
AC_DEFINE(MOZ_CRASHREPORTER)
- if test "$OS_TARGET" = "Linux" -o "$OS_ARCH" = "SunOS" && \
+ if test "$OS_TARGET" = "Linux" && \
test -z "$SKIP_LIBRARY_CHECKS"; then
PKG_CHECK_MODULES(MOZ_GTHREAD, gthread-2.0)
fi
if test "$OS_ARCH" = "WINNT"; then
if test -z "$HAVE_64BIT_BUILD"; then
MOZ_CRASHREPORTER_INJECTOR=1
AC_DEFINE(MOZ_CRASHREPORTER_INJECTOR)
@@ -6810,19 +6546,16 @@ else
fi
;;
*-*linux*)
AC_DEFINE(MOZ_MEMORY_LINUX)
;;
*-netbsd*)
AC_DEFINE(MOZ_MEMORY_BSD)
;;
- *-solaris*)
- AC_DEFINE(MOZ_MEMORY_SOLARIS)
- ;;
*-mingw*)
AC_DEFINE(MOZ_MEMORY_WINDOWS)
export MOZ_NO_DEBUG_RTL=1
if test "$MSVS_VERSION" != "2015"; then
WIN32_CRT_LIBS="msvcrt.lib msvcprt.lib"
dnl Look for a broken crtdll.obj
WIN32_CRTDLL_FULLPATH=`lib -nologo -list $WIN32_CRT_LIBS | grep crtdll\\.obj`
lib -NOLOGO -OUT:crtdll.obj $WIN32_CRT_LIBS -EXTRACT:$WIN32_CRTDLL_FULLPATH
@@ -7457,24 +7190,16 @@ CFLAGS="$_SAVE_CFLAGS"
if test -n "$INTEL_CC"; then
PROFILE_GEN_CFLAGS="-prof-gen -prof-dir ."
PROFILE_GEN_LDFLAGS=
PROFILE_USE_CFLAGS="-prof-use -prof-dir ."
PROFILE_USE_LDFLAGS=
fi
-dnl Sun Studio on Solaris
-if test "$SOLARIS_SUNPRO_CC"; then
- PROFILE_GEN_CFLAGS="-xprofile=collect:$_objdir/$enable_application"
- PROFILE_GEN_LDFLAGS="-xprofile=collect:$_objdir/$enable_application"
- PROFILE_USE_CFLAGS="-xprofile=use:$_objdir/$enable_application"
- PROFILE_USE_LDFLAGS="-xprofile=use:$_objdir/$enable_application"
-fi
-
AC_SUBST(PROFILE_GEN_CFLAGS)
AC_SUBST(PROFILE_GEN_LDFLAGS)
AC_SUBST(PROFILE_USE_CFLAGS)
AC_SUBST(PROFILE_USE_LDFLAGS)
dnl =============================================
dnl Support for -fno-integrated-as (recent clang)
dnl =============================================
@@ -7507,19 +7232,16 @@ dnl ====================================
dnl =
dnl = Build depencency options
dnl =
dnl ========================================================
MOZ_ARG_HEADER(Build dependencies)
if test "$GNU_CC" -a "$GNU_CXX"; then
_DEPEND_CFLAGS='-MD -MP -MF $(MDDEPDIR)/$(@F).pp'
-dnl Sun Studio on Solaris use -xM instead of -MD, see config/rules.mk
-elif test "$SOLARIS_SUNPRO_CC"; then
- _DEPEND_CFLAGS=
else
dnl Don't override this for MSVC
if test -z "$_WIN32_MSVC"; then
_USE_CPP_INCLUDE_FLAG=
_DEFINES_CFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
_DEFINES_CXXFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
else
echo '#include <stdio.h>' > dummy-hello.c
@@ -7613,18 +7335,17 @@ fi
MOZ_ARG_ENABLE_BOOL(skia,
[ --enable-skia Enable use of Skia],
MOZ_ENABLE_SKIA=1,
MOZ_ENABLE_SKIA=)
dnl Skia GPU support may not reliably build on certain *BSDs (see bug 1234494).
if test "${OS_TARGET}" = "OpenBSD" -o \
- "${OS_TARGET}" = "NetBSD" -o \
- "${OS_ARCH}" = "SunOS"; then
+ "${OS_TARGET}" = "NetBSD"; then \
MOZ_DISABLE_SKIA_GPU=1
else
MOZ_DISABLE_SKIA_GPU=
fi
MOZ_ARG_DISABLE_BOOL(skia-gpu,
[ --disable-skia-gpu Disable use of Skia-GPU],
MOZ_DISABLE_SKIA_GPU=1,
@@ -7937,17 +7658,17 @@ case "$OS_TARGET" in
NECKO_WIFI=1
fi
;;
Darwin)
if test -z "$MOZ_IOS"; then
NECKO_WIFI=1
fi
;;
- DragonFly|FreeBSD|SunOS|WINNT)
+ DragonFly|FreeBSD|WINNT)
NECKO_WIFI=1
;;
Linux)
NECKO_WIFI=1
NECKO_WIFI_DBUS=1
;;
esac
