From owner-svn-src-all@freebsd.org Mon Dec 16 14:08:50 2019 Return-Path: Delivered-To: svn-src-all@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 C6DF81E504D; Mon, 16 Dec 2019 14:08:50 +0000 (UTC) (envelope-from mmel@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 47c36B4wKCz3LwS; Mon, 16 Dec 2019 14:08:50 +0000 (UTC) (envelope-from mmel@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 9F9D226595; Mon, 16 Dec 2019 14:08:50 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBGE8oqQ029503; Mon, 16 Dec 2019 14:08:50 GMT (envelope-from mmel@FreeBSD.org) Received: (from mmel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBGE8npu029498; Mon, 16 Dec 2019 14:08:49 GMT (envelope-from mmel@FreeBSD.org) Message-Id: <201912161408.xBGE8npu029498@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmel set sender to mmel@FreeBSD.org using -f From: Michal Meloun Date: Mon, 16 Dec 2019 14:08:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355803 - in head: contrib/libunwind/src lib/libgcc_s lib/libgcc_s/arm X-SVN-Group: head X-SVN-Commit-Author: mmel X-SVN-Commit-Paths: in head: contrib/libunwind/src lib/libgcc_s lib/libgcc_s/arm X-SVN-Commit-Revision: 355803 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2019 14:08:50 -0000 Author: mmel Date: Mon Dec 16 14:08:49 2019 New Revision: 355803 URL: https://svnweb.freebsd.org/changeset/base/355803 Log: Fix LLVM libunwnwind _Unwind_Backtrace symbol version for ARM. In original GNU libgcc, _Unwind_Backtrace is published with GCC_3.3 version for all architectures but ARM. For ARM should be publishes with GCC_4.3.0 version. This was originally omitted in r255095, fixed in r318024 and omitted aging in LLVM libunwind implementation in r354347. For ARM _Unwind_Backtrace should be published as default with GCC_4.3.0 version , (because this is right original version) and again as normal(not-default) with GCC_3.3 version (to maintain ABI compatibility compiled/linked with wrong pre r318024 libgcc) PR: 233664 Added: head/lib/libgcc_s/SymbolDefault.map (contents, props changed) Modified: head/contrib/libunwind/src/UnwindLevel1-gcc-ext.c head/lib/libgcc_s/Makefile head/lib/libgcc_s/Symbol.map head/lib/libgcc_s/arm/Symbol.map Modified: head/contrib/libunwind/src/UnwindLevel1-gcc-ext.c ============================================================================== --- head/contrib/libunwind/src/UnwindLevel1-gcc-ext.c Mon Dec 16 13:32:06 2019 (r355802) +++ head/contrib/libunwind/src/UnwindLevel1-gcc-ext.c Mon Dec 16 14:08:49 2019 (r355803) @@ -182,8 +182,8 @@ _Unwind_Backtrace(_Unwind_Trace_Fn callback, void *ref } } #ifdef __arm__ -/* Preserve legacy libgcc ARM ABI mistake. */ -__sym_compat(_Unwind_Backtrace, _Unwind_Backtrace, GCC_4.3.0); +/* Preserve legacy libgcc (pre r318024) ARM ABI mistake */ +__sym_compat(_Unwind_Backtrace, _Unwind_Backtrace, GCC_3.3); #endif Modified: head/lib/libgcc_s/Makefile ============================================================================== --- head/lib/libgcc_s/Makefile Mon Dec 16 13:32:06 2019 (r355802) +++ head/lib/libgcc_s/Makefile Mon Dec 16 14:08:49 2019 (r355803) @@ -18,6 +18,8 @@ SYMBOL_MAPS= ${.CURDIR}/Symbol.map # Export ARM AEABI unwind routines needed by libc and libthr. .if exists(${.CURDIR}/${MACHINE_CPUARCH}/Symbol.map) SYMBOL_MAPS+= ${.CURDIR}/${MACHINE_CPUARCH}/Symbol.map +.else +SYMBOL_MAPS+= ${.CURDIR}/SymbolDefault.map .endif .endif Modified: head/lib/libgcc_s/Symbol.map ============================================================================== --- head/lib/libgcc_s/Symbol.map Mon Dec 16 13:32:06 2019 (r355802) +++ head/lib/libgcc_s/Symbol.map Mon Dec 16 14:08:49 2019 (r355803) @@ -86,7 +86,6 @@ GCC_3.0 { }; GCC_3.3 { - _Unwind_Backtrace; _Unwind_FindEnclosingFunction; _Unwind_GetCFA; _Unwind_Resume_or_Rethrow; Added: head/lib/libgcc_s/SymbolDefault.map ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libgcc_s/SymbolDefault.map Mon Dec 16 14:08:49 2019 (r355803) @@ -0,0 +1,7 @@ +/* + * $FreeBSD$ + */ +/* _Unwind_Backtrace should be exported with different version on ARM */ +GCC_3.3 { + _Unwind_Backtrace; +}; Modified: head/lib/libgcc_s/arm/Symbol.map ============================================================================== --- head/lib/libgcc_s/arm/Symbol.map Mon Dec 16 13:32:06 2019 (r355802) +++ head/lib/libgcc_s/arm/Symbol.map Mon Dec 16 14:08:49 2019 (r355803) @@ -10,3 +10,7 @@ GCC_3.5 { __aeabi_unwind_cpp_pr2; __gnu_unwind_frame; }; + +GCC_4.3.0 { + _Unwind_Backtrace; +};