diff --git a/aarch64-page-size.patch b/aarch64-page-size.patch new file mode 100644 index 0000000..dfee197 --- /dev/null +++ b/aarch64-page-size.patch @@ -0,0 +1,16 @@ +diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h +index 8ff8443d0e25..2fa880a97d1d 100644 +--- a/Source/WTF/wtf/PageBlock.h ++++ b/Source/WTF/wtf/PageBlock.h +@@ -46,9 +46,9 @@ namespace WTF { + // Use 64 KiB for any unknown CPUs to be conservative. + #if OS(DARWIN) || PLATFORM(PLAYSTATION) || CPU(MIPS) || CPU(MIPS64) + constexpr size_t CeilingOnPageSize = 16 * KB; +-#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) ++#elif CPU(ARM64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) + constexpr size_t CeilingOnPageSize = 64 * KB; +-#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(RISCV64) ++#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(RISCV64) + constexpr size_t CeilingOnPageSize = 4 * KB; + #else + #error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture! diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 2c05966..f69060c 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -27,6 +27,10 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc # Created from http://hkps.pool.sks-keyservers.net/pks/lookup?op=get&search=0xF3D322D0EC4582C3 Source2: https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.gpg +# https://bugs.webkit.org/show_bug.cgi?id=217989 +# https://bugs.webkit.org/show_bug.cgi?id=227905 +Patch0: aarch64-page-size.patch + BuildRequires: bison BuildRequires: bubblewrap BuildRequires: cmake @@ -222,7 +226,8 @@ rm -rf Source/ThirdParty/qunit/ %endif %if 0%{?rhel} %ifarch aarch64 - -DUSE_64KB_PAGE_BLOCK=ON \ + -DENABLE_JIT=OFF \ + -DUSE_SYSTEM_MALLOC=ON \ %endif %endif %{nil} @@ -305,7 +310,7 @@ export NINJA_STATUS="[%f/%t][%e] " %endif %changelog -* Wed Sep 22 2021 Michael Catanzaro - 2.34.0-1 +* Wed Sep 29 2021 Michael Catanzaro - 2.34.0-1 - Update to 2.34.0 Related: #1985041 Resolves: #2006423