From nobody Sun Aug 6 12:45:55 2023 X-Original-To: dev-commits-ports-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 4RJfM81htsz4q0dR; Sun, 6 Aug 2023 12:45:56 +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 4RJfM81Ghcz4Sqf; Sun, 6 Aug 2023 12:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691325956; 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=T+MPTQZJSldzB+w0ipFvD5WocyUQzRiXxUxMP+n0iyM=; b=oOlW19WvrcPXJhtEB2UECJTLKG0eQRR1ctGP+lLC3+IVYwrdaLpwGdBqGXcKSsCRbt9FAN cgzk5sjbLYGRgIMSOn07yoh6Df3Z4UxRsQbzWcqdHWRXbI7kfZxJmwipZwBfIWWGANssUk 1ThRhTChBza4FbcT6Dz48Fe3cA9jHofCZiKDh0qqZ5A5+dPh/FSIXA2rv2aLF5CD4gFjBJ e8Rb+ChsqYYQKTsOWE74bLOeB4NwtpqAsB4MMjlZ3lxSCx6xNS58spJ5kNbY1EA3hyHAdB l06PQ0CQ7e64Cke99u9zAM1zFXExQvtny10M7RHSrL0Me81V4XxO9ki/IJwS9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691325956; 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=T+MPTQZJSldzB+w0ipFvD5WocyUQzRiXxUxMP+n0iyM=; b=d2IdCae/S0ls3Q0Rt0wgtEX1amwrMrmEDWRjkoGR39JyeHabR7FAIpo0/oL3uF7/snJYVY MCSpyaDoDNHlaIks0Hc59sjMeDrLbFhChKuAX9ls7mqm0DXfF+iM5dfVqVXVlWuJ3GzGeX fgFiF9hYTHtX2uz2mKsTMSpuyTJytZ1K7ytgeZbU4dZnrHa2db+jPgDcpk/QOC2mmPuleu pQwxFlsyaVx3Ez5xghMUsG9ERYfDUG+VPWIEidehFfVHKpVwlQ9WM1X3hLacen3e9up7nP JAK98s6D6+jAxE0vVn9lXqaxscHM0RBCRQ/ZEDUyTFukDvGLPFsuLHlKTlqZTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691325956; a=rsa-sha256; cv=none; b=SnOQ1RSuAkX4i80TlYxSrpDknmc7hYMKlxyXHfXyCBqoZpLY0+WkOT1bRa0e57eXv8XuE/ M9pOrZuoFGhD7ZmKLVCITDGS/4HUr7AKR/uW5D9VnfEkWCtRNXW+sBmpXZNeeKCqiYjdep LsCFXy/xjEHq+clL0c0K9UtGTrwChEO2OstPpSABQx2kOryV0s+fTeg+O67fBw+XixXN4Q Kymr9hG42wq7Cfq5YfhHAyfO6Neg3xczYvAZqGhVtBpj+WKFuaPriqjVHDirBnu/yiA4Hd EwvDswjjgT3LNnt0oVFj5Rcf7RxkdJXaHleSmvXxghA9w1wgrNiWY+fpZZCayQ== 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 4RJfM80K0Kz19Nn; Sun, 6 Aug 2023 12:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376CjtG3058813; Sun, 6 Aug 2023 12:45:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376Cjtlm058812; Sun, 6 Aug 2023 12:45:55 GMT (envelope-from git) Date: Sun, 6 Aug 2023 12:45:55 GMT Message-Id: <202308061245.376Cjtlm058812@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: a52cf54689f6 - main - devel/binutils: Revert "devel/binutils: Update to 2.41" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a52cf54689f6e7d7b8867b0d39ab4e1cb7692564 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=a52cf54689f6e7d7b8867b0d39ab4e1cb7692564 commit a52cf54689f6e7d7b8867b0d39ab4e1cb7692564 Author: Robert Clausecker AuthorDate: 2023-08-06 12:44:20 +0000 Commit: Robert Clausecker CommitDate: 2023-08-06 12:45:46 +0000 devel/binutils: Revert "devel/binutils: Update to 2.41" This was an accidental misoperation of git. This reverts commit 14211774c4d7d56fd534d38748287ff270d0d469. --- devel/binutils/Makefile | 4 ++-- devel/binutils/distinfo | 6 +++--- devel/binutils/files/patch-bfd_elf.c | 39 ++++++++++++++++++++++++++++++++++ devel/binutils/files/patch-ld_ldlang.c | 12 +++++++++++ devel/binutils/pkg-plist | 9 ++++---- 5 files changed, 60 insertions(+), 10 deletions(-) diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index 307e6b26e72f..76158eca0d44 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -1,5 +1,6 @@ PORTNAME= binutils -DISTVERSION= 2.41 +DISTVERSION= 2.40 +PORTREVISION= 4 PORTEPOCH?= 1 CATEGORIES?= devel MASTER_SITES= GNU \ @@ -117,7 +118,6 @@ INFO= as \ gprof \ bfd \ ld \ - ldint \ sframe-spec .endif diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo index 04808f860761..14280232a4b2 100644 --- a/devel/binutils/distinfo +++ b/devel/binutils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690831336 -SHA256 (binutils-2.41.tar.lz) = eab3444055882ed5eb04e2743d03f0c0e1bc950197a4ddd31898cd5a2843d065 -SIZE (binutils-2.41.tar.lz) = 26307264 +TIMESTAMP = 1673799644 +SHA256 (binutils-2.40.tar.lz) = 48e65ecee1bbcf334d7efb4ea8487fe048dea522e5da3bdf7fa42b1ec779ea33 +SIZE (binutils-2.40.tar.lz) = 24784952 diff --git a/devel/binutils/files/patch-bfd_elf.c b/devel/binutils/files/patch-bfd_elf.c new file mode 100644 index 000000000000..7f27ebb80a10 --- /dev/null +++ b/devel/binutils/files/patch-bfd_elf.c @@ -0,0 +1,39 @@ +--- bfd/elf.c.orig 2023-01-14 00:00:00 UTC ++++ bfd/elf.c +@@ -3870,21 +3870,23 @@ assign_section_numbers (bfd *abfd, struct bfd_link_inf + { + case SHT_REL: + case SHT_RELA: +- /* A reloc section which we are treating as a normal BFD +- section. sh_link is the section index of the symbol +- table. sh_info is the section index of the section to +- which the relocation entries apply. We assume that an +- allocated reloc section uses the dynamic symbol table +- if there is one. Otherwise we guess the normal symbol +- table. FIXME: How can we be sure? */ +- if (d->this_hdr.sh_link == 0 && (sec->flags & SEC_ALLOC) != 0) ++ /* sh_link is the section index of the symbol table. ++ sh_info is the section index of the section to which the ++ relocation entries apply. */ ++ if (d->this_hdr.sh_link == 0) + { +- s = bfd_get_section_by_name (abfd, ".dynsym"); +- if (s != NULL) +- d->this_hdr.sh_link = elf_section_data (s)->this_idx; ++ /* FIXME maybe: If this is a reloc section which we are ++ treating as a normal section then we likely should ++ not be assuming its sh_link is .dynsym or .symtab. */ ++ if ((sec->flags & SEC_ALLOC) != 0) ++ { ++ s = bfd_get_section_by_name (abfd, ".dynsym"); ++ if (s != NULL) ++ d->this_hdr.sh_link = elf_section_data (s)->this_idx; ++ } ++ else ++ d->this_hdr.sh_link = elf_onesymtab (abfd); + } +- if (d->this_hdr.sh_link == 0) +- d->this_hdr.sh_link = elf_onesymtab (abfd); + + s = elf_get_reloc_section (sec); + if (s != NULL) diff --git a/devel/binutils/files/patch-ld_ldlang.c b/devel/binutils/files/patch-ld_ldlang.c new file mode 100644 index 000000000000..7652eabe9184 --- /dev/null +++ b/devel/binutils/files/patch-ld_ldlang.c @@ -0,0 +1,12 @@ +--- ld/ldlang.c.orig 2023-01-13 16:00:00.000000000 -0800 ++++ ld/ldlang.c 2023-05-13 21:48:06.006092000 -0700 +@@ -649,7 +649,8 @@ + looking at the sections for this file. */ + + /* Find the correct node to append this section. */ +- if (compare_section (sec->spec.sorted, section, (*tree)->section) < 0) ++ if (sec && sec->spec.sorted != none && sec->spec.sorted != by_none ++ && compare_section (sec->spec.sorted, section, (*tree)->section) < 0) + tree = &((*tree)->left); + else + tree = &((*tree)->right); diff --git a/devel/binutils/pkg-plist b/devel/binutils/pkg-plist index 0d52d79181c3..eeb7f38341b0 100644 --- a/devel/binutils/pkg-plist +++ b/devel/binutils/pkg-plist @@ -28,7 +28,7 @@ include/sframe-api.h include/sframe.h include/symcat.h %%SHARED%%lib/bfd-plugins/libdep.so -%%SHARED%%lib/libbfd-2.41.so +%%SHARED%%lib/libbfd-2.40.so lib/libbfd.a %%SHARED%%lib/libbfd.so lib/libctf-nobfd.a @@ -39,13 +39,13 @@ lib/libctf.a %%SHARED%%lib/libctf.so %%SHARED%%lib/libctf.so.0 %%SHARED%%lib/libctf.so.0.0.0 -%%SHARED%%lib/libopcodes-2.41.so +%%SHARED%%lib/libopcodes-2.40.so lib/libopcodes.a %%SHARED%%lib/libopcodes.so lib/libsframe.a %%SHARED%%lib/libsframe.so -%%SHARED%%lib/libsframe.so.1 -%%SHARED%%lib/libsframe.so.1.0.0 +%%SHARED%%lib/libsframe.so.0 +%%SHARED%%lib/libsframe.so.0.0.0 man/man1/addr2line.1.gz man/man1/ar.1.gz man/man1/as.1.gz @@ -116,7 +116,6 @@ man/man1/strip.1.gz %%NLS%%share/locale/ja/LC_MESSAGES/gas.mo %%NLS%%share/locale/ja/LC_MESSAGES/gprof.mo %%NLS%%share/locale/ja/LC_MESSAGES/ld.mo -%%NLS%%share/locale/ka/LC_MESSAGES/bfd.mo %%NLS%%share/locale/ka/LC_MESSAGES/gprof.mo %%NLS%%share/locale/ms/LC_MESSAGES/gprof.mo %%NLS%%share/locale/nl/LC_MESSAGES/gprof.mo