packages/qt5-qtwebkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!36 [sync] PR-32: add sw_64 support for qt5-qtwebkit

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @weidongkl 
Signed-off-by: @weidongkl
This commit is contained in:
openeuler-ci-bot 2025-03-13 01:11:04 +00:00 committed by Gitee
commit a14a892b70
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 86 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qt5-qtwebkit.spec
View File

@ -16,7 +16,7 @@
Name: qt5-%{qt_module}
Version: 5.212.0
Release: 10
Release: 11
Summary: Qt5 - QtWebKit components
License: LGPL-2.0-or-later and BSD-2-Clause
@ -36,6 +36,7 @@ Patch7: webkit-offlineasm-warnings-ruby27.patch
Patch8: qtwebkit-cstdint.patch
Patch9: 0001-add-riscv64-support.patch
Patch10: qt5-webkit-add-sw64-support.patch
BuildRequires: bison
BuildRequires: cmake
@ -161,10 +162,10 @@ cmake . \
-DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
%ifarch s390 s390x ppc %{power64} loongarch64 riscv64
%ifarch s390 s390x ppc %{power64} loongarch64 riscv64 sw_64
-DENABLE_JIT=OFF \
%endif
%ifarch s390 s390x ppc %{power64} loongarch64 riscv64
%ifarch s390 s390x ppc %{power64} loongarch64 riscv64 sw_64
-DUSE_SYSTEM_MALLOC=ON \
%endif
%{?docs:-DGENERATE_DOCUMENTATION=ON} \
@ -243,6 +244,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)"
%changelog
* Wed Mar 05 2025 yueyuankun <yueyuankun@kylinos.cn> - 5.212.0-11
- add sw_64 support for qt5-qtwebkit
* Thu Sep 21 2023 Jingwiw <wangjingwei@iscas.ac.cn> - 5.212.0-10
- add riscv64 support for qt5-qtwebkit

79
qt5-webkit-add-sw64-support.patch Normal file
View File

@ -0,0 +1,79 @@
From 9b0212d104ca5b74965b51514347c36aa845cb1a Mon Sep 17 00:00:00 2001
From: yueyuankun <yueyuankun@kylinos.cn>
Date: Wed, 5 Mar 2025 15:45:41 +0800
Subject: [PATCH] add sw_64 support for qt5-webkit
---
CMakeLists.txt | 2 ++
Source/JavaScriptCore/CMakeLists.txt | 1 +
Source/WTF/wtf/Platform.h | 8 +++++++-
Source/WTF/wtf/dtoa/utils.h | 2 +-
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77687d3..d3f697a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,6 +92,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "loongarch64")
set(WTF_CPU_LOONGARCH64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64")
set(WTF_CPU_RISCV64 1)
+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sw_64")
+ set(WTF_CPU_SW_64 1)
else ()
message(FATAL_ERROR "Unknown CPU '${LOWERCASE_CMAKE_SYSTEM_PROCESSOR}'")
endif ()
diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
index ed35b54..b620948 100644
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -1291,6 +1291,7 @@ elseif (WTF_CPU_X86)
elseif (WTF_CPU_LOONGARCH64)
elseif (WTF_CPU_RISCV64)
elseif (WTF_CPU_X86_64)
+elseif (WTF_CPU_SW_64)
if (MSVC AND ENABLE_JIT)
add_custom_command(
OUTPUT ${DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 338fddc..3002ffb 100644
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -185,6 +185,11 @@
#define WTF_CPU_RISCV64 1
#endif
+/* CPU(SW_64) - SW_64 */
+#if defined(__sw_64)
+#define WTF_CPU_SW_64 1
+#endif
+
/* CPU(ARM64) - Apple */
#if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
#define WTF_CPU_ARM64 1
@@ -718,7 +723,8 @@
|| CPU(PPC64) \
|| CPU(PPC64LE) \
|| CPU(RISCV64) \
- || CPU(LOONGARCH64)
+ || CPU(LOONGARCH64) \
+ || CPU(SW_64)
#define USE_JSVALUE64 1
#else
#define USE_JSVALUE32_64 1
diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h
index b136162..6dc3843 100644
--- a/Source/WTF/wtf/dtoa/utils.h
+++ b/Source/WTF/wtf/dtoa/utils.h
@@ -49,7 +49,7 @@
defined(__ARMEL__) || \
defined(_MIPS_ARCH_MIPS32R2)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(LOONGARCH64) || CPU(RISCV64)
+#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(LOONGARCH64) || CPU(RISCV64) || CPU(SW_64)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__)
#if defined(_WIN32)
--
2.43.0