The package rpms/webkit2gtk3.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/webkit2gtk3.git/commit/?id=cfa354....
Change:
-%ifarch s390x %{power64}
Thanks.
Full change:
============
commit cfa354c5e1a2f12d83862057d904748e31275e8d
Author: Eike Rathke <erack(a)redhat.com>
Date: Fri Nov 29 01:13:25 2019 +0100
No arch-specific Patch...
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index a8436ed..badc20d 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -18,10 +18,8 @@ Source0:
http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
Patch0: user-agent-branding.patch
# Don't use the shebang, but point straight to python 3
Patch1: no-env-shebang.patch
-%ifarch s390x %{power64}
# Implementation for GCC non-x86/arm not available, use default fallback.
Patch2: workaround-JSVALUE64-architecture.patch
-%endif
BuildRequires: bison
BuildRequires: bubblewrap
diff --git a/workaround-JSVALUE64-architecture.patch
b/workaround-JSVALUE64-architecture.patch
index a7ba3b3..bde8e02 100644
--- a/workaround-JSVALUE64-architecture.patch
+++ b/workaround-JSVALUE64-architecture.patch
@@ -1,29 +1,31 @@
----
webkitgtk-2.27.3/Source/JavaScriptCore/heap/GCMemoryOperations.h.JSVALUE64-architecture 2019-11-18
09:38:36.000000000 +0100
-+++ webkitgtk-2.27.3/Source/JavaScriptCore/heap/GCMemoryOperations.h 2019-11-28
22:57:42.627998747 +0100
-@@ -53,7 +53,7 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst,
- bitwise_cast<volatile uint64_t*>(dst)[i] = bitwise_cast<volatile
uint64_t*>(src)[i];
- };
-
--#if COMPILER(GCC_COMPATIBLE) && USE(JSVALUE64)
-+#if COMPILER(GCC_COMPATIBLE) && USE(JSVALUE64) && 0
- if (bytes <= smallCutoff)
- slowPathForwardMemcpy();
- else if (isARM64() || bytes <= mediumCutoff) {
-@@ -168,7 +168,7 @@ ALWAYS_INLINE void gcSafeMemmove(T* dst,
- bitwise_cast<volatile uint64_t*>(dst)[i] = bitwise_cast<volatile
uint64_t*>(src)[i];
- };
-
--#if COMPILER(GCC_COMPATIBLE)
-+#if COMPILER(GCC_COMPATIBLE) && 0
- if (bytes <= smallCutoff)
- slowPathBackwardsMemmove();
- else {
-@@ -255,7 +255,7 @@ ALWAYS_INLINE void gcSafeZeroMemory(T* d
- static_assert(sizeof(T) == sizeof(JSValue));
- RELEASE_ASSERT(bytes % 8 == 0);
- #if USE(JSVALUE64)
--#if COMPILER(GCC_COMPATIBLE)
-+#if COMPILER(GCC_COMPATIBLE) && 0
- #if CPU(X86_64)
- uint64_t zero = 0;
+---
webkitgtk-2.27.3/Source/JavaScriptCore/heap/GCMemoryOperations.h.workaround-JSVALUE64-architecture 2019-11-18
09:38:36.000000000 +0100
++++ webkitgtk-2.27.3/Source/JavaScriptCore/heap/GCMemoryOperations.h 2019-11-29
01:11:13.259302751 +0100
+@@ -122,7 +122,7 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst,
+ : "d0", "d1", "memory"
+ );
+ #else
+-#error "Unknown architecture."
++ slowPathForwardMemcpy();
+ #endif // CPU(X86_64)
+ } else {
+ RELEASE_ASSERT(isX86_64());
+@@ -238,7 +238,7 @@ ALWAYS_INLINE void gcSafeMemmove(T* dst,
+ : "d0", "d1", "memory"
+ );
+ #else
+-#error "Unknown architecture."
++ slowPathBackwardsMemmove();
+ #endif // CPU(X86_64)
+ }
+ #else
+@@ -296,7 +296,9 @@ ALWAYS_INLINE void gcSafeZeroMemory(T* d
+ : "d0", "d1", "memory"
+ );
+ #else
+-#error "Unknown architecture."
++ size_t count = bytes / 8;
++ for (size_t i = 0; i < count; ++i)
++ bitwise_cast<volatile uint64_t*>(dst)[i] = 0;
+ #endif // CPU(X86_64)
+ #else
size_t count = bytes / 8;