Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Sep 2019 18:47:58 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r351883 - projects/clang900-import/contrib/libunwind/src
Message-ID:  <201909051847.x85IlwjV070935@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Thu Sep  5 18:47:58 2019
New Revision: 351883
URL: https://svnweb.freebsd.org/changeset/base/351883

Log:
  Catch up our non-upstreamed riscv parts in libunwind:
  * DEFINE_LIBUNWIND_PRIVATE_FUNCTION changed into
    DEFINE_LIBUNWIND_FUNCTION
  * unw_getcontext changed into __unw_getcontext

Modified:
  projects/clang900-import/contrib/libunwind/src/UnwindRegistersRestore.S
  projects/clang900-import/contrib/libunwind/src/UnwindRegistersSave.S

Modified: projects/clang900-import/contrib/libunwind/src/UnwindRegistersRestore.S
==============================================================================
--- projects/clang900-import/contrib/libunwind/src/UnwindRegistersRestore.S	Thu Sep  5 18:19:51 2019	(r351882)
+++ projects/clang900-import/contrib/libunwind/src/UnwindRegistersRestore.S	Thu Sep  5 18:47:58 2019	(r351883)
@@ -817,7 +817,7 @@ DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind14Registers_or1
 //  thread_state pointer is in a0
 //
   .p2align 2
-DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind15Registers_riscv6jumptoEv)
+DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind15Registers_riscv6jumptoEv)
 #ifdef __riscv_float_abi_double
   fld    f0, (8 * 32 + 8 * 0)(a0)
   fld    f1, (8 * 32 + 8 * 1)(a0)

Modified: projects/clang900-import/contrib/libunwind/src/UnwindRegistersSave.S
==============================================================================
--- projects/clang900-import/contrib/libunwind/src/UnwindRegistersSave.S	Thu Sep  5 18:19:51 2019	(r351882)
+++ projects/clang900-import/contrib/libunwind/src/UnwindRegistersSave.S	Thu Sep  5 18:47:58 2019	(r351883)
@@ -557,7 +557,7 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
 #elif defined(__ppc__)
 
 //
-// extern int unw_getcontext(unw_context_t* thread_state)
+// extern int __unw_getcontext(unw_context_t* thread_state)
 //
 // On entry:
 //  thread_state pointer is in r3
@@ -948,12 +948,12 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
 #elif defined(__riscv)
 
 #
-# extern int unw_getcontext(unw_context_t* thread_state)
+# extern int __unw_getcontext(unw_context_t* thread_state)
 #
 # On entry:
 #  thread_state pointer is in a0
 #
-DEFINE_LIBUNWIND_FUNCTION(unw_getcontext)
+DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
   // x0 is zero
   sd    x1, (8 * 1)(a0)
   sd    x2, (8 * 2)(a0)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909051847.x85IlwjV070935>