Skip to content
This repository has been archived by the owner on Aug 4, 2022. It is now read-only.

Commit

Permalink
Bug 1255813 - Remove build system support for Solaris, HPUX and AIX. …
Browse files Browse the repository at this point in the history
…r=ted
  • Loading branch information
glandium committed Mar 14, 2016
1 parent defbe5c commit 5ac4360
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 701 deletions.
16 changes: 0 additions & 16 deletions build/autoconf/ffi.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
33 changes: 0 additions & 33 deletions build/unix/add_phony_targets.py

This file was deleted.

7 changes: 0 additions & 7 deletions build/unix/gnu-ld-scripts/components-mapfile

This file was deleted.

37 changes: 0 additions & 37 deletions config/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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))
Expand Down
5 changes: 0 additions & 5 deletions config/solaris_ia32.map

This file was deleted.

4 changes: 0 additions & 4 deletions db/sqlite3/src/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -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 += [
Expand Down
14 changes: 0 additions & 14 deletions gfx/qcms/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
Loading

0 comments on commit 5ac4360

Please sign in to comment.