From nobody Fri Apr 19 21:56:19 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 4VLpPb1yWCz5HqGw; Fri, 19 Apr 2024 21:56:19 +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 4VLpPb1F37z4DD9; Fri, 19 Apr 2024 21:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713563779; 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=SY3mlAvjnU+ZmdGBdsrW3fM/M56OENzPa+Pn2nNvcmk=; b=EZP9NnnowPHIYC8JFHRHAFBZdB76kwIwWWOS3xSQJiSOVMxg/EF3y25K1jG06fYVBgKMJR ZuxJ0agul9Rk/kKjfpNLxQO/D5ctRm3OJySAAP32AaDOFgCbwe5UtiFlWsCJVErczp43ug mHqw2eIBGvwbR0+B14TIOA5vVAci+AlaSMB2GHoKAcaOBk5ip+CQKhzBB92kgt2mnDKD2l 2vkOccZpIznV9L6R4J/ppAn4x+yjnvSsq0hizq+hTS11ppaDeXbKPFe5hDlT4jg2XApZbO isnU6XgZaD9oQfkOzrWDybkdQCmmawxy0G+uAECce6sWBAfBCBmuKjrRdIBMuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713563779; a=rsa-sha256; cv=none; b=KJtXHCvVbcNtBDJKe44Fcdm3Ou7hB+/To8A6j/ZWsLjhY9xi5JMTtpaRDCshDr6kAb/5MO IoHlxGMtJr8aJk+l4yc+2V+3ote5rzYZwTJvdjy8kt83acyJ2yFRlAoMFvT3ly6D5mn5Kx dlK88PF3fFel7phHf6prn2TQMxRkmMdxv1eg5gyM3wz2lw7boV4uYc6Iw/J6zDUMsUOrzW pI8gVnx/NB03KrMksCN5e5rpFmvFbPDPr43JJKtFJMnlv395S0Zj6ARvR8AgQPc4bVgIR3 wY9lkO4IVT8O0FBjQ2l8fimd5MnC9bYS/WhCViDCB+IidHh5tZ0dFDfnDN/OiA== 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=1713563779; 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=SY3mlAvjnU+ZmdGBdsrW3fM/M56OENzPa+Pn2nNvcmk=; b=aR3B0MYf8cobrva3sb+Pq9NBru0L7MUxFk0kXIIunQKJxEFrMOOcNsR0bEQQcCBgvi2Ha3 EBf2ModYDLfTIZ/aafccU8Jscmu2B39Aph+uMXdZh98VZF5apH9V6+vCxT7/ExxJAqZzvS og0i0uXPEJ+9aP/wT7NE7CVIMpb+fyh6yBBhTuuj7ltSoZShgBgSJRKDZdXXLgaIyKhCuN nKVMx4uLxbhCYfrm8b0+VtYvFjDIzG45b3tWihhPO2X8FSVTpiSb1ilnoS4O/IyWwrX8p1 xsfQINyhwAZS35D32Q1djh9p7+zHAp7UcyAuK3xjePEM4pfhdaenxN3+QcUSnA== 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 4VLpPb0qs4z19C4; Fri, 19 Apr 2024 21:56:19 +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 43JLuJxb024645; Fri, 19 Apr 2024 21:56:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JLuJTD024642; Fri, 19 Apr 2024 21:56:19 GMT (envelope-from git) Date: Fri, 19 Apr 2024 21:56:19 GMT Message-Id: <202404192156.43JLuJTD024642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 0b9e3585805e - main - 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b9e3585805e83718c3ebdab923aca51597193cd Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0b9e3585805e83718c3ebdab923aca51597193cd commit 0b9e3585805e83718c3ebdab923aca51597193cd Author: Brooks Davis AuthorDate: 2024-04-19 21:45:05 +0000 Commit: Brooks Davis CommitDate: 2024-04-19 21:56:13 +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 --- 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"