From nobody Sat Dec 25 11:55:31 2021 X-Original-To: dev-commits-src-branches@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 5B1C418F2BFB; Sat, 25 Dec 2021 11:55:32 +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 4JLj6q4zznz4l2C; Sat, 25 Dec 2021 11:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 369CD16CCB; Sat, 25 Dec 2021 11:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BPBtV5l006377; Sat, 25 Dec 2021 11:55:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BPBtVNq006376; Sat, 25 Dec 2021 11:55:31 GMT (envelope-from git) Date: Sat, 25 Dec 2021 11:55:31 GMT Message-Id: <202112251155.1BPBtVNq006376@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: c33e542eaa66 - stable/12 - Undefine HAVE_(DE)REGISTER_FRAME in llvm's config.h on arm List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: c33e542eaa66855bf73889568ed7c1ce50e83cd3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640433331; 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=nSioFCM2U2i4QrmNKdbw5pmfifGaZ91zYrERsdHrwWs=; b=yXIG7BIQWV7XtXz7o93wbn43aOPy1OAokfd4vsNJXA1NoG/3gVYfJ44wc6mG3wmyaKv1iM tpo7Ifa/Zu4qy0v+snDAova6DxGE0PzK2L/7tTUAK6ldvP+CFotuPxwSuPi/KJGStcDDEx Nb1YTdST2YisBbb0Evm22KqljYicbWYAkfRRtI9370XkhmcgdlGFW4qa5N7L3bbP8EVzB6 ygV927RzNegZu5XAptcg1ogOqYld1EXA8QPzuZQV6Xx7VXMHomlujA6lPEI2v3VK8pC+wc 16kTrqfKHz49VAtqJsONHZVFkqKwgbbb/xmVnaVdHGqyKTfadvLE4HaW3PUrjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640433331; a=rsa-sha256; cv=none; b=B9ENT7NOjlay2EtaRUtZNiWXKnRz6j/ZImH3H5F9NtJBPH+XTS7tiRJ97FHgXYV09d37Yv mUSRijZMhJ0cb9+T7KxPCm+SDCRsxsyHn5J+PSX5w0AfXgGqBNEkY5HZXd96T2uuQLZwP+ l1QJ0k4FOvK/lruLwc563Jyk/JEZEEkN2yf7dcXztppHoQpmuWxspBFBzK7iIdwEh7PQB6 NRHXhoVSIE+uDykIrlBJOEmuX+gttdeGnhHLv6YSuXI3JdUsQCqUKJZzVX3YVzsp8NvGVo Lg/mgUO8xmvTcW4Q9d55TLMaXCeceF1OXafTrlfCsOdsXDbUrExaYstXJdyOJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c33e542eaa66855bf73889568ed7c1ce50e83cd3 commit c33e542eaa66855bf73889568ed7c1ce50e83cd3 Author: Dimitry Andric AuthorDate: 2021-06-16 18:27:33 +0000 Commit: Dimitry Andric CommitDate: 2021-12-25 11:51:08 +0000 Undefine HAVE_(DE)REGISTER_FRAME in llvm's config.h on arm Otherwise, the lli tool (enable by WITH_CLANG_EXTRAS) won't link on arm, stating that __register_frame is undefined. This function is normally provided by libunwind, but explicitly not for the ARM Exception ABI. Reported by: oh PR: 255570 MFC after: 6 weeks (cherry picked from commit f336b45e943c7f9a90ffcea1a6c4c7039e54c73c) --- lib/clang/include/llvm/Config/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index d00cb511c9a8..ab8be211be67 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -59,11 +59,13 @@ /* Define if dladdr() is available on this platform. */ #define HAVE_DLADDR 1 +#if !defined(__arm__) || defined(__USING_SJLJ_EXCEPTIONS__) || defined(__ARM_DWARF_EH__) /* Define to 1 if we can register EH frames on this platform. */ #define HAVE_REGISTER_FRAME 1 /* Define to 1 if we can deregister EH frames on this platform. */ #define HAVE_DEREGISTER_FRAME 1 +#endif // !arm || USING_SJLJ_EXCEPTIONS || ARM_DWARF_EH_ /* Define to 1 if you have the header file. */ #define HAVE_ERRNO_H 1