From nobody Sun May 14 05:25:33 2023 X-Original-To: dev-commits-ports-all@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 4QJrYn48thz4BGvG; Sun, 14 May 2023 05:25:33 +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 4QJrYn3fpRz3G1g; Sun, 14 May 2023 05:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684041933; 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=3Tk2cw4eOvCXCuoDbOFMI9TnZWdnZqooo4hvww95d7Q=; b=uFrXvO5MjIxZFezLviPCItxS0+K2yy9XhP/M90oW75g1jNKAlUPwCQt5kvdjbCKGEcFPQH 86PfvPYza0oD6YZWtNbZJMwZNXHjGkneg1B7LTfXGLjqIUfS6hzqUCo0ZnUEQ3B8rpImMF k8Z95FCJZ+p+ExuV3yozz7RvLby4+shzWBrAvoUQbLvhkdVKOmEZ3kTtRPe803A/ng7WzH nHJpcFYPaSkDTepkepYUgO93xse4ZitMKiE+HkYFYYT26tLgpCDVC2+rIQEdzhELZ8rWud LSkroUx2iNDPCWuLntshvYjsgfAtXcvTtr6tlyV8Vox6HOXTjrbJglYeZDu0wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684041933; 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=3Tk2cw4eOvCXCuoDbOFMI9TnZWdnZqooo4hvww95d7Q=; b=pD0wtfQhhPuFkRYMTXKqsBm/hi8e+kRuuzbDHh1MN4Kphn4z0eqmIcJ4KYxF2wldBW1JtR LujlpQVuQrqkAGhMDT92lzfFwD2Zmm9HBT+p+tPI0psiW+y5B4rc7whldTGWl39kemmcr9 /x01BHBf9L2Sx/k4cgu3cVU2hfmsJXBEBkfTtU1AgyDhPrbQuE6zCZpKXuylXHz62V+5T8 FRCaY6Wkq3X6AqHoLCxihtzwB0RB9uJ95U3S85pRXqd0BrOEvJJgEuzhty2vqex0mAarZL 9MZyeoeX4yyU/CA9qfeUr+xeybmkZ2d7HCGM6YNuRnWLy7TKXfOYYXdTECXNig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684041933; a=rsa-sha256; cv=none; b=sxxQyyIh010/MGWEnwu0aP5V/EmxuyXdF8vkdo0aUcW3Csv32W4u3h6Z4iSzmNA2497U1G pZzt0HzV7Nvkr/3Z6AnwRFbrWRBZmXlc9mj5eePvDI5RSozaqfW8KYYiTl1b2xMZmUHStG 59nqA7ITqOqCL9+P6HvyyJsiRreKN8gGGViuJQLMQTo30/R7r0Q1FD8RuEaDqePYgGJCDh BFR9ZQ1VASIns+MShW7aKb6RNlVAUCSV05j7LSdymoBWeCmeWmeAH/Hc+ut/5Pqhmll91o NckKhNBVgiZv9LqC0Uo8nFWxuT9dOxDMmKFFq5TWAQWOci/U78eQC9RoYqYoYg== 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 4QJrYn2kkTzm05; Sun, 14 May 2023 05:25:33 +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 34E5PXb6082218; Sun, 14 May 2023 05:25:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34E5PXfJ082217; Sun, 14 May 2023 05:25:33 GMT (envelope-from git) Date: Sun, 14 May 2023 05:25:33 GMT Message-Id: <202305140525.34E5PXfJ082217@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 18b00e31b243 - 2023Q2 - devel/binutils: Fix abort() in mingw32 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2023Q2 X-Git-Reftype: branch X-Git-Commit: 18b00e31b24344d2b72e32d56174015ae8b91fe7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=18b00e31b24344d2b72e32d56174015ae8b91fe7 commit 18b00e31b24344d2b72e32d56174015ae8b91fe7 Author: Cy Schubert AuthorDate: 2023-05-14 04:50:30 +0000 Commit: Cy Schubert CommitDate: 2023-05-14 05:25:25 +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) (cherry picked from commit 783bf3a6159aadc5696192e040abae2c311c8b8c) --- 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);