Date: Mon, 28 Oct 2019 09:25:26 +0000 (UTC) From: Kai Knoblich <kai@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r515850 - head/www/qt5-webengine/files Message-ID: <201910280925.x9S9PQKV072450@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kai Date: Mon Oct 28 09:25:26 2019 New Revision: 515850 URL: https://svnweb.freebsd.org/changeset/ports/515850 Log: www/qt5-webengine: Restore patches required for armv7 * Copy two patches back that are relevant for armv7 from r515730 (= revision prior the update to 5.13.0). Both files were introduced in r497877 and should have been left untouched by the update. * Not bumping PORTREVISION because only armv7 related code has changed and it's not yet known if the port can be built successfully on that platform since www/qt5-webengine was updated to 5.13.0. Approved by: tcberner (kde) Differential Revision: https://reviews.freebsd.org/D22166 Added: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc - copied unchanged from r515730, head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_libsampler_sampler.cc - copied unchanged from r515730, head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_libsampler_sampler.cc Copied: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc (from r515730, head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc Mon Oct 28 09:25:26 2019 (r515850, copy of r515730, head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-freebsd.cc) @@ -0,0 +1,50 @@ +--- src/3rdparty/chromium/v8/src/base/platform/platform-freebsd.cc.orig 2019-01-16 10:59:47 UTC ++++ src/3rdparty/chromium/v8/src/base/platform/platform-freebsd.cc +@@ -86,5 +86,47 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib + + void OS::SignalCodeMovingGC() {} + ++#ifdef __arm__ ++ ++bool OS::ArmUsingHardFloat() { ++// GCC versions 4.6 and above define __ARM_PCS or __ARM_PCS_VFP to specify ++// the Floating Point ABI used (PCS stands for Procedure Call Standard). ++// We use these as well as a couple of other defines to statically determine ++// what FP ABI used. ++// GCC versions 4.4 and below don't support hard-fp. ++// GCC versions 4.5 may support hard-fp without defining __ARM_PCS or ++// __ARM_PCS_VFP. ++ ++#define GCC_VERSION \ ++ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) ++#if GCC_VERSION >= 40600 && !defined(__clang__) ++#if defined(__ARM_PCS_VFP) ++ return true; ++#else ++ return false; ++#endif ++ ++#elif GCC_VERSION < 40500 && !defined(__clang__) ++ return false; ++ ++#else ++#if defined(__ARM_PCS_VFP) ++ return true; ++#elif defined(__ARM_PCS) || defined(__SOFTFP__) || defined(__SOFTFP) || \ ++ !defined(__VFP_FP__) ++ return false; ++#else ++#error \ ++ "Your version of compiler does not report the FP ABI compiled for." \ ++ "Please report it on this issue" \ ++ "http://code.google.com/p/v8/issues/detail?id=2140" ++ ++#endif ++#endif ++#undef GCC_VERSION ++} ++ ++#endif // def __arm__ ++ + } // namespace base + } // namespace v8 Copied: head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_libsampler_sampler.cc (from r515730, head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_libsampler_sampler.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_libsampler_sampler.cc Mon Oct 28 09:25:26 2019 (r515850, copy of r515730, head/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_libsampler_sampler.cc) @@ -0,0 +1,15 @@ +--- src/3rdparty/chromium/v8/src/libsampler/sampler.cc.orig 2019-01-16 10:59:47 UTC ++++ src/3rdparty/chromium/v8/src/libsampler/sampler.cc +@@ -550,9 +550,9 @@ void SignalHandler::FillRegisterState(void* context, R + state->sp = reinterpret_cast<void*>(mcontext.mc_rsp); + state->fp = reinterpret_cast<void*>(mcontext.mc_rbp); + #elif V8_HOST_ARCH_ARM +- state->pc = reinterpret_cast<void*>(mcontext.mc_r15); +- state->sp = reinterpret_cast<void*>(mcontext.mc_r13); +- state->fp = reinterpret_cast<void*>(mcontext.mc_r11); ++ state->pc = reinterpret_cast<void*>(mcontext.__gregs[_REG_PC]); ++ state->sp = reinterpret_cast<void*>(mcontext.__gregs[_REG_SP]); ++ state->fp = reinterpret_cast<void*>(mcontext.__gregs[_REG_FP]); + #endif // V8_HOST_ARCH_* + #elif V8_OS_NETBSD + #if V8_HOST_ARCH_IA32
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910280925.x9S9PQKV072450>