Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 22 Jul 2020 17:18:42 +0000 (UTC)
From:      Mikael Urankar <mikael@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r542880 - head/www/qt5-webengine/files
Message-ID:  <202007221718.06MHIgn6020857@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mikael
Date: Wed Jul 22 17:18:42 2020
New Revision: 542880
URL: https://svnweb.freebsd.org/changeset/ports/542880

Log:
  www/qt5-webengine: fix build on aarch64
  
  Use FreeBSD registers name
  
  Approved by:	portmgr (tier-2 blanket)

Modified:
  head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc

Modified: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc
==============================================================================
--- head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc	Wed Jul 22 17:18:33 2020	(r542879)
+++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc	Wed Jul 22 17:18:42 2020	(r542880)
@@ -31,9 +31,15 @@
    return base_address;
  }
  
-@@ -88,11 +99,19 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist
+@@ -84,15 +95,23 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist
+   registers.reserve(12);
+   // Return the set of callee-save registers per the ARM 64-bit Procedure Call
+   // Standard section 5.1.1, plus the stack pointer.
+-  registers.push_back(reinterpret_cast<uintptr_t*>(&thread_context->sp));
++  registers.push_back(reinterpret_cast<uintptr_t*>(&thread_context->mc_gpregs.gp_sp));
    for (size_t i = 19; i <= 29; ++i)
-     registers.push_back(reinterpret_cast<uintptr_t*>(&thread_context->regs[i]));
+-    registers.push_back(reinterpret_cast<uintptr_t*>(&thread_context->regs[i]));
++    registers.push_back(reinterpret_cast<uintptr_t*>(&thread_context->mc_gpregs.gp_x[i]));
    return registers;
 -#elif defined(ARCH_CPU_X86_64)  // #if defined(ARCH_CPU_ARM_FAMILY) &&
 -                                // defined(ARCH_CPU_32_BITS)

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