From bb3129053309d15eb0d4c3c9832c5b68dbb23759 Mon Sep 17 00:00:00 2001 From: Hailiang Date: Tue, 11 Mar 2025 17:43:29 +0800 Subject: [PATCH 1/2] add sw_64 support for qt5-qtwebkit --- 0001-add-sw_64-support.patch | 78 ++++++++++++++++++++++++++++++++++++ qt5-qtwebkit.spec | 8 +++- 2 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 0001-add-sw_64-support.patch diff --git a/0001-add-sw_64-support.patch b/0001-add-sw_64-support.patch new file mode 100644 index 0000000..08ee698 --- /dev/null +++ b/0001-add-sw_64-support.patch @@ -0,0 +1,78 @@ +From bb3b9c2bb1dce64799c3022d4a9c0d74590fef79 Mon Sep 17 00:00:00 2001 +From: mahailiang +Date: Sun, 10 Nov 2024 21:31:15 +0800 +Subject: [PATCH] add sw_64 support + +--- + CMakeLists.txt | 2 ++ + Source/JavaScriptCore/CMakeLists.txt | 1 + + Source/WTF/wtf/Platform.h | 7 ++++++- + Source/WTF/wtf/dtoa/utils.h | 2 +- + 4 files changed, 10 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..407e675 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -173,6 +173,10 @@ + #define WTF_CPU_LOONGARCH64 1 + #endif + ++#if defined(__sw_64__) || defined(__sw_64) || defined(sw_64__) ++#define WTF_CPU_SW_64 1 ++#endif ++ + /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */ + #if defined(__x86_64__) \ + || defined(_M_X64) +@@ -718,7 +722,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.20.1 + diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 0a876ca..03f4abf 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -18,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 11 +Release: 12 Summary: Qt5 - QtWebKit components License: LGPL-2.0-or-later and BSD-2-Clause @@ -42,6 +42,7 @@ Patch10: qtwebkit-fix-build-gcc14.patch Patch11: qt5-webkit-icu75.patch Patch12: qtwebkit-5.212.0-json.patch Patch13: qtwebkit-5.212.0-icu76.patch +Patch14: 0001-add-sw_64-support.patch BuildRequires: bison BuildRequires: cmake @@ -169,7 +170,7 @@ CXXFLAGS="${CXXFLAGS:-%optflags} -fpermissive" ; export CXXFLAGS ; -DECM_MKSPECS_INSTALL_DIR=%{_qt5_archdatadir}/mkspecs/modules \ -DQML_INSTALL_DIR=%{_qt5_archdatadir}/qml \ -DKDE_INSTALL_INCLUDEDIR=%{_qt5_headerdir} \ -%ifarch s390 s390x ppc %{power64} loongarch64 riscv64 +%ifarch s390 s390x ppc %{power64} loongarch64 riscv64 sw_64 -DENABLE_JIT=OFF \ -DUSE_SYSTEM_MALLOC=ON \ %endif @@ -245,6 +246,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Tue Mar 11 2025 mahailiang - 5.212.0-12 +- add sw_64 support for qt5-qtwebkit + * Mon Dec 09 2024 Funda Wang - 5.212.0-11 - disable LTO build - adopt to new cmake macro -- Gitee From 26cf870cbd6f79761869246184e232521a33ebb1 Mon Sep 17 00:00:00 2001 From: Hailiang Date: Tue, 11 Mar 2025 09:44:45 +0000 Subject: [PATCH 2/2] update qt5-qtwebkit.spec. Signed-off-by: Hailiang --- qt5-qtwebkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 03f4abf..29b91b8 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -42,7 +42,7 @@ Patch10: qtwebkit-fix-build-gcc14.patch Patch11: qt5-webkit-icu75.patch Patch12: qtwebkit-5.212.0-json.patch Patch13: qtwebkit-5.212.0-icu76.patch -Patch14: 0001-add-sw_64-support.patch +Patch14: 0001-add-sw_64-support.patch BuildRequires: bison BuildRequires: cmake -- Gitee