From nobody Sat Apr 20 10:35:00 2024 X-Original-To: dev-commits-src-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 4VM7F11rc0z5HWhv; Sat, 20 Apr 2024 10:35:01 +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 4VM7F01lDzz4TNr; Sat, 20 Apr 2024 10:35:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609300; 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=XARSFNvQjGMDjtWPZPJNqIXDSuPRr4NcQ3ie39T+aBo=; b=F59MlhDhuiqyIZILOXDscyDZqss+EHxZgeVDCMftJvwKCLQ4o5z8pw3kt7OP1y1Lrm6MLA fwqqxhxEyWOpX20iPYp+/3y8ej2bBr3KOqYVYSLRUjHZF+sUGgR9snEjWqYeDqVjawVBed B4WdW+qwOTtq60LVfUZaJr7pYgDXx9zGHfJs8HNz4EefTir62wazebNHX/9hxnmxyoGGz8 tCiZc8gZJWWJYxWuYi8jE+4/mkbyiiaeypdTdlPuirSClk6A/8UiZP+IE0fXkRmbFtB6YS fcZbw2iHzLtWSFBtR4qPsts3nOCjCjuRyT78r6S40iD6t1af3yM0s6G+R2waKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713609300; a=rsa-sha256; cv=none; b=skNkosVK9DbJZjj5OphLHejUQpQJRhw6r/9cMo5c6Q2xgay/46en4J23l0dhQs+OLb0HZr /LHeBo5YLNTEuGfqbrSPs5RkSLElJVQnpUHTpmvXu5OEgKW+DRmkFIz8N8hGQbAsB5eVqZ cXcsmgRYc0FgK3UUEu8DMHnwwgSf78m/UOvXq7GGUr8eifm52RSx/jO1RbThUaScQVKmSE kqooMsmOU+yvKdf6h0YtKaDOw83jEqHlLwwrpvgQFHIUXJy6tkEL8lnykg+BX/+B8Ia5I9 B9z0lD6aBx3FmLS5V1YNN+dODt4YpbujhjNAB5oUMJG4bMZaYb9QsvpPSxZRcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609300; 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=XARSFNvQjGMDjtWPZPJNqIXDSuPRr4NcQ3ie39T+aBo=; b=BE+RHg1jtu/4LDuV/WCuuvMAtqfLnJO0dwVJZ1JSUJjYDSjivX8ZBS53k149QYklWlV/7K GeWAXbZpnrCX2uTrnnPVJxl5aBkQi72QMG6S9jSEFujDFCX7c/9urkitonMcy2PqdHkAJS B+rcbXzczaTFM8O6vWfXA/1u/8spDh7zs7pVAPpLODa53M9ekRdnUDrYmAkhk4Gs/2YQQQ Q9q97lGtv//vBGcIw+jGDhe0qTUekjBzUuZsu3DsrvUhgrhZwKU2I+5VvEYT46rwK+KPIF qQBUuMCZfbUJHSQCKXUeqnLp1uMsmZGbMKfyjZzbWcJza/O6zpmIzbORaIoJ4w== 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 4VM7F01Mh5zYkp; Sat, 20 Apr 2024 10:35:00 +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 43KAZ0vc014880; Sat, 20 Apr 2024 10:35:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KAZ0Vc014877; Sat, 20 Apr 2024 10:35:00 GMT (envelope-from git) Date: Sat, 20 Apr 2024 10:35:00 GMT Message-Id: <202404201035.43KAZ0Vc014877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 82d22a88c340 - stable/13 - libgcc_{eh,s}: restore __*_frame_info symbols post llvm18 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 82d22a88c340b83ef47a5499935b6033e898ff58 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=82d22a88c340b83ef47a5499935b6033e898ff58 commit 82d22a88c340b83ef47a5499935b6033e898ff58 Author: Brooks Davis AuthorDate: 2024-04-19 21:45:05 +0000 Commit: Dimitry Andric CommitDate: 2024-04-20 10:29:10 +0000 libgcc_{eh,s}: restore __*_frame_info symbols post llvm18 The upstream llvm commit 5eb44df1b64d made the addition of these GCC compatability symbols dependent on build configuration rather than hardcoded for amd64, i386, and powerpc. Reenable them. Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D44877 (cherry picked from commit 0b9e3585805e83718c3ebdab923aca51597193cd) --- lib/libgcc_eh/Makefile.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc index 4b93c139522a..9832b1a8c4e5 100644 --- a/lib/libgcc_eh/Makefile.inc +++ b/lib/libgcc_eh/Makefile.inc @@ -17,6 +17,9 @@ SRCS_EXC+= UnwindRegistersSave.S SRCS_EXC+= libunwind.cpp SRCS+= ${SRCS_EXC} +.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || ${MACHINE} == "powerpc" +CFLAGS.UnwindLevel1-gcc-ext.c+= -D_LIBUNWIND_SUPPORT_FRAME_APIS +.endif .for file in ${SRCS_EXC:M*.c} CFLAGS.${file}+= -fno-exceptions -funwind-tables .endfor