svn commit: r307823 - head/share/mk

[Dimitry Andric]

Author: dim
Date: Sun Oct 23 14:28:29 2016
New Revision: 307823
URL: https://svnweb.freebsd.org/changeset/base/307823

Log:
  Use upstream suffixes for LLVM IR
  
  In r307676, several make rules were added for LLVM IR files, both in
  text and binary format.  Unfortunately these use different suffixes from
  what upstream uses:
  * Text IR has upstream suffix ".ll", while r307676 uses ".llo"
  * Binary IR has upstream suffix ".bc", while r307676 uses ".bco"
  
  Change these to what upstream uses instead.
  
  Reviewed by:	emaste
  Differential Revision: https://reviews.freebsd.org/D8326

Modified:
  head/share/mk/bsd.suffixes.mk
  head/share/mk/sys.mk

Modified: head/share/mk/bsd.suffixes.mk
==============================================================================
--- head/share/mk/bsd.suffixes.mk	Sun Oct 23 12:48:09 2016	(r307822)
+++ head/share/mk/bsd.suffixes.mk	Sun Oct 23 14:28:29 2016	(r307823)
@@ -20,10 +20,10 @@
 	${CC} ${STATIC_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 	${CTFCONVERT_CMD}
 
-.c.bco:
+.c.bc:
 	${CC} -emit-llvm ${IR_CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
-.c.llo:
+.c.ll:
 	${CC} -emit-llvm ${IR_CFLAGS} -S ${.IMPSRC} -o ${.TARGET}
 
 .cc .cpp .cxx .C:
@@ -32,10 +32,10 @@
 .cc.o .cpp.o .cxx.o .C.o:
 	${CXX} ${STATIC_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
-.cc.bco .cpp.bco .cxx.bco .C.bco:
+.cc.bc .cpp.bc .cxx.bc .C.bc:
 	${CXX} -emit-llvm ${IR_CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 
-.cc.llo .cpp.llo .cxx.llo .C.llo:
+.cc.ll .cpp.ll .cxx.ll .C.ll:
 	${CXX} -emit-llvm ${IR_CXXFLAGS} -S ${.IMPSRC} -o ${.TARGET}
 
 .m.o:

Modified: head/share/mk/sys.mk
==============================================================================
--- head/share/mk/sys.mk	Sun Oct 23 12:48:09 2016	(r307822)
+++ head/share/mk/sys.mk	Sun Oct 23 14:28:29 2016	(r307823)
@@ -121,7 +121,7 @@ META_MODE?= normal
 .if defined(%POSIX)
 .SUFFIXES:	.o .c .y .l .a .sh .f
 .else
-.SUFFIXES:	.out .a .ln .o .bco .llo .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh
+.SUFFIXES:	.out .a .ln .o .bc .ll .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh
 .endif
 
 AR		?=	ar