Index: buildsys.mk.in
==================================================================
--- buildsys.mk.in
+++ buildsys.mk.in
@@ -19,10 +19,11 @@
 #  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 #  POSSIBILITY OF SUCH DAMAGE.
 #
 
 PACKAGE = @PACKAGE@
+AS = @AS@
 CC = @CC@
 CXX = @CXX@
 CPP = @CPP@
 DC = @DC@
 ERLC = @ERLC@
@@ -30,10 +31,11 @@
 OBJCXX = @OBJCXX@
 AR = @AR@
 LD = ${CC}
 RANLIB = @RANLIB@
 PYTHON = @PYTHON@
+ASFLAGS = @ASFLAGS@
 CFLAGS = @CFLAGS@
 CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@
 DFLAGS = @DFLAGS@
 ERLCFLAGS = @ERLCFLAGS@
@@ -73,24 +75,25 @@
 includedir = @includedir@
 includesubdir ?= ${PACKAGE}
 mandir = @mandir@
 mansubdir ?= man1
 
-OBJS1 = ${SRCS:.c=.o}
-OBJS2 = ${OBJS1:.cc=.o}
-OBJS3 = ${OBJS2:.cxx=.o}
-OBJS4 = ${OBJS3:.d=.o}
-OBJS5 = ${OBJS4:.erl=.beam}
-OBJS6 = ${OBJS5:.m=.o}
-OBJS7 = ${OBJS6:.mm=.o}
-OBJS8 = ${OBJS7:.py=.pyc}
-OBJS9 = ${OBJS8:.xpm=.o}
-OBJS += ${OBJS9:.po=.gmo}
+OBJS1  = ${SRCS:.c=.o}
+OBJS2  = ${OBJS1:.cc=.o}
+OBJS3  = ${OBJS2:.cxx=.o}
+OBJS4  = ${OBJS3:.d=.o}
+OBJS5  = ${OBJS4:.erl=.beam}
+OBJS6  = ${OBJS5:.m=.o}
+OBJS7  = ${OBJS6:.mm=.o}
+OBJS8  = ${OBJS7:.py=.pyc}
+OBJS9  = ${OBJS8:.xpm=.o}
+OBJS10 = ${OBJS9:.S=.o}
+OBJS  += ${OBJS10:.po=.gmo}
 
 .SILENT:
 .SUFFIXES:
-.SUFFIXES: .beam .c .cc .cxx .d .dep .erl .gmo .m .mm .o .po .py .pyc .xpm
+.SUFFIXES: .beam .c .cc .cxx .d .dep .erl .gmo .m .mm .o .po .py .pyc .xpm .S
 .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean
 
 all:
 	for i in subdirs depend ${STATIC_LIB} ${STATIC_LIB_NOINST} ${LIB} ${LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST}; do \
 		${MAKE} ${MFLAGS} $$i || exit 1; \
@@ -127,10 +130,14 @@
 				;; \
 			*.mm) \
 				test $$i -nt .deps && regen=1; \
 				deps="$$deps $${i%.mm}.dep"; \
 				;; \
+			*.S) \
+				test $$i -nt .deps && regen=1; \
+				deps="$$deps $${i%.S}.dep"; \
+				;; \
 		esac; \
 	done; \
 	if test x"$$regen" = x"1" -a x"$$deps" != "x"; then \
 		${DEPEND_STATUS}; \
 		if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \
@@ -141,11 +148,11 @@
 			touch -t 0001010000 .deps; \
 			${DEPEND_FAILED}; \
 		fi; \
 	fi
 
-.c.dep .cc.dep .cxx.dep .m.dep .mm.dep:
+.c.dep .cc.dep .cxx.dep .m.dep .mm.dep .S.dep:
 	${CPP} ${CPPFLAGS} -M $< >$@ || (rm -f $@; exit 1)
 
 .d.dep:
 .xpm.dep:
 
@@ -265,10 +272,18 @@
 
 .xpm.o:
 	${COMPILE_STATUS}
 	if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
 		${COMPILE_OK}; \
+	else \
+		${COMPILE_FAILED}; \
+	fi
+
+.S.o:
+	${COMPILE_STATUS}
+	if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
 
 install: ${LIB} ${STATIC_LIB} ${PLUGIN} ${PROG} install-extra