From nobody Mon May 05 19:38:22 2025 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 4ZrsJb3GM1z5tjx1; Mon, 05 May 2025 19:38:23 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZrsJb1YnMz3kK6; Mon, 05 May 2025 19:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746473903; 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=RrWoYATLdf8eWTFmih3KjHziFzC4B8nGLFoMiI9VXn4=; b=GnNAzMkNjC7RiDZZ+iK5afpbCQF2qgUQEo/Zzb6DRtiw84Cvf+Em3ubf4Acvz3cdItKALC 3zoh2vwdI9VGE8AgnH7otyEewRezJ8b1a2oqdSugck9mBDqmChuOlRtUy+euC3s92C7XC+ 27dHa6/wV6KNI5OQRIG1qtFtqqZQKhTsJcVkoS3tLi9VGT8/yBtNgKE8UuTWrR81Pv0+Qt AVkie8idA/H3nRJwSsQesq02iH5ecLlFpR3oAhjiinaxAS81fNzHV3aVnFeD80Cc0IH7ZK O1Y6H2MkdHQ2E6PF14hdAiig95Wl9V44l/q+AIrh3Y0KTVLYnMxwAH0jP2Jxeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746473903; 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=RrWoYATLdf8eWTFmih3KjHziFzC4B8nGLFoMiI9VXn4=; b=x7J3ujUwGnSoSH0AfCx8lgpen9ITIf4gAHHyzu7+VfBUHIWtgp/DE2G+6hSSb0dmPYHzcs Uriw9NNwJbOboej9WB5Es0B6678Eb8zn0dAoyttsBuYTymqJqPJqhZI8dnRAK7XgYl4jQH aFDznySlkdrKr0TXGSac2oi6ZmACL9eEZ2lqcebbWSOiUvNMhgFoYEFzwLpldJWsvUcrh6 /iwEyM+R2fXYAmP7myYwx4ZWNq7bPYNxWZU2Up0hd/rNKjsdANTEUd2T7bqG+c7NKqc3W7 hyRkhj6OnBTk0UimU79AqGNAcRfbq8UIu24RvpD7ByW03p4N0RCKsUthBxdy0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746473903; a=rsa-sha256; cv=none; b=mWpmI2kSDGyCFo5RMaCB69SNhvXsZJvNDfQv5gyYJl2L8TDAfAfKow8fCNzULrwnHsimMq 8703VD3TR/9c1LL9HRTvF0O45di6r7Nk5D9S0YFE6aZwZ/Xot8PaYrUzndrw3/ugfy8i5a kB89DwNUofR+CpNjKXYQHH0U5Q7ZHBTjfajuZ7dbtcqQFZKme8OIUYBs75TVhOBmcD/1Sv euYxKFCF34VQqW/mrmkBVu/fu6VNpq5HcJJxDSNMpTKGIC1v0tnfJa3sq2O4wynLhvvJUt BxFzTUsDhljRC/CIAgygqS3tLfLOLzovf662Gk1cmVuVvIQ0vzcYSjh7kmP17Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZrsJb0mBXzC1h; Mon, 05 May 2025 19:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 545JcM5t048531; Mon, 5 May 2025 19:38:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 545JcMF0048528; Mon, 5 May 2025 19:38:22 GMT (envelope-from git) Date: Mon, 5 May 2025 19:38:22 GMT Message-Id: <202505051938.545JcMF0048528@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: fbd7087b0be2 - main - strings: Unconditionally install ELF Tool Chain's strings 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: fbd7087b0be2f327f806a85b92789a719138df8c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fbd7087b0be2f327f806a85b92789a719138df8c commit fbd7087b0be2f327f806a85b92789a719138df8c Author: Ed Maste AuthorDate: 2025-04-30 13:35:54 +0000 Commit: Ed Maste CommitDate: 2025-05-05 19:38:06 +0000 strings: Unconditionally install ELF Tool Chain's strings llvm-strings may consume a large amount of memory while reading the input file before producing any output. ELF Tool Chain's strings is small and lightweight, and we always install strings regardless of WITH_/WITHOUT_TOOLCHAIN settings (as it is useful in many contexts). Return to always installing ELF Tool Chain's version of strings. This reverts commit 81fa5c4a828bec9f1ead280c59c31bd423e6eeea. This reverts commit 7ca3db1999cd967f9d6d7b259aa7af54aae14a5f. PR: 286605 Reported by: olivier Reviewed by: olivier, brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50084 --- share/man/man5/src.conf.5 | 4 +++- tools/build/options/WITHOUT_LLVM_BINUTILS | 2 ++ tools/build/options/WITH_LLVM_BINUTILS | 2 ++ usr.bin/Makefile | 8 +------- usr.bin/clang/llvm-strings/Makefile | 7 ------- 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 2a052ad41d26..b3a327069393 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd April 30, 2025 +.Dd May 5, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -949,6 +949,8 @@ 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/WITHOUT_LLVM_BINUTILS b/tools/build/options/WITHOUT_LLVM_BINUTILS index 244bec49e695..35cc0c0e034f 100644 --- a/tools/build/options/WITHOUT_LLVM_BINUTILS +++ b/tools/build/options/WITHOUT_LLVM_BINUTILS @@ -13,3 +13,5 @@ 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. diff --git a/tools/build/options/WITH_LLVM_BINUTILS b/tools/build/options/WITH_LLVM_BINUTILS index 130997b7e9bf..164e6e8ffabd 100644 --- a/tools/build/options/WITH_LLVM_BINUTILS +++ b/tools/build/options/WITH_LLVM_BINUTILS @@ -14,3 +14,5 @@ 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. diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 87896a2c0781..7f35a87b0d93 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -140,6 +140,7 @@ SUBDIR= alias \ split \ stat \ stdbuf \ + strings \ su \ systat \ tail \ @@ -250,13 +251,6 @@ SUBDIR.${MK_TOOLCHAIN}+= nm SUBDIR.${MK_TOOLCHAIN}+= readelf SUBDIR.${MK_TOOLCHAIN}+= size .endif -# Include elftoolchain's strings in build targets even if using LLVM_BINUTILS, -# as we may later install with different options. In particular, the release -# artifact builds use default options for buildworld but install with -# MK_TOOLCHAIN=no which implies MK_LLVM_BINUTILS=no. -.if ${MK_LLVM_BINUTILS} == "no" || !make(install) -SUBDIR+= strings -.endif SUBDIR.${MK_TOOLCHAIN}+= c89 SUBDIR.${MK_TOOLCHAIN}+= c99 SUBDIR.${MK_TOOLCHAIN}+= ctags diff --git a/usr.bin/clang/llvm-strings/Makefile b/usr.bin/clang/llvm-strings/Makefile index f01a012b0cb9..dc0d77004fd8 100644 --- a/usr.bin/clang/llvm-strings/Makefile +++ b/usr.bin/clang/llvm-strings/Makefile @@ -1,5 +1,3 @@ -.include - PROG_CXX= llvm-strings SRCDIR= llvm/tools/llvm-strings @@ -21,9 +19,4 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -.if ${MK_LLVM_BINUTILS} != "no" -LINKS+= ${BINDIR}/llvm-strings ${BINDIR}/strings -MLINKS+= llvm-strings.1 strings.1 -.endif - .include "../llvm.prog.mk"