Attachment 234500 Details for Bug 264506 – x11-toolkits/copperspice: fix build on armv6/armv7

[patch] x11-toolkits/copperspice: fix build on armv6/armv7

0001-x11-toolkits-copperspice-fix-build-on-armv7.patch (text/plain), 2.80 KB, created by Robert Clausecker on 2022-06-06 21:10:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2022-06-06 21:10:14 UTC

Size: 2.80 KB

patch

obsolete

>From 39654c5b45ad71893669023722620d0c2328b287 Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Sun, 5 Jun 2022 02:15:51 +0200
>Subject: [PATCH] x11-toolkits/copperspice: fix build on armv7
>
>---
> ...e_JavaScriptCore_jit_ExecutableAllocator.h | 27 +++++++++++++++++++
> .../files/patch-src_core_global_qglobal.h     | 19 +++++++++++++
> 2 files changed, 46 insertions(+)
> create mode 100644 x11-toolkits/copperspice/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_ExecutableAllocator.h
> create mode 100644 x11-toolkits/copperspice/files/patch-src_core_global_qglobal.h
>
>diff --git a/x11-toolkits/copperspice/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_ExecutableAllocator.h b/x11-toolkits/copperspice/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_ExecutableAllocator.h
>new file mode 100644
>index 000000000000..0045c5a8e6f3
>--- /dev/null
>+++ b/x11-toolkits/copperspice/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_ExecutableAllocator.h
>@@ -0,0 +1,27 @@
>+--- src/3rdparty/webkit/Source/JavaScriptCore/jit/ExecutableAllocator.h.orig	2022-06-05 21:14:42 UTC
>++++ src/3rdparty/webkit/Source/JavaScriptCore/jit/ExecutableAllocator.h
>+@@ -54,6 +54,10 @@
>+ #include <unistd.h>
>+ #endif
>+ 
>++#if OS(FREEBSD)
>++#include <machine/sysarch.h>
>++#endif
>++
>+ #if OS(WINCE)
>+ // From pkfuncs.h (private header file from the Platform Builder)
>+ #define CACHE_SYNC_ALL 0x07F
>+@@ -304,6 +308,13 @@ class ExecutableAllocator { (public)
>+             :
>+             : "r" (code), "r" (reinterpret_cast<char*>(code) + size)
>+             : "r0", "r1", "r2");
>++    }
>++#elif (CPU(ARM_TRADITIONAL) || CPU(ARM_THUMB2)) && OS(FREEBSD)
>++    static void cacheFlush(void *code, size_t size)
>++    {
>++        struct arm_sync_icache_args asia = { reinterpret_cast<uintptr_t>(code), size };
>++
>++        sysarch(ARM_SYNC_ICACHE, &asia);
>+     }
>+ #elif OS(WINCE)
>+     static void cacheFlush(void* code, size_t size)
>diff --git a/x11-toolkits/copperspice/files/patch-src_core_global_qglobal.h b/x11-toolkits/copperspice/files/patch-src_core_global_qglobal.h
>new file mode 100644
>index 000000000000..e3dc6e83a2df
>--- /dev/null
>+++ b/x11-toolkits/copperspice/files/patch-src_core_global_qglobal.h
>@@ -0,0 +1,19 @@
>+--- src/core/global/qglobal.h.orig	2022-06-04 14:31:11 UTC
>++++ src/core/global/qglobal.h
>+@@ -101,13 +101,13 @@
>+ 
>+ #   define Q_PROCESSOR_ARM_32
>+ 
>+-#   if defined(__ARM_ARCH_7__)
>++#   if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
>+ #      define Q_PROCESSOR_ARM      7
>+ #      define Q_PROCESSOR_ARM_V7
>+ 
>+-#   elif defined(__ARM_ARCH_6__)
>++#   elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6KZ__)
>+ #      define Q_PROCESSOR_ARM      6
>+-#      define Q_PROCESSOR_ARM_V8
>++#      define Q_PROCESSOR_ARM_V6
>+ 
>+ #   elif defined(__ARM_ARCH_5__)
>+ #      define Q_PROCESSOR_ARM      5
>-- 
>2.35.2
>

Flags:

fuz: maintainer-approval? (adridg)

Actions: View | Diff

Attachments on bug 264506: 234500