From nobody Sun May 14 05:02:44 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 4QJr3S5SdLz4BFt7; Sun, 14 May 2023 05:02:44 +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 4QJr3S4jZrz3DCQ; Sun, 14 May 2023 05:02:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684040564; 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=F9zUjtMXhJcJ5LUMgxlOpDY5rh7gSStts6QEy18FriU=; b=E8aOLadpNzP8+Ocqxmqe+p2aqjMfMRi/fdkSA464M4nMyzwnDvppQRSmJEABuB/w2Ipvhv 1Vj8y2BshCQHRN3BbWBi6kaKwM5enuYhLJjHFXa9LU0wY973XkiaSuMoYX1JVWUvFqPDMf QMxn5BAfB/BqqZTM5AHwxiPz+iZBwBC9zUT+ONWBN9hqZ2lpGgXOcIKtx5Q2FxOmX4fUa7 Z+ZIn0PRnXWIuzljNs77nurk0zymVAgwJEBaokvRJ1v339whfRo9P/kl2RDZYIzVGoZbuZ TrSPLWJWt/PZOIGGn+yR6yY4s53w7sSkUQUPhS9mYRty4DXynOKuJvpxuz9+Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684040564; 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=F9zUjtMXhJcJ5LUMgxlOpDY5rh7gSStts6QEy18FriU=; b=jMC2ulKNe/vnVVQGY23VzpyETxU58jigDYwoTBJBvW6ZJWJ0cyFqqmJnE4lFbNDbapOabm MO6D/J9PXH0f9TN+dCI+e5J0bKgvrgcn0LOh7H3q/vBd0MsxEFvCdFhwIdWAEhwyzKugRX Phy0uEgBPpaU0sDe1brDR1CgnR5QUk6M7w4oF/eB87DEzFLF3ralmRMj6qwE7qgGtvtvco pTorE8Nhm9zeFuH5ynOI2ixUO+6yL/9jiY5Wb/Iv2USc4FsmD+FXqueSJAhr6hMUJiTnzu ejXNOM7Ffljrpmnt5pIdGD8XWKLvvlhvKg7eUbh96rQfYwrpSTz0k98StmeJGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684040564; a=rsa-sha256; cv=none; b=NFZojwVasfdR1i1KW+JWhITE7rSlz440IPWu/D/2jBDu/Ug2eMb1zWrfHHbWJRohdDpPjl G2JSks0lsccfYXxkyWHYNx6QPoTQxr8NH8u0JGlagh1ryOWGgOVi1dwS6RL3QWIRT8Me+Y ipETx9qJ+zIKsLxvsz1MMzvvHqbpE2yFidUamwWLD48WhpQzSPnMqbU8vUrG1qvwO7WtW8 pbeeNGZRYf6HpC3Plnt202kO01Xr4iprhPKf1SdlWtAUqW+GawCsq5RyZLOUEaD8zaSNcZ wKiAHWP6xJAL+MbAm6/RAvBLs3yxZPYE21Gg6WejPLVaVvtZ+1MN4xK38pWa+Q== 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 4QJr3S3p9SzmPY; Sun, 14 May 2023 05:02:44 +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 34E52iBf049622; Sun, 14 May 2023 05:02:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34E52ikk049621; Sun, 14 May 2023 05:02:44 GMT (envelope-from git) Date: Sun, 14 May 2023 05:02:44 GMT Message-Id: <202305140502.34E52ikk049621@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 783bf3a6159a - main - devel/binutils: Fix abort() in mingw32 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 783bf3a6159aadc5696192e040abae2c311c8b8c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=783bf3a6159aadc5696192e040abae2c311c8b8c commit 783bf3a6159aadc5696192e040abae2c311c8b8c Author: Cy Schubert AuthorDate: 2023-05-14 04:50:30 +0000 Commit: Cy Schubert CommitDate: 2023-05-14 04:50:30 +0000 devel/binutils: Fix abort() in mingw32 Building mingw32 results in a binutils abort() trap. Upstream commit b7eab2a9d4f fixes this. Upstream commit log message states: the early-out in wild_sort is not enough, it might still be that filenames are equal _and_ the wildcard list doesn't specify a sort order either. Don't call compare_section then. PR: 271405 Reported by: shurd Upstream commit: b7eab2a9d4f (identified by shurd) MFH 2023Q3 --- devel/binutils/Makefile | 2 +- devel/binutils/files/patch-ld_ldlang.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index f33baaa17357..0530c4bbc988 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -1,6 +1,6 @@ PORTNAME= binutils DISTVERSION= 2.40 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH?= 1 CATEGORIES?= devel MASTER_SITES= SOURCEWARE/binutils/releases 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);