From nobody Wed Apr 5 17:06:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ps9yK48RVz43mGt; Wed, 5 Apr 2023 17:06:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ps9yK3fHGz44xw; Wed, 5 Apr 2023 17:06:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680714377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=haApyUn0gxOrGLJzL+oBpTMJURDvSlPwXQr3gyV13s8=; b=Nqhtq38VykYZdPgTvGtVros2X8bf977WahDtX/PJit0HR5jEZVUAH5mE6YnOR64c2SqJA6 zVh87M6NX1z+zdmNh+QMWC1lOf/vQnO+ZzvCi2A6I7cxL8XGUftlnJZ4MMTD2tBa5SBhVt z2K1yN0qmaAe+oYcVCJ7TnBbgNyjRGpLXL+66I7fwV8aoGY7fi1zAXIbMAge43H3rSxagn vXaCWf/He/O+pEuQUdb5ptMeMbD5lb9H5YBrFrKVYzY6G4yGjlgJ6mgH5wL77tiSKGm16t Rs8ynrRGsp47JXF5uNuFvS7k40FUsgP5DjUeJusiUfRjiyUDFlCW3huauV9cJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680714377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=haApyUn0gxOrGLJzL+oBpTMJURDvSlPwXQr3gyV13s8=; b=tJa0RfN+rWFrqLAKYT2qBrlPbgBZUvUFdhCsYP99MSxlPUX1uD/ExXl2rjrY/oWPRCamp5 i/rve6T7xHgVLtx8KD0iTTLHmL1RV0w8wngO8l7VEWiIDYQWLwClqdFxy6kATNgzTuLdlA dXMdw7llVTiX4l0j+2NdyOen56D6ayd8BC/F45IFRNO9j+G4UlBWrlM6UFL+mhnMEeoPFp qHTpEo2F1/ObuLKHCrlxVq8wDvm4HOXR8mqU4bf6AQveFJldNT9aoZy+nzo67xYPJwplO0 LKHLYgr4nb06iah3N0vq48TmbzaZf0MueQ1Iz5F+1i4d4JibRvHpi016TKgRHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680714377; a=rsa-sha256; cv=none; b=P44qJ51XzIaufkSkTYBoIBiDcZjISuewjASdrzDQRG1+QvZtcvaeIPqwbyGn6ug3C/B0kA Kpo/H8+ZH4adKSbbbMO9DcOX3PMQypJ+rv0ANPcxKxRt3t3l0IlCOTBaS+KRFHsqMNuDpF 64v5Bh8YoZkwljg1bbAfVUbOxDpFBS87+k5BK5bGhUMYOsusuFsLlRP1t1k9Cnmsgm4nND +5d7eH4dS7xKN371eEHN8JG7BG1wfhH1QZorjNlTzIECqWy4lC38HAFSkSKu2IGgPsD4hm vwn3Pjk3mWO/3Z0aBlrmi9Y6oBR1Kmj6EoVMZ9/yCLkMzKw7slocOAYLNH5Tig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ps9yK2c2jzWV6; Wed, 5 Apr 2023 17:06:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 335H6HUB030863; Wed, 5 Apr 2023 17:06:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 335H6H3N030862; Wed, 5 Apr 2023 17:06:17 GMT (envelope-from git) Date: Wed, 5 Apr 2023 17:06:17 GMT Message-Id: <202304051706.335H6H3N030862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a9d0665bbba5 - main - src.conf.5: Expand WITH_LLVM_BINUTILS description List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9d0665bbba528efcce56333a9a58d18ffb3a108 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a9d0665bbba528efcce56333a9a58d18ffb3a108 commit a9d0665bbba528efcce56333a9a58d18ffb3a108 Author: Ed Maste AuthorDate: 2023-04-05 15:21:26 +0000 Commit: Ed Maste CommitDate: 2023-04-05 17:05:15 +0000 src.conf.5: Expand WITH_LLVM_BINUTILS description List the specific tools that are controlled by WITH_LLVM_BINUTILS, and mention the tools that are always or never taken from LLVM. Tools come from one of three sources (LLVM, ELF Tool Chain, bespoke base system) and it is useful to be explicit. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39428 --- share/man/man5/src.conf.5 | 19 ++++++++++++++++++- tools/build/options/WITH_LLVM_BINUTILS | 19 ++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 565d551c8497..ff287a5b017e 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -906,7 +906,24 @@ some other way. .It Va WITHOUT_LLVM_ASSERTIONS Disable debugging assertions in LLVM. .It Va WITH_LLVM_BINUTILS -Install LLVM's binutils (ar, addr2line, nm, etc.) instead of ELF Tool Chain's. +Install LLVM's binutils (without an llvm- prefix), +instead of ELF Tool Chain's tools. +This includes +.Xr addr2line 1 , +.Xr ar 1 , +.Xr nm 1 , +.Xr objcopy 1 , +.Xr ranlib 1 , +.Xr readelf 1 , +.Xr size 1 , +and +.Xr strip 1 . +Regardless of this setting, LLVM tools are used for +.Xr c++filt 1 +and +.Xr objdump 1 . +.Xr strings 1 +is always provided by ELF Tool Chain. .It Va WITHOUT_LLVM_COV Do not build the .Xr llvm-cov 1 diff --git a/tools/build/options/WITH_LLVM_BINUTILS b/tools/build/options/WITH_LLVM_BINUTILS index 8fa2c55f31a9..f60b1ebac0e4 100644 --- a/tools/build/options/WITH_LLVM_BINUTILS +++ b/tools/build/options/WITH_LLVM_BINUTILS @@ -1,2 +1,19 @@ .\" $FreeBSD$ -Install LLVM's binutils (ar, addr2line, nm, etc.) instead of ELF Tool Chain's. +Install LLVM's binutils (without an llvm- prefix), +instead of ELF Tool Chain's tools. +This includes +.Xr addr2line 1 , +.Xr ar 1 , +.Xr nm 1 , +.Xr objcopy 1 , +.Xr ranlib 1 , +.Xr readelf 1 , +.Xr size 1 , +and +.Xr strip 1 . +Regardless of this setting, LLVM tools are used for +.Xr c++filt 1 +and +.Xr objdump 1 . +.Xr strings 1 +is always provided by ELF Tool Chain.