diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 266c7cb..8bcd81f 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -62,7 +62,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.15.12 -Release: 9%{?dist} +Release: 9%{?dist}.1 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html diff --git a/qtwebengine-chromium-5.13.2-ppc64.patch b/qtwebengine-chromium-5.13.2-ppc64.patch index a0f8787..8ab40ef 100644 --- a/qtwebengine-chromium-5.13.2-ppc64.patch +++ b/qtwebengine-chromium-5.13.2-ppc64.patch @@ -17736,3 +17736,53 @@ index 00000000000..44d0533696e -- 2.21.1 +From c83ab15bd06a7ef578b172f3b11c206e2fd69cb3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Wed, 8 Jan 2020 19:13:00 +0100 +Subject: [PATCH] base/allocator: Use 64k page sizes on ppc64 + +--- + .../partition_allocator/page_allocator_constants.h | 6 +++++- + .../partition_allocator/partition_alloc_constants.h | 2 ++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/chromium/base/allocator/partition_allocator/page_allocator_constants.h b/chromium/base/allocator/partition_allocator/page_allocator_constants.h +index ac82360440f..44e62b24aef 100644 +--- a/chromium/base/allocator/partition_allocator/page_allocator_constants.h ++++ b/chromium/base/allocator/partition_allocator/page_allocator_constants.h +@@ -10,7 +10,7 @@ + #include "build/build_config.h" + + namespace base { +-#if defined(OS_WIN) ++#if defined(OS_WIN) || defined(ARCH_CPU_PPC64) + static constexpr size_t kPageAllocationGranularityShift = 16; // 64KB + #elif defined(_MIPS_ARCH_LOONGSON) + static constexpr size_t kPageAllocationGranularityShift = 14; // 16KB +@@ -26,6 +26,10 @@ static constexpr size_t kPageAllocationGranularityBaseMask = + + #if defined(_MIPS_ARCH_LOONGSON) + static constexpr size_t kSystemPageSize = 16384; ++#elif defined(ARCH_CPU_PPC64) ++// TODO: modern ppc64 can do 4k and 64k page sizes ++// for now, 64k is assumed ++static constexpr size_t kSystemPageSize = 65536; + #else + static constexpr size_t kSystemPageSize = 4096; + #endif +diff --git a/chromium/base/allocator/partition_allocator/partition_alloc_constants.h b/chromium/base/allocator/partition_allocator/partition_alloc_constants.h +index 474405f0ddb..a0ef9c30b4d 100644 +--- a/chromium/base/allocator/partition_allocator/partition_alloc_constants.h ++++ b/chromium/base/allocator/partition_allocator/partition_alloc_constants.h +@@ -35,6 +35,8 @@ static const size_t kBucketShift = (kAllocationGranularity == 8) ? 3 : 2; + + #if defined(_MIPS_ARCH_LOONGSON) + static const size_t kPartitionPageShift = 16; // 64 KiB ++#elif defined(ARCH_CPU_PPC64) ++static const size_t kPartitionPageShift = 18; // 256 KiB + #else + static const size_t kPartitionPageShift = 14; // 16 KiB + #endif +-- +2.21.1 +