From nobody Thu May 22 15:28:46 2025 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 4b3Byl3Kjtz5wpN9; Thu, 22 May 2025 15:28:47 +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 4b3Byk68c8z3Rk9; Thu, 22 May 2025 15:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747927726; 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=jrmC2y6CySAJbusyPGFG63ntc4XyNTgmGxn3dFnNkiQ=; b=D6sVUDMFYMKwEFtGWZZHcv4wT9OvndFxLJGSIEUsiD/X7s5+qcvYv4SKiRS7kH3OT7DN8t J5coASfMESwCZO+j/V8wp3f1JavT56gdNRSa1EmaG3YqvBg2NiF3QPUWjoxzGm90FjT8Gi pCk+tTxqg/PW2pCLQ3bWRoYjJDQJ8JyZzBwdxo2IC4RnH4EAZGdj6EJ6fxXiNPnohpH3h4 hi2Z9WmklMDHuvcEJf+SqaigDXxowuT4vC3SWbYbrb/DnOnq7tdB1TnxRTNTW/aA7y1hPP YLPlbbFjyVS1t1dOlsYT9q4oL8U3L18TFzF6B1fBkkItl49krSbqz+ddJZCO3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747927726; 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=jrmC2y6CySAJbusyPGFG63ntc4XyNTgmGxn3dFnNkiQ=; b=oIDM3dz0lRH/bdN7JImzF4XM4Mf6dYsN+MmTua/QD7sPkttRWIPLoIbr/AfYj7PiJ2XrhH buww9iQ0uphfdVn0jFU4nFY5UDYBRudoQK3girnkLgZ8y8uFWjuAx9veA1UitO4xxI+Fb4 ObFVR3Lsnliqy0Gr9Q7BOip6pfKFTKgK/Cjmv51wY3XGFVYdjnGT7CvwXQIpDtbcAGPE+N TqjPXXmts3vElD+3jvTWrJfD/tWOB/+fIEZgNlLQSJESe3uShYp77dz3y0JIByDA/BPRo4 QkINy363pDtWrLNj/fmxZn+ifS+zfpvDU3+jh7yjhW2io2vHAGzBp+Qtz1ZFQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747927726; a=rsa-sha256; cv=none; b=OfgkfVVhsxhb4DjOQ/YT2kH9Xwlyxl8k1x/EMdUk8x8CEUNFBJi/NiMrezBX2MUzklbSoV t8yrZZXmN5B2D4VYF0ormbiGTgxtLdSFJXzVTT2YCxuOPWkloH/W8EEDf+hbGH3FGukb3m azz1g3GEf2VL/ct8JyMTwPjCTxq5CHoAq+YP40NGbHjrd0c40OR0F9bmPpLXyecuPTSEgp xg+nl0BCszP3PIjpExBSVyMzXLw1qpXUQaE4b3d3b/eh8d+/TSXc+sU0sUUjgV8anppVq3 dctsqaHVc9lMr17s1F4kTeSDQvsKB/02xGTydiLSLN0h39+AhCT9kqrrYvanmw== 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 4b3Byk5fytzB72; Thu, 22 May 2025 15:28:46 +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 54MFSkcF010066; Thu, 22 May 2025 15:28:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54MFSk1h010063; Thu, 22 May 2025 15:28:46 GMT (envelope-from git) Date: Thu, 22 May 2025 15:28:46 GMT Message-Id: <202505221528.54MFSk1h010063@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: 1a30d52dd1d6 - main - lang/gcc15-devel: Unbreak on aarch64 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 1a30d52dd1d6174e42c42dbbc4bed624c7c122cb Auto-Submitted: auto-generated The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=1a30d52dd1d6174e42c42dbbc4bed624c7c122cb commit 1a30d52dd1d6174e42c42dbbc4bed624c7c122cb Author: Lorenzo Salvadore AuthorDate: 2025-05-16 16:12:36 +0000 Commit: Lorenzo Salvadore CommitDate: 2025-05-22 15:27:54 +0000 lang/gcc15-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/gcc15-devel/Makefile | 1 + .../files/patch-libgcc_unwind-dw2-fde-dip.c | 23 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/lang/gcc15-devel/Makefile b/lang/gcc15-devel/Makefile index 20158b2696b5..d893884a86e4 100644 --- a/lang/gcc15-devel/Makefile +++ b/lang/gcc15-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= gcc PORTVERSION= 15.1.1.s20250510 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc15-devel/files/patch-libgcc_unwind-dw2-fde-dip.c b/lang/gcc15-devel/files/patch-libgcc_unwind-dw2-fde-dip.c new file mode 100644 index 000000000000..66452b37de0f --- /dev/null +++ b/lang/gcc15-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