From nobody Wed Apr 05 01:34:12 2023 X-Original-To: dev-commits-src-branches@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 4PrnGr4T12z43YlB; Wed, 5 Apr 2023 01:34:12 +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 4PrnGr3w8Qz3k7J; Wed, 5 Apr 2023 01:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680658452; 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=Lt9ugxfxFqR9SvQnGDFeCHbTdEBV6mPUQawTVlujE2Q=; b=ryzaByt1viVPgZRzbQev0ozSLHJlWONsJvZtAlNIzPbT1q4tInHVU0ZB+O0Nz5oZvjbX4y i0Kumr25eZnuaO681+AKkj1XgpTou5ZLIe+DFQgEf3Vz23LazwrVgbEUz8baHr4VJbpSuu emh9yxGVFm0ZoDPV54TnvUAGMQtk9Gk3j16xeBWrUT8Dntp+FCagjZHwTFITj6H5o2ybq0 BKp3Wi5rwuQ6v45FYPNOEpPj5sCXxD5ZMmk9QP8Ocmb0fwB0Pzcua4INyR6wpHrZl/86M9 IUZpXPrv1LS+znfLg0Gk720ZaLO96X6runjvtIzsX9m6S/IJWhSlB80vrJIWLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680658452; 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=Lt9ugxfxFqR9SvQnGDFeCHbTdEBV6mPUQawTVlujE2Q=; b=kmBuxDN25sD4Dsw7keuA+xu/OBV67AnwS2AlvScoo6tCvW5jOwlW46fS2+57Lb35oKZmpc K7zZHdMYSUwSTTrUcWD/msIhniWoqoJrQILy+1z8KWtRVxcw1neLGoaSKwUqWU62ojBXql c11fsfavonIIAt9yNBMq97aWu2iXkhMY+eFl/9u9JXzFGlmuZrE9G+K8fHxetvI7Kb8mdt S30cbcoxe5BjBM2sL45XyOXMOHhTeL4oTsESYF+UTuONcR0eF3t14v4Dh+F1X1FbqRVcnA sVDk1hhu6dI5VpwK+mtkWizoFam+RfuXNUVWSRJ23UOhx92qoTprN7iDQI0MkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680658452; a=rsa-sha256; cv=none; b=ofCHcfwC/NurfkXiUEvsXwyU2K7GHs8tf1NPLpbsOfUYlLgRsIKrpu6pWBLsjptavaoSdp /2H1x+Kuhfm7E0TMbQ9Qki3UWmILcH0cj9PkDUKC82UzRiiy+JD+JzDe5owMECfhjXtQVy Pe+eDNvmAhXw1h2XV4qxtrvrNncBhvAJyZ86eUxCdefP7WROPbssoYbzLpY/1gL85xUIEX UPjoBEI/uz+7lP2N7FJsSGj6HoQF5vGmvNsdgQls9MO20gC7/cdZR4lxYdfBnEZgNy4jLy rIekmxhZCbHhPfK7IXV0pzfRfaOPqoCy3Q/WK6p8xLUG/hX0C5OGzQCj4hH8sA== 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 4PrnGr2wkFz13Jn; Wed, 5 Apr 2023 01:34:12 +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 3351YCRe000753; Wed, 5 Apr 2023 01:34:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3351YCAm000752; Wed, 5 Apr 2023 01:34:12 GMT (envelope-from git) Date: Wed, 5 Apr 2023 01:34:12 GMT Message-Id: <202304050134.3351YCAm000752@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 982e61aacc79 - stable/13 - Always install llvm-objdump as objdump List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 982e61aacc79f5b972e4c6e1dab6221403e58b0a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=982e61aacc79f5b972e4c6e1dab6221403e58b0a commit 982e61aacc79f5b972e4c6e1dab6221403e58b0a Author: Ed Maste AuthorDate: 2022-11-18 20:47:13 +0000 Commit: Ed Maste CommitDate: 2023-04-05 01:33:57 +0000 Always install llvm-objdump as objdump Instead of providing no /usr/bin/objdump when LLVM_BINUTILS is false. PR: 267854 [exp-run] Reviewed by: dim Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37445 (cherry picked from commit 86edb11e7491e657e6c75ef6814867021665c377) --- UPDATING | 8 ++++++++ tools/build/mk/OptionalObsoleteFiles.inc | 7 ++----- usr.bin/clang/llvm-objdump/Makefile | 2 -- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/UPDATING b/UPDATING index 60f583ac26cf..d2c07cf5a80b 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,14 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20230404: + llvm-objump is now always installed as objdump. Previously there was + no /usr/bin/objdump unless the WITH_LLVM_BINUTILS knob was used. + + Some LLVM objdump options have a different output format compared to + GNU objdump; readelf is available for inspecting ELF files, and GNU + objdump is available from the devel/binutils port or package. + 20230217: Bump __FreeBSD_verion after various changes to LinuxKPI pci and 802.11 in order to help out-of-tree consumers to deal accordingly. diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 81ab89eff94f..e30dc2bc74e8 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1173,6 +1173,7 @@ OLD_FILES+=usr/bin/llvm-readobj OLD_FILES+=usr/bin/llvm-size OLD_FILES+=usr/bin/llvm-strings OLD_FILES+=usr/bin/llvm-symbolizer +OLD_FILES+=usr/bin/objdump OLD_FILES+=usr/share/man/man1/llvm-addr2line.1.gz OLD_FILES+=usr/share/man/man1/llvm-ar.1.gz OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz @@ -1183,6 +1184,7 @@ OLD_FILES+=usr/share/man/man1/llvm-readobj.1.gz OLD_FILES+=usr/share/man/man1/llvm-size.1.gz OLD_FILES+=usr/share/man/man1/llvm-strings.1.gz OLD_FILES+=usr/share/man/man1/llvm-symbolizer.1.gz +OLD_FILES+=usr/share/man/man1/objdump.1.gz .endif .if ${MK_CLANG} == no @@ -2095,11 +2097,6 @@ OLD_FILES+=usr/share/man/man8/strfile.8.gz OLD_FILES+=usr/share/man/man8/unstr.8.gz .endif -.if ${MK_LLVM_BINUTILS} == no -OLD_FILES+=usr/bin/objdump -OLD_FILES+=usr/share/man/man1/objdump.1.gz -.endif - .if ${MK_LLVM_COV} == no && !defined(WITH_PORT_BASE_GCC) OLD_FILES+=usr/bin/gcov OLD_FILES+=usr/share/man/man1/gcov.1.gz diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index 8a9587129f36..fc81304ddb1a 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -33,9 +33,7 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} LIBADD+= z -.if ${MK_LLVM_BINUTILS} != "no" LINKS= ${BINDIR}/llvm-objdump ${BINDIR}/objdump MLINKS= llvm-objdump.1 objdump.1 -.endif .include "../llvm.prog.mk"