From nobody Sat Apr 20 10:32:53 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 4VM7BZ6Xk5z5HWMk; Sat, 20 Apr 2024 10:32:54 +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 4VM7BZ103Rz4Q6G; Sat, 20 Apr 2024 10:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713609174; 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=H98qYtYorjA5PrAkQbjxe9ix+BjhaD7zWtBfEnMFIa8=; b=X3Mb/Q8b8hDfAim8Y9jRO+2xlDkfC9ricBesD7h0wTFgOBWiYzBAsJ1QlDmiyClr5SpuPp +p1UmkG2XADQngYfx/s6ar8KZk2oLlEqb5n2H9yT/FRTZ9CYZRzbcnlyRJThaopP9nqRyK t7dd605AbFjUrSpPVEN/6QkVkJgLeEkAuO1mdXj7XrSk5sumfxhI3OeWV+PD9+1N3nucaO gzWzsGWs5fJZqqaBHWMMG9zKbcU/NY2tJoOP492MgEAZN49A0uDNQCqtD8yTGDOCYG0j3C aaK8MIBFjyXco5ZNDjNUzbnbUNEZnI3wBo85HNIWNKPr7r417xHgUPb4QkKxFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713609174; a=rsa-sha256; cv=none; b=HORk3yIKjej1FNAaW4guT9yYKvbzWI+LmH8edkKoW/4vm9259esT3esCIIyX4Ed8KjmFKQ /huyj/vvBw4aEQL+hRCA2fKJqb5uhTdmjXV7D+2yuUFt7o+VbWLu039XY685kZpJw5gqNm VzSVgRavxB2NoYEjySqliOc5EEb1XCPb+cXZACi1m4T8DbJXDEhH4J/n4ZlqvpGJeExNt8 y3ao7akHpWlWHTDXGW/FkoqInjRm4ifqqj0TBN++QGAx+MKZAmZN01sa3C8MNK2LKVJHrK 1Z2OxJBAWP+8rrC/26qs7MCaHBduTq1gTsvT8kKINFXwc+JnM7Sz1YGo8rWsBw== 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=1713609174; 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=H98qYtYorjA5PrAkQbjxe9ix+BjhaD7zWtBfEnMFIa8=; b=jqigvGsXg6LGaKzSSUNr6XnQf5uShoUkKWmKu6Jj7gS+bl3mZL2l3SdVUryTH4CSACkXCm Clk3mTf4pydHNDe3j9y32zYDl5LxVtlfWt48HdxKTVzsEHvfFSyjZ1LIhBC2KjNSJp6jDY mXMXIb46I4E8zDzsfhthw3njFltaxAmtPp4n7gxp5BSguA3DnmZQpwtgSfexIdTpBMR+5N cI2FxBXSdWaqMfw+crro1V6N81/iSvLbp4vOO/CFWSR1tPw08MEqJsBVajQnJ1Dn3Alr+T a6mLK+By356hgTC6I2nMGBbZZBdWuq2RSb8NVnVqgaSErIHqnwJuT+Cy5G2zDQ== 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 4VM7BZ0YyNzYqH; Sat, 20 Apr 2024 10:32:54 +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 43KAWru0012199; Sat, 20 Apr 2024 10:32:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KAWrFH012196; Sat, 20 Apr 2024 10:32:53 GMT (envelope-from git) Date: Sat, 20 Apr 2024 10:32:53 GMT Message-Id: <202404201032.43KAWrFH012196@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: a4f6bfe30406 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: a4f6bfe30406d2ec0050807c73a836d027ed4be5 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a4f6bfe30406d2ec0050807c73a836d027ed4be5 commit a4f6bfe30406d2ec0050807c73a836d027ed4be5 Author: Brooks Davis AuthorDate: 2024-04-19 21:45:05 +0000 Commit: Dimitry Andric CommitDate: 2024-04-20 10:04:35 +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 9e194cc875f1..75e7d743a720 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 .if ${MK_ASAN} != "no"