diff --git a/build/autoconf/ffi.m4 b/build/autoconf/ffi.m4
index 1152dc7b349a728762d7b75ef6be6edf6d7ab864..369460cfb61c1424d673241ad0bb421817d919fe 100644
--- a/build/autoconf/ffi.m4
+++ b/build/autoconf/ffi.m4
@@ -69,22 +69,6 @@ if test -z "$BUILDING_JS" -o -n "$JS_STANDALONE"; then
;;
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.
diff --git a/build/unix/add_phony_targets.py b/build/unix/add_phony_targets.py
deleted file mode 100644
index 86fc328a5036092bf1055095b5eb3d9dcad02649..0000000000000000000000000000000000000000
--- 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)
diff --git a/build/unix/gnu-ld-scripts/components-mapfile b/build/unix/gnu-ld-scripts/components-mapfile
deleted file mode 100644
index d8e36ea3ad1fad72c9f9a9afa8f4e184ab14c358..0000000000000000000000000000000000000000
--- a/build/unix/gnu-ld-scripts/components-mapfile
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- global:
- NSModule;
- NSGetModule;
- __RLD_MAP;
- local: *;
-};
diff --git a/config/rules.mk b/config/rules.mk
index a063e621e898b9ccc57ea9d96e3f77f176f22512..e28ce0b4b0da6722d9fe1f55ba197ccedb085b18 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -207,12 +207,6 @@ 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)
@@ -293,14 +287,6 @@ 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
@@ -864,25 +850,6 @@ 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
@@ -922,7 +889,6 @@ $(HOST_CMMOBJS):
$(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:
@@ -963,17 +929,14 @@ $(SOBJS):
$(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))
diff --git a/config/solaris_ia32.map b/config/solaris_ia32.map
deleted file mode 100644
index be6ea3736e7e92549f0540778126bee47bb05a6c..0000000000000000000000000000000000000000
--- 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;
diff --git a/db/sqlite3/src/moz.build b/db/sqlite3/src/moz.build
index c8f1da0c14b2eb40e6f0f173a4fa62b7f34ff0fc..d6c3ee97e712132893ab529cce3879b7cf165c12 100644
--- a/db/sqlite3/src/moz.build
+++ b/db/sqlite3/src/moz.build
@@ -78,10 +78,6 @@ 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 += [
diff --git a/gfx/qcms/moz.build b/gfx/qcms/moz.build
index a67a46b8fc389befda7feeb3423ff47bbeb32685..6fdb479e4c437bf93418e204a4e076c04211ce59 100644
--- a/gfx/qcms/moz.build
+++ b/gfx/qcms/moz.build
@@ -39,24 +39,10 @@ elif 'ppc' in CONFIG['CPU_ARCH']:
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']
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index bd23520e3596db259d9b0dbfefb046a670c3fbbe..92f5353bd0ffd5775996b5bf4da81a9596de9d45 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -691,37 +691,6 @@ 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
@@ -914,15 +883,6 @@ if test "$GNU_CC"; then
_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 $@'
@@ -1030,61 +990,6 @@ 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 $@'
@@ -1136,43 +1041,6 @@ case "$target" in
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
@@ -1478,95 +1346,6 @@ ia64*-hpux*)
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
@@ -1580,17 +1359,6 @@ 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'
;;
@@ -1717,11 +1485,6 @@ if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
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)
;;
@@ -1765,25 +1528,13 @@ if test "x$enable_dtrace" = "xyes"; then
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
@@ -1802,15 +1553,7 @@ case $target in
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)
@@ -1923,21 +1666,6 @@ then
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
@@ -2503,9 +2231,6 @@ if test "$MOZ_MEMORY"; then
*-netbsd*)
AC_DEFINE(MOZ_MEMORY_BSD)
;;
- *-solaris*)
- AC_DEFINE(MOZ_MEMORY_SOLARIS)
- ;;
*-mingw*)
AC_DEFINE(MOZ_MEMORY_WINDOWS)
;;
@@ -2951,14 +2676,6 @@ if test -n "$INTEL_CC"; then
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)
@@ -2994,9 +2711,6 @@ 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
diff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in
index ea671090b8ef4ed213f85f74c87cf4343d1b0812..e1860413345951619b186bc9c308a3d44ff2776f 100644
--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -17,15 +17,3 @@ GENERATED_DIRS += $(dir $(ASFILES))
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
diff --git a/old-configure.in b/old-configure.in
index 84ac679b8a78811bdfa9926f7ac96e6bba0524b6..0e4aa988bd641741b0a584c1a1402d72fc162168 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -894,26 +894,6 @@ 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
@@ -1189,15 +1169,6 @@ if test "$GNU_CC"; then
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 $@'
@@ -1539,61 +1510,6 @@ 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 $@'
@@ -1673,43 +1589,6 @@ case "$target" in
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
@@ -2080,93 +1959,6 @@ ia64*-hpux*)
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)
@@ -2197,17 +1989,6 @@ 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'
;;
@@ -2261,11 +2042,6 @@ if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then
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)
;;
@@ -2367,13 +2143,7 @@ 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
@@ -2397,15 +2167,7 @@ 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)
@@ -2438,14 +2200,6 @@ else
[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 ========================================================
@@ -2578,21 +2332,6 @@ then
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)
@@ -5659,9 +5398,6 @@ i?86-*-linux*|x86_64-*-linux*|arm-*-linux*)
*-android*|*-linuxandroid*)
MOZ_CRASHREPORTER=1
;;
-*solaris*)
- MOZ_CRASHREPORTER=1
- ;;
esac
MOZ_ARG_DISABLE_BOOL(crashreporter,
@@ -5679,7 +5415,7 @@ 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
@@ -6838,9 +6574,6 @@ else
*-netbsd*)
AC_DEFINE(MOZ_MEMORY_BSD)
;;
- *-solaris*)
- AC_DEFINE(MOZ_MEMORY_SOLARIS)
- ;;
*-mingw*)
AC_DEFINE(MOZ_MEMORY_WINDOWS)
export MOZ_NO_DEBUG_RTL=1
@@ -7485,14 +7218,6 @@ if test -n "$INTEL_CC"; then
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)
@@ -7535,9 +7260,6 @@ 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
@@ -7641,8 +7363,7 @@ 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=
@@ -7965,7 +7686,7 @@ case "$OS_TARGET" in
NECKO_WIFI=1
fi
;;
- DragonFly|FreeBSD|SunOS|WINNT)
+ DragonFly|FreeBSD|WINNT)
NECKO_WIFI=1
;;
Linux)