svn commit: r308181 - in head: . share/mk

Dimitry Andric dim at FreeBSD.org
Tue Nov 1 23:41:06 UTC 2016


On 01 Nov 2016, at 22:27, Jonathan Anderson <jonathan at freebsd.org> wrote:
> 
> Author: jonathan
> Date: Tue Nov  1 21:27:42 2016
> New Revision: 308181
> URL: https://svnweb.freebsd.org/changeset/base/308181
> 
> Log:
>  Add rules to build LLVM IR binaries and libraries.
> 
>  Running `make libfoo.ll` or `make libfoo.bc` within a library directory
>  will now give us an LLVM IR version of the library, and `make foo.full.ll`
>  or `make foo.full.bc` will give us an IR version of a binary.

Please note, I reverted r307823 (which changed the suffixes from .bco
and .llo to .bc and .ll) in r308003, since it caused a number of ports
failures.  These ports were already using .ll as a suffix for C++ lex
scripts.


> Modified: head/share/mk/bsd.lib.mk
> ==============================================================================
> --- head/share/mk/bsd.lib.mk	Tue Nov  1 21:08:37 2016	(r308180)
> +++ head/share/mk/bsd.lib.mk	Tue Nov  1 21:27:42 2016	(r308181)
> @@ -78,7 +78,7 @@ CTFFLAGS+= -g
> 
> # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
> # .pico used for PIC object files
> -.SUFFIXES: .out .o .po .pico .S .asm .s .c .cc .cpp .cxx .C .f .y .l .ln
> +.SUFFIXES: .out .o .bc .ll .po .pico .S .asm .s .c .cc .cpp .cxx .C .f .y .l .ln

So here, please use .bco and .llo.


> @@ -199,6 +199,18 @@ lib${LIB_PRIVATE}${LIB}_p.a: ${POBJS}
> 	${RANLIB} ${RANLIBFLAGS} ${.TARGET}
> .endif
> 
> +.if defined(LLVM_LINK)
> +BCOBJS=		${OBJS:.o=.bco} ${STATICOBJS:.o=.bco}
> +LLOBJS=		${OBJS:.o=.llo} ${STATICOBJS:.o=.llo}

But apparently you already used those suffixes here.


> Modified: head/share/mk/bsd.prog.mk
> ==============================================================================
> --- head/share/mk/bsd.prog.mk	Tue Nov  1 21:08:37 2016	(r308180)
> +++ head/share/mk/bsd.prog.mk	Tue Nov  1 21:27:42 2016	(r308181)
> @@ -4,7 +4,7 @@
> .include <bsd.init.mk>
> .include <bsd.compiler.mk>
> 
> -.SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .ln .s .S .asm
> +.SUFFIXES: .out .o .bc .c .cc .cpp .cxx .C .m .y .l .ll .ln .s .S .asm

But not here, these should also be changed.  Sorry for any confusion.

-Dimitry

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 194 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20161102/6c552f6c/attachment.sig>


More information about the svn-src-head mailing list