Date: Wed, 2 Nov 2016 00:40:57 +0100 From: Dimitry Andric <dim@FreeBSD.org> To: Jonathan Anderson <jonathan@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org, Ed Maste <emaste@freebsd.org> Subject: Re: svn commit: r308181 - in head: . share/mk Message-ID: <46715A69-03C5-404F-B133-C8FE89D59A9B@FreeBSD.org> In-Reply-To: <201611012127.uA1LRg0B045900@repo.freebsd.org> References: <201611012127.uA1LRg0B045900@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_83304E14-9301-494C-94FD-7F49B67553D6 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 01 Nov 2016, at 22:27, Jonathan Anderson <jonathan@freebsd.org> = wrote: >=20 > Author: jonathan > Date: Tue Nov 1 21:27:42 2016 > New Revision: 308181 > URL: https://svnweb.freebsd.org/changeset/base/308181 >=20 > Log: > Add rules to build LLVM IR binaries and libraries. >=20 > 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 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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+=3D -g >=20 > # 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 >=20 > +.if defined(LLVM_LINK) > +BCOBJS=3D ${OBJS:.o=3D.bco} ${STATICOBJS:.o=3D.bco} > +LLOBJS=3D ${OBJS:.o=3D.llo} ${STATICOBJS:.o=3D.llo} But apparently you already used those suffixes here. > Modified: head/share/mk/bsd.prog.mk > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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> >=20 > -.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 --Apple-Mail=_83304E14-9301-494C-94FD-7F49B67553D6 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.30 iEYEARECAAYFAlgZKA0ACgkQsF6jCi4glqMxRQCfUXfsIVRkLTiDyAJW2H+A1AYG 4LgAoLTkkTVUAbQViBo0LBz+hjF2HXew =N6JI -----END PGP SIGNATURE----- --Apple-Mail=_83304E14-9301-494C-94FD-7F49B67553D6--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?46715A69-03C5-404F-B133-C8FE89D59A9B>