From owner-svn-src-projects@freebsd.org Thu Aug 29 18:53:01 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1A621DD75B for ; Thu, 29 Aug 2019 18:53:01 +0000 (UTC) (envelope-from dim@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46KBZN6sB6z43pF; Thu, 29 Aug 2019 18:53:00 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CCFC124466; Thu, 29 Aug 2019 18:53:00 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7TIr0gq072261; Thu, 29 Aug 2019 18:53:00 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7TIr0Ix072260; Thu, 29 Aug 2019 18:53:00 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201908291853.x7TIr0Ix072260@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 29 Aug 2019 18:53:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r351610 - projects/clang900-import/contrib/libunwind/src X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: projects/clang900-import/contrib/libunwind/src X-SVN-Commit-Revision: 351610 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Aug 2019 18:53:01 -0000 Author: dim Date: Thu Aug 29 18:53:00 2019 New Revision: 351610 URL: https://svnweb.freebsd.org/changeset/base/351610 Log: Update libunwind custom frame register and deregister functions for FreeBSD: use the new doubly underscored names for unw_add_dynamic_fde and unw_remove_dynamic_fde. NOTE: this should be upstreamed... Modified: projects/clang900-import/contrib/libunwind/src/UnwindLevel1-gcc-ext.c Modified: projects/clang900-import/contrib/libunwind/src/UnwindLevel1-gcc-ext.c ============================================================================== --- projects/clang900-import/contrib/libunwind/src/UnwindLevel1-gcc-ext.c Thu Aug 29 18:23:38 2019 (r351609) +++ projects/clang900-import/contrib/libunwind/src/UnwindLevel1-gcc-ext.c Thu Aug 29 18:53:00 2019 (r351610) @@ -227,7 +227,7 @@ _LIBUNWIND_EXPORT uintptr_t _Unwind_GetIPInfo(struct _ #if defined(_LIBUNWIND_SUPPORT_DWARF_UNWIND) -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) // Based on LLVM's lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp // and XXX should be fixed to be alignment-safe. @@ -242,9 +242,9 @@ static void processFDE(const char *addr, bool isDeregi uint32_t offset = *((const uint32_t *)p); if (offset != 0) { if (isDeregister) - _unw_remove_dynamic_fde((unw_word_t)(uintptr_t)addr); + __unw_remove_dynamic_fde((unw_word_t)(uintptr_t)addr); else - _unw_add_dynamic_fde((unw_word_t)(uintptr_t)addr); + __unw_add_dynamic_fde((unw_word_t)(uintptr_t)addr); } addr = p + length; } @@ -265,9 +265,8 @@ _LIBUNWIND_EXPORT void __deregister_frame(const void * processFDE(addr, true); } +#else // defined(__FreeBSD__) -#else - /// Called by programs with dynamic code generators that want /// to register a dynamically generated FDE. /// This function has existed on Mac OS X since 10.4, but @@ -277,7 +276,6 @@ _LIBUNWIND_EXPORT void __register_frame(const void *fd __unw_add_dynamic_fde((unw_word_t)(uintptr_t)fde); } - /// Called by programs with dynamic code generators that want /// to unregister a dynamically generated FDE. /// This function has existed on Mac OS X since 10.4, but @@ -287,7 +285,7 @@ _LIBUNWIND_EXPORT void __deregister_frame(const void * __unw_remove_dynamic_fde((unw_word_t)(uintptr_t)fde); } -#endif +#endif // defined(__FreeBSD__) // The following register/deregister functions are gcc extensions. // They have existed on Mac OS X, but have never worked because Mac OS X