Date: Tue, 5 May 2020 18:44:07 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r360667 - in stable/11: gnu/usr.bin/binutils/ld lib/clang/libllvm usr.bin/clang/lld Message-ID: <202005051844.045Ii76J008821@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Tue May 5 18:44:06 2020 New Revision: 360667 URL: https://svnweb.freebsd.org/changeset/base/360667 Log: MFC r330366 (by emaste): When lld is ld, install bfd's man page as ld.bfd.1 When WITH_LLD_IS_LD is set, lld's man page is installed as ld.1.gz, as was GNU BFD's man page prior to this change. Reported by: Tobias Kortkamp Sponsored by: The FreeBSD Foundation MFC r335447 (by bdrewery): Rework how the ld link is handled in WORLDTMP from r322811. LLD_BOOTSTRAP (build) is independent of LLD_IS_LD (installed) so they should not be based on each other. This is related to upcoming WITH_SYSTEM_LINKER work. Reviewed by: emaste Sponsored by: Dell EMC Differential Revision: https://reviews.freebsd.org/D15836 MFC r335448 (by bdrewery): Rework WITHOUT_LLD/TOOLCHAIN fix from r327892 for cross-tools. MK_LLD is for the installed lld while MK_LLD_BOOTSTRAP is for the build tool. For WITH_SYSTEM_LINKER it is necesarry to separate the logic of these two. When building libllvm TOOLS_PREFIX will be defined and MK_LLD_BOOTSTRAP should be checked instead. Sponsored by: Dell EMC Differential Revision: https://reviews.freebsd.org/D15837 MFC r335449 (by bdrewery): Fix sources needed for lld. lld always needs these DWARF sources, as well as other default and extra tools. XDL seems to be the best fit list. Remove MK_LLD_IS_LD check from SRCS_MIW which is now reduced to just a few files for llvm-objdump. Sponsored by: Dell EMC Differential Revision: https://reviews.freebsd.org/D15915 MFC r335560 (by bdrewery): Revert r335449 and add needed MK_LLD_BOOTSTRAP check for SRCS_MIW. This effectively reverts r335449 and changes the previous MK_LLD_IS_LD to a MK_LLD_BOOTSTRAP check. If !TOOLS_PREFIX then these sources are always built for llvm-objdump, lld, and llvm-cov. When TOOLS_PREFIX is set then they are only needed if lld is being bootstrapped. Reported by: dim Pointyhat to: bdrewery Sponsored by: Dell EMC Modified: stable/11/gnu/usr.bin/binutils/ld/Makefile stable/11/lib/clang/libllvm/Makefile stable/11/usr.bin/clang/lld/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/gnu/usr.bin/binutils/ld/Makefile ============================================================================== --- stable/11/gnu/usr.bin/binutils/ld/Makefile Tue May 5 18:09:06 2020 (r360666) +++ stable/11/gnu/usr.bin/binutils/ld/Makefile Tue May 5 18:44:06 2020 (r360667) @@ -7,7 +7,17 @@ ELF_SCR_EXT= x xbn xc xd xdc xdw xn xr xs xsc xsw xu x .PATH: ${SRCDIR}/ld PROG= ld.bfd +.if (!defined(TOOLS_PREFIX) && ${MK_LLD_IS_LD} == "no") || \ + (defined(TOOLS_PREFIX) && ${MK_LLD_BOOTSTRAP} == "no") MAN= ld.1 +LINKS= ${BINDIR}/ld.bfd ${BINDIR}/ld +.else +MAN= ld.bfd.1 +CLEANFILES+= ld.bfd.1 +ld.bfd.1: ld.1 + ${CP} ${.ALLSRC} ${.TARGET} +.endif + SCRIPTDIR= /usr/libdata/ldscripts SRCS+= ldcref.c \ ldctor.c \ @@ -49,9 +59,6 @@ CLEANFILES+= ldemul-list.h stringify.sed FILES= ${LDSCRIPTS:S|^|ldscripts/|} FILESDIR= ${SCRIPTDIR} -.if ${MK_LLD_IS_LD} == "no" -LINKS= ${BINDIR}/ld.bfd ${BINDIR}/ld -.endif HOST= ${TARGET_TUPLE} LIBSEARCHPATH= \"=/lib\":\"=/usr/lib\" Modified: stable/11/lib/clang/libllvm/Makefile ============================================================================== --- stable/11/lib/clang/libllvm/Makefile Tue May 5 18:09:06 2020 (r360666) +++ stable/11/lib/clang/libllvm/Makefile Tue May 5 18:44:06 2020 (r360667) @@ -1539,7 +1539,7 @@ SRCS_EXT+= XRay/RecordInitializer.cpp SRCS_EXT+= XRay/Trace.cpp SRCS_ALL+= ${SRCS_MIN} -.if !defined(TOOLS_PREFIX) || ${MK_LLD_IS_LD} != "no" +.if !defined(TOOLS_PREFIX) || ${MK_LLD_BOOTSTRAP} != "no" SRCS_ALL+= ${SRCS_MIW} .endif .if ${MK_CLANG_EXTRAS} != "no" @@ -1548,16 +1548,19 @@ SRCS_ALL+= ${SRCS_EXT} .if ${MK_CLANG_FULL} != "no" SRCS_ALL+= ${SRCS_FUL} .endif -.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLD} != "no" +.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLD} != "no" || \ + (defined(TOOLS_PREFIX) && ${MK_LLD_BOOTSTRAP} != "no") SRCS_ALL+= ${SRCS_EXL} .endif -.if ${MK_LLD} != "no" +.if ${MK_LLD} != "no" || \ + (defined(TOOLS_PREFIX) && ${MK_LLD_BOOTSTRAP} != "no") SRCS_ALL+= ${SRCS_LLD} .endif .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" SRCS_ALL+= ${SRCS_XDB} .endif -.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" || ${MK_LLD} != "no" +.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" || ${MK_LLD} != "no" || \ + (defined(TOOLS_PREFIX) && ${MK_LLD_BOOTSTRAP} != "no") SRCS_ALL+= ${SRCS_XDL} .endif .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" || !defined(TOOLS_PREFIX) Modified: stable/11/usr.bin/clang/lld/Makefile ============================================================================== --- stable/11/usr.bin/clang/lld/Makefile Tue May 5 18:09:06 2020 (r360666) +++ stable/11/usr.bin/clang/lld/Makefile Tue May 5 18:44:06 2020 (r360667) @@ -10,7 +10,8 @@ PACKAGE= lld PROG_CXX= ld.lld # Man page directory .PATH: ${LLD_SRCS}/docs -.if ${MK_LLD_IS_LD} != "no" +.if (!defined(TOOLS_PREFIX) && ${MK_LLD_IS_LD} != "no") || \ + (defined(TOOLS_PREFIX) && ${MK_LLD_BOOTSTRAP} != "no") SYMLINKS= ${PROG_CXX} ${BINDIR}/ld MLINKS= ld.lld.1 ld.1 .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005051844.045Ii76J008821>