Author: emaste
Date: Fri Jan 27 01:59:12 2017
New Revision: 312855
URL: https://svnweb.freebsd.org/changeset/base/312855
Log:
Rename LLD_AS_LD to LLD_IS_LD, for consistency with CLANG_IS_CC
Reported by: Dan McGregor <dan.mcgregor usask.ca>
Added:
head/tools/build/options/WITHOUT_LLD_IS_LD
- copied unchanged from r312854, head/tools/build/options/WITHOUT_LLD_AS_LD
head/tools/build/options/WITH_LLD_IS_LD
- copied unchanged from r312854, head/tools/build/options/WITH_LLD_AS_LD
Deleted:
head/tools/build/options/WITHOUT_LLD_AS_LD
head/tools/build/options/WITH_LLD_AS_LD
Modified:
head/Makefile.inc1
head/UPDATING
head/gnu/usr.bin/binutils/ld/Makefile
head/share/mk/src.opts.mk
head/usr.bin/clang/lld/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Fri Jan 27 01:24:24 2017 (r312854)
+++ head/Makefile.inc1 Fri Jan 27 01:59:12 2017 (r312855)
@@ -516,7 +516,7 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
# cross-tools stage
XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- MK_GDB=no MK_TESTS=no MK_LLD_AS_LD=no
+ MK_GDB=no MK_TESTS=no MK_LLD_IS_LD=no
# kernel-tools stage
KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Fri Jan 27 01:24:24 2017 (r312854)
+++ head/UPDATING Fri Jan 27 01:59:12 2017 (r312855)
@@ -51,6 +51,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12
****************************** SPECIAL WARNING: ******************************
+20170127:
+ The WITH_LLD_AS_LD / WITHOUT_LLD_AS_LD build knobs have been renamed
+ WITH_LLD_IS_LD / WITHOUT_LLD_IS_LD, for consistency with CLANG_IS_CC.
+
20170112:
The EM_MULTIQUEUE kernel configuration option is deprecated now that
the em(4) driver conforms to iflib specifications.
Modified: head/gnu/usr.bin/binutils/ld/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/ld/Makefile Fri Jan 27 01:24:24 2017
(r312854)
+++ head/gnu/usr.bin/binutils/ld/Makefile Fri Jan 27 01:59:12 2017
(r312855)
@@ -49,7 +49,7 @@ CLEANFILES+= ldemul-list.h stringify.sed
FILES= ${LDSCRIPTS:S|^|ldscripts/|}
FILESDIR= ${SCRIPTDIR}
-.if ${MK_LLD_AS_LD} == "no"
+.if ${MK_LLD_IS_LD} == "no"
LINKS= ${BINDIR}/ld.bfd ${BINDIR}/ld
.endif
Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk Fri Jan 27 01:24:24 2017 (r312854)
+++ head/share/mk/src.opts.mk Fri Jan 27 01:59:12 2017 (r312855)
@@ -251,9 +251,9 @@ __DEFAULT_YES_OPTIONS+=LLVM_LIBUNWIND
__DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND
.endif
.if ${__T} == "aarch64"
-__DEFAULT_YES_OPTIONS+=LLD_AS_LD
+__DEFAULT_YES_OPTIONS+=LLD_IS_LD
.else
-__DEFAULT_NO_OPTIONS+=LLD_AS_LD
+__DEFAULT_NO_OPTIONS+=LLD_IS_LD
.endif
.if ${__T} == "aarch64" || ${__T} == "amd64"
__DEFAULT_YES_OPTIONS+=LLD LLDB
Copied: head/tools/build/options/WITHOUT_LLD_IS_LD (from r312854,
head/tools/build/options/WITHOUT_LLD_AS_LD)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_LLD_IS_LD Fri Jan 27 01:59:12 2017
(r312855, copy of r312854, head/tools/build/options/WITHOUT_LLD_AS_LD)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to use GNU binutils ld as the system linker, instead of LLVM's LLD.
Copied: head/tools/build/options/WITH_LLD_IS_LD (from r312854,
head/tools/build/options/WITH_LLD_AS_LD)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITH_LLD_IS_LD Fri Jan 27 01:59:12 2017
(r312855, copy of r312854, head/tools/build/options/WITH_LLD_AS_LD)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to use LLVM's LLD as the system linker, instead of GNU binutils ld.
Modified: head/usr.bin/clang/lld/Makefile
==============================================================================
--- head/usr.bin/clang/lld/Makefile Fri Jan 27 01:24:24 2017
(r312854)
+++ head/usr.bin/clang/lld/Makefile Fri Jan 27 01:59:12 2017
(r312855)
@@ -8,7 +8,7 @@ LLD_SRCS= ${LLVM_SRCS}/tools/lld
PACKAGE= lld
PROG_CXX= ld.lld
MAN=
-.if ${MK_LLD_AS_LD} != "no"
+.if ${MK_LLD_IS_LD} != "no"
SYMLINKS= ${PROG_CXX} ${BINDIR}/ld
.endif
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
