Don't trust sys.mk,v 1.61 commit log, and make .asm alias for .S.

2 files changed, 14 insertions, 4 deletions

diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index c3f242e..f4d6437 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -36,7 +36,7 @@ STRIP?=	-s
 # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
 # .So used for PIC object files
 .SUFFIXES:
-.SUFFIXES: .out .o .po .So .S .s .asm .c .cc .cpp .cxx .m .C .f .y .l .ln
+.SUFFIXES: .out .o .po .So .S .asm .s .c .cc .cpp .cxx .m .C .f .y .l .ln
 
 .if !defined(PICFLAG)
 .if ${MACHINE_ARCH} == "sparc64"
@@ -70,9 +70,16 @@ PICFLAG=-fpic
 .m.So:
 	${OBJC} ${PICFLAG} -DPIC ${OBJCFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
-.s.po .asm.po .s.So .asm.So:
+.s.po .s.So:
 	${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC}
 
+.asm.po:
+	${CC} -x assembler-with-cpp -DPROF ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+
+.asm.So:
+	${CC} -x assembler-with-cpp ${PICFLAG} -DPIC ${CFLAGS} \
+	    -c ${.IMPSRC} -o ${.TARGET}
+
 .S.po:
 	${CC} -DPROF ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 219ab7a..f2ae1cd 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -16,7 +16,7 @@ unix		?=	We run FreeBSD, not UNIX.
 .if defined(%POSIX)
 .SUFFIXES:	.o .c .y .l .a .sh .f
 .else
-.SUFFIXES:	.out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .s .asm .cl .p .h .sh
+.SUFFIXES:	.out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh
 .endif
 
 .LIBS:		.a
@@ -208,7 +208,10 @@ MACHINE_ARCH	?=	i386
 .S.o:
 	${CC} ${CFLAGS} -c ${.IMPSRC}
 
-.s.o .asm.o:
+.asm.o:
+	${CC} -x assembler-with-cpp ${CFLAGS} -c ${.IMPSRC}
+
+.s.o:
 	${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC}
 
 # XXX not -j safe