From nobody Thu May 22 15:28:48 2025 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 4b3Byn46FPz5wpJ3; Thu, 22 May 2025 15:28:49 +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 4b3Byn0916z3Rmh; Thu, 22 May 2025 15:28:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747927729; 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=xRcCKvQEVpijMrY4HulMJ8b9zzu2zRhTe5RC46SSg/k=; b=oJw7W2cHhI1OeZ7uF3HCazSb319cu96yNyjCM2ElCKcNE9/BHTLGbCn93PUZ8R+qPfmi4A wbYFhzxfG4dWeHh+OBRrP1lGdxovpSzVkweSXkoNxNw5MBML5xpFA+G/Vuq2wF6B5OgxJt Cb2/53P3EYXqqHwLEG1IH2IBHJh3W69pjqVvlsm22DJz8RT2YMpt5nZWuQrcEzI3uturM5 CQYbPvVN8dbk3zIk2XOTdTbpegGVVv6xdIvD2lOsW/H09y/4hfvD4GjlMtB28q7pvpv+5p 8F3SttC8TCzBa+TO/JkshMsV5JltN+Iaiw6Mi43ugmOVt09yEJyiMUhSd/ULAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747927729; 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=xRcCKvQEVpijMrY4HulMJ8b9zzu2zRhTe5RC46SSg/k=; b=Pxgm6HvrBkhwoqVoSRmUCfk9AtY4LdDyshqD9a0+Heg7lZKxpgKhG4LOvPFq/5ZMWKXZog 2F7wLb9k23cwGV08lJUuN71+YuQ381/hogPQ+qht8UEhytpMJvNgWcCc8THMeF2hli9RnA 9KHV8M2Zzm+URACdI2ETTVkqy7/xyxyDoY/Uxoy8LV7KxSaadyskCRe9fIJkvrjTUW9TVP 9ntnqtBFmnIt4NYb/v9b9FO1UMq0iFzkSR7Za9ayf/4HqvCdmD9IMt8nTNoSg/L5ANYg9O 5RL2uo8rp2A458QgiL0LeQK8D9++QvR3AegxgDYWv/GGShMB1a8bxgkiPXhW+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747927729; a=rsa-sha256; cv=none; b=ZJ5hbPZHgkjWLzzCZUanwxmoepsHJDChKnf1fMF4lrnmZDQiBhuLJ9iSHizWgbY6KPgA84 akoci1+KbDOt2Aik77dv/qyLKWXdkx0O0pznVERc+erIsX1LE95TkVv3HlFKb1VmgY+qqB jxxzL6iuD+VFAqGnNIF6gsvtiCcby5q2lSEPQBs73BXNqAT1xpKYTMWhEWoOwBONAwtwl4 2ZRjSIltXPOi3jF3m4v7JRHiaxaq0r7pZXFsWzIWYTFtJJ6cEVHqvTUnqJxXAo8mT3Tiqj uq4289dozsR6XNd46vmgd3QjVHT1ReSlC+r0eAvuhoKz496mmttnut1EP7pnHw== 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 4b3Bym6rRYzB4h; Thu, 22 May 2025 15:28:48 +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 54MFSmP6010132; Thu, 22 May 2025 15:28:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54MFSmZl010129; Thu, 22 May 2025 15:28:48 GMT (envelope-from git) Date: Thu, 22 May 2025 15:28:48 GMT Message-Id: <202505221528.54MFSmZl010129@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Lorenzo Salvadore Subject: git: 5926446a4973 - main - lang/gcc16-devel: Unbreak on aarch64 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: salvadore X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5926446a4973a707e4ba3c8af737029d6f13f176 Auto-Submitted: auto-generated The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=5926446a4973a707e4ba3c8af737029d6f13f176 commit 5926446a4973a707e4ba3c8af737029d6f13f176 Author: Lorenzo Salvadore AuthorDate: 2025-05-22 15:08:28 +0000 Commit: Lorenzo Salvadore CommitDate: 2025-05-22 15:27:55 +0000 lang/gcc16-devel: Unbreak on aarch64 FreeBSD defines ElfW(x) to translate Linux's convention to FreeBSD's convention. GCC defines ElfW to convert its convention to FreeBSD's convention. This patch removes the conversion defined by GCC so that the FreeBSD conversion only is applied. Co-authored-by: Mark Millard PR: 282797 Reported by: John F. Carr Email Thread: https://lists.freebsd.org/archives/freebsd-toolchain/2025-May/002282.html --- lang/gcc16-devel/Makefile | 1 + .../files/patch-libgcc_unwind-dw2-fde-dip.c | 23 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/lang/gcc16-devel/Makefile b/lang/gcc16-devel/Makefile index a57e6b356b3e..45b264f24142 100644 --- a/lang/gcc16-devel/Makefile +++ b/lang/gcc16-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= gcc PORTVERSION= 16.0.0.s20250511 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc16-devel/files/patch-libgcc_unwind-dw2-fde-dip.c b/lang/gcc16-devel/files/patch-libgcc_unwind-dw2-fde-dip.c new file mode 100644 index 000000000000..66452b37de0f --- /dev/null +++ b/lang/gcc16-devel/files/patch-libgcc_unwind-dw2-fde-dip.c @@ -0,0 +1,23 @@ +FreeBSD defines ElfW(x) to translate Linux's convention to FreeBSD's convention. +GCC defines ElfW to convert its convention to FreeBSD's convention. This patch +removes the conversion defined by GCC so that the FreeBSD conversion only is +applied. + +--- libgcc/unwind-dw2-fde-dip.c.orig 2025-05-16 15:47:38 UTC ++++ libgcc/unwind-dw2-fde-dip.c +@@ -59,13 +59,13 @@ + + #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ + && defined(TARGET_DL_ITERATE_PHDR) \ +- && defined(__linux__) ++ && (defined(__linux__) || defined(__FreeBSD__)) + # define USE_PT_GNU_EH_FRAME + #endif + + #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ + && defined(TARGET_DL_ITERATE_PHDR) \ +- && (defined(__DragonFly__) || defined(__FreeBSD__)) ++ && defined(__DragonFly__) + # define ElfW __ElfN + # define USE_PT_GNU_EH_FRAME + #endif