1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-12 18:59:50 +03:00
aports/community/qt6-qtwebengine/qt6-6.9.0.loongarch64.diff
Celeste e9d814f8e0 community/qt6-qtwebengine: fix "Unknown architecture: loongarch64" error
Upstream moved architecture detection from Functions.cmake to QtToolchainHelpers.cmake:
e68dbbc912

Patch-Source: 412c61b7f9
2025-07-10 14:18:50 +00:00

406 lines
21 KiB
Diff
Raw Permalink Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/cmake/QtToolchainHelpers.cmake b/cmake/QtToolchainHelpers.cmake
--- a/cmake/QtToolchainHelpers.cmake 2025-06-05 09:35:26.023000000 +0800
+++ b/cmake/QtToolchainHelpers.cmake 2025-06-05 09:43:01.504586590 +0800
@@ -55,6 +55,8 @@
set(${result} "mips64el" PARENT_SCOPE)
elseif(arch STREQUAL "riscv64")
set(${result} "riscv64" PARENT_SCOPE)
+ elseif(arch STREQUAL "loongarch64")
+ set(${result} "loong64" PARENT_SCOPE)
else()
message(FATAL_ERROR "Unknown architecture: ${arch}")
endif()
@@ -75,6 +77,8 @@
set(${result} "mipsel" PARENT_SCOPE)
elseif(hostArch STREQUAL "riscv64")
set(${result} "riscv32" PARENT_SCOPE)
+ elseif(arch STREQUAL "loongarch64")
+ set(${result} "loong64" PARENT_SCOPE)
elseif(hostArch IN_LIST list32)
set(${result} "${hostArch}" PARENT_SCOPE)
else()
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/3rdparty/chromium/base/process/launch.h b/src/3rdparty/chromium/base/process/launch.h
--- a/src/3rdparty/chromium/base/process/launch.h 2000-01-01 00:00:00.000000000 +0800
+++ b/src/3rdparty/chromium/base/process/launch.h 2000-01-01 00:00:00.000000000 +0800
@@ -51,7 +51,7 @@ namespace base {
// defined as a constant.
// These constants are borrowed from glibcs (arch)/bits/pthread_stack_min.h.
-#if defined(ARCH_CPU_ARM64)
+#if defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_LOONGARCH64)
#define PTHREAD_STACK_MIN_CONST \
(__builtin_constant_p(PTHREAD_STACK_MIN) ? PTHREAD_STACK_MIN : 131072)
#else
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni b/src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni
--- a/src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni 2000-01-01 00:00:00.000000000 +0800
+++ b/src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni 2000-01-01 00:00:00.000000000 +0800
@@ -351,6 +351,12 @@ template("single_gcc_toolchain") {
extra_ldflags = ""
}
+ if (current_cpu == "loong64") {
+ extra_cflags += " -mcmodel=medium"
+ extra_cxxflags += " -mcmodel=medium"
+ extra_ldflags += " -mno-relax"
+ }
+
if (system_headers_in_deps) {
md = "-MD"
} else {
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/3rdparty/chromium/components/metrics/debug/metrics_internals_utils.cc b/src/3rdparty/chromium/components/metrics/debug/metrics_internals_utils.cc
--- a/src/3rdparty/chromium/components/metrics/debug/metrics_internals_utils.cc 2000-01-01 00:00:00.000000000 +0800
+++ b/src/3rdparty/chromium/components/metrics/debug/metrics_internals_utils.cc 2000-01-01 00:00:00.000000000 +0800
@@ -69,6 +69,8 @@ std::string CpuArchitectureToString(
return "arm32";
case variations::Study::TRANSLATED_X86_64:
return "translated_x86_64";
+ case variations::Study::LOONGARCH64:
+ return "loongarch64";
}
NOTREACHED_IN_MIGRATION();
}
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/3rdparty/chromium/components/variations/proto/study.proto b/src/3rdparty/chromium/components/variations/proto/study.proto
--- a/src/3rdparty/chromium/components/variations/proto/study.proto 2000-01-01 00:00:00.000000000 +0800
+++ b/src/3rdparty/chromium/components/variations/proto/study.proto 2000-01-01 00:00:00.000000000 +0800
@@ -262,6 +262,8 @@ message Study {
// A Mac-only value, indicating an x86-64 binary running on an arm64 host
// via "Rosetta 2" binary translation.
TRANSLATED_X86_64 = 4;
+
+ LOONGARCH64 = 5;
}
// Enum to pass as optional bool.
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/3rdparty/chromium/components/variations/service/variations_field_trial_creator_base.cc b/src/3rdparty/chromium/components/variations/service/variations_field_trial_creator_base.cc
--- a/src/3rdparty/chromium/components/variations/service/variations_field_trial_creator_base.cc 2000-01-01 00:00:00.000000000 +0800
+++ b/src/3rdparty/chromium/components/variations/service/variations_field_trial_creator_base.cc 2000-01-01 00:00:00.000000000 +0800
@@ -106,6 +106,9 @@ Study::CpuArchitecture GetCurrentCpuArch
if (process_arch == "ARM") {
return Study::ARM32;
}
+ if (process_arch == "LOONGARCH_64") {
+ return Study::LOONGARCH64;
+ }
if (process_arch == "x86") {
return Study::X86_32;
}
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/3rdparty/chromium/skia/BUILD.gn b/src/3rdparty/chromium/skia/BUILD.gn
--- a/src/3rdparty/chromium/skia/BUILD.gn 2000-01-01 00:00:00.000000000 +0800
+++ b/src/3rdparty/chromium/skia/BUILD.gn 2000-01-01 00:00:00.000000000 +0800
@@ -169,7 +169,7 @@ config("skia_config") {
if (current_cpu == "loong64") {
cflags = [
"-mlsx",
- "-flax-vector-conversions=all",
+ "-flax-vector-conversions",
]
}
}
@@ -759,7 +759,7 @@ if (current_cpu == "loong64") {
sources = skia_opts.lasx_sources
cflags = [
"-mlasx",
- "-flax-vector-conversions=all",
+ "-flax-vector-conversions",
]
visibility = [ ":skia_opts" ]
}
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn b/src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn
--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn 2000-01-01 00:00:00.000000000 +0800
+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn 2000-01-01 00:00:00.000000000 +0800
@@ -1645,7 +1645,7 @@ jumbo_component("platform") {
if (current_cpu == "loong64") {
cflags = [
"-mlsx",
- "-flax-vector-conversions=all",
+ "-flax-vector-conversions",
]
}
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/cpu/loongarch64/webgl_image_conversion_lsx.h b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/cpu/loongarch64/webgl_image_conversion_lsx.h
--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/cpu/loongarch64/webgl_image_conversion_lsx.h 2000-01-01 00:00:00.000000000 +0800
+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/cpu/loongarch64/webgl_image_conversion_lsx.h 2000-01-01 00:00:00.000000000 +0800
@@ -91,19 +91,19 @@ ALWAYS_INLINE void PackOneRowOfRGBA8Litt
v4f32 mask_falpha = __lsx_vffint_s_w(mask_lalpha);
v16u8 ra_index = {0,19, 4,23, 8,27, 12,31};
for (unsigned i = 0; i < pixels_per_row_trunc; i += 4) {
- v16u8 bgra = *((__m128i*)(source));
+ __m128i bgra = *((__m128i*)(source));
//if A !=0, A=0; else A=0xFF
- v4f32 alpha_factor = __lsx_vseq_b(bgra, mask_zero);
+ __m128i alpha_factor = __lsx_vseq_b(bgra, mask_zero);
//if A!=0, A=A; else A=0xFF
alpha_factor = __lsx_vor_v(bgra, alpha_factor);
alpha_factor = __lsx_vsrli_w(alpha_factor, 24);
- alpha_factor = __lsx_vffint_s_w(alpha_factor);
- alpha_factor = __lsx_vfdiv_s(mask_falpha, alpha_factor);
+ alpha_factor = (__m128i) __lsx_vffint_s_w(alpha_factor);
+ alpha_factor = (__m128i) __lsx_vfdiv_s((__m128) mask_falpha, (__m128) alpha_factor);
- v16u8 component_r = __lsx_vand_v(bgra, mask_lalpha);
- component_r = __lsx_vffint_s_w(component_r);
- component_r = __lsx_vfmul_s(component_r, alpha_factor);
- component_r = __lsx_vftintrz_w_s(component_r);
+ __m128i component_r = __lsx_vand_v(bgra, mask_lalpha);
+ component_r = (__m128i) __lsx_vffint_s_w(component_r);
+ component_r = (__m128i) __lsx_vfmul_s((__m128) component_r, (__m128) alpha_factor);
+ component_r = __lsx_vftintrz_w_s((__m128) component_r);
v2u64 ra = __lsx_vshuf_b(bgra, component_r, ra_index);
__lsx_vstelm_d(ra, destination, 0, 0);
@@ -138,19 +138,19 @@ ALWAYS_INLINE void PackOneRowOfRGBA8Litt
v4u32 mask_lalpha = __lsx_vreplgr2vr_w(0x0ff);
v4f32 mask_falpha = __lsx_vffint_s_w(mask_lalpha);
for (unsigned i = 0; i < pixels_per_row_trunc; i += 4) {
- v16u8 bgra = *((__m128i*)(source));
+ __m128i bgra = *((__m128i*)(source));
//if A !=0, A=0; else A=0xFF
- v4f32 alpha_factor = __lsx_vseq_b(bgra, mask_zero);
+ __m128i alpha_factor = __lsx_vseq_b(bgra, mask_zero);
//if A!=0, A=A; else A=0xFF
alpha_factor = __lsx_vor_v(bgra, alpha_factor);
alpha_factor = __lsx_vsrli_w(alpha_factor, 24);
- alpha_factor = __lsx_vffint_s_w(alpha_factor);
- alpha_factor = __lsx_vfdiv_s(mask_falpha, alpha_factor);
+ alpha_factor = (__m128i) __lsx_vffint_s_w(alpha_factor);
+ alpha_factor = (__m128i) __lsx_vfdiv_s((__m128) mask_falpha, (__m128) alpha_factor);
- v16u8 component_r = __lsx_vand_v(bgra, mask_lalpha);
- component_r = __lsx_vffint_s_w(component_r);
- component_r = __lsx_vfmul_s(component_r, alpha_factor);
- component_r = __lsx_vftintrz_w_s(component_r);
+ __m128i component_r = __lsx_vand_v(bgra, mask_lalpha);
+ component_r = (__m128i) __lsx_vffint_s_w(component_r);
+ component_r = (__m128i) __lsx_vfmul_s((__m128) component_r, (__m128) alpha_factor);
+ component_r = __lsx_vftintrz_w_s((__m128) component_r);
component_r = __lsx_vpickev_b(component_r, component_r);
component_r = __lsx_vpickev_b(component_r, component_r);
@@ -172,41 +172,41 @@ ALWAYS_INLINE void PackOneRowOfRGBA8Litt
v4f32 mask_falpha = __lsx_vffint_s_w(mask_lalpha);
v16u8 rgba_index = {0,1,2,19, 4,5,6,23, 8,9,10,27, 12,13,14,31};
for (unsigned i = 0; i < pixels_per_row_trunc; i += 4) {
- v16u8 bgra = *((__m128i*)(source));
+ __m128i bgra = *((__m128i*)(source));
//if A !=0, A=0; else A=0xFF
- v4f32 alpha_factor = __lsx_vseq_b(bgra, mask_zero);
+ __m128i alpha_factor = __lsx_vseq_b(bgra, mask_zero);
//if A!=0, A=A; else A=0xFF
alpha_factor = __lsx_vor_v(bgra, alpha_factor);
alpha_factor = __lsx_vsrli_w(alpha_factor, 24);
- alpha_factor = __lsx_vffint_s_w(alpha_factor);
- alpha_factor = __lsx_vfdiv_s(mask_falpha, alpha_factor);
+ alpha_factor = (__m128i) __lsx_vffint_s_w(alpha_factor);
+ alpha_factor = (__m128i) __lsx_vfdiv_s((__m128) mask_falpha, (__m128) alpha_factor);
v16u8 bgra_01 = __lsx_vilvl_b(mask_zero, bgra);
v16u8 bgra_23 = __lsx_vilvh_b(mask_zero, bgra);
- v16u8 bgra_0 = __lsx_vilvl_b(mask_zero, bgra_01);
- v16u8 bgra_1 = __lsx_vilvh_b(mask_zero, bgra_01);
- v16u8 bgra_2 = __lsx_vilvl_b(mask_zero, bgra_23);
- v16u8 bgra_3 = __lsx_vilvh_b(mask_zero, bgra_23);
-
- bgra_0 = __lsx_vffint_s_w(bgra_0);
- bgra_1 = __lsx_vffint_s_w(bgra_1);
- bgra_2 = __lsx_vffint_s_w(bgra_2);
- bgra_3 = __lsx_vffint_s_w(bgra_3);
-
- v4f32 alpha_factor_0 = __lsx_vreplvei_w(alpha_factor, 0);
- v4f32 alpha_factor_1 = __lsx_vreplvei_w(alpha_factor, 1);
- v4f32 alpha_factor_2 = __lsx_vreplvei_w(alpha_factor, 2);
- v4f32 alpha_factor_3 = __lsx_vreplvei_w(alpha_factor, 3);
-
- bgra_0 = __lsx_vfmul_s(alpha_factor_0, bgra_0);
- bgra_1 = __lsx_vfmul_s(alpha_factor_1, bgra_1);
- bgra_2 = __lsx_vfmul_s(alpha_factor_2, bgra_2);
- bgra_3 = __lsx_vfmul_s(alpha_factor_3, bgra_3);
-
- bgra_0 = __lsx_vftintrz_w_s(bgra_0);
- bgra_1 = __lsx_vftintrz_w_s(bgra_1);
- bgra_2 = __lsx_vftintrz_w_s(bgra_2);
- bgra_3 = __lsx_vftintrz_w_s(bgra_3);
+ __m128i bgra_0 = __lsx_vilvl_b(mask_zero, bgra_01);
+ __m128i bgra_1 = __lsx_vilvh_b(mask_zero, bgra_01);
+ __m128i bgra_2 = __lsx_vilvl_b(mask_zero, bgra_23);
+ __m128i bgra_3 = __lsx_vilvh_b(mask_zero, bgra_23);
+
+ bgra_0 = (__m128i) __lsx_vffint_s_w(bgra_0);
+ bgra_1 = (__m128i) __lsx_vffint_s_w(bgra_1);
+ bgra_2 = (__m128i) __lsx_vffint_s_w(bgra_2);
+ bgra_3 = (__m128i) __lsx_vffint_s_w(bgra_3);
+
+ __m128i alpha_factor_0 = __lsx_vreplvei_w(alpha_factor, 0);
+ __m128i alpha_factor_1 = __lsx_vreplvei_w(alpha_factor, 1);
+ __m128i alpha_factor_2 = __lsx_vreplvei_w(alpha_factor, 2);
+ __m128i alpha_factor_3 = __lsx_vreplvei_w(alpha_factor, 3);
+
+ bgra_0 = (__m128i) __lsx_vfmul_s((__m128) alpha_factor_0, (__m128) bgra_0);
+ bgra_1 = (__m128i) __lsx_vfmul_s((__m128) alpha_factor_1, (__m128) bgra_1);
+ bgra_2 = (__m128i) __lsx_vfmul_s((__m128) alpha_factor_2, (__m128) bgra_2);
+ bgra_3 = (__m128i) __lsx_vfmul_s((__m128) alpha_factor_3, (__m128) bgra_3);
+
+ bgra_0 = __lsx_vftintrz_w_s((__m128) bgra_0);
+ bgra_1 = __lsx_vftintrz_w_s((__m128) bgra_1);
+ bgra_2 = __lsx_vftintrz_w_s((__m128) bgra_2);
+ bgra_3 = __lsx_vftintrz_w_s((__m128) bgra_3);
bgra_01 = __lsx_vpickev_b(bgra_1, bgra_0);
bgra_23 = __lsx_vpickev_b(bgra_3, bgra_2);
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/3rdparty/chromium/third_party/boringssl/src/include/openssl/target.h b/src/3rdparty/chromium/third_party/boringssl/src/include/openssl/target.h
--- a/src/3rdparty/chromium/third_party/boringssl/src/include/openssl/target.h 2000-01-01 00:00:00.000000000 +0800
+++ b/src/3rdparty/chromium/third_party/boringssl/src/include/openssl/target.h 2000-01-01 00:00:00.000000000 +0800
@@ -45,6 +45,8 @@
#define OPENSSL_RISCV64
#elif defined(__riscv) && __SIZEOF_POINTER__ == 4
#define OPENSSL_32_BIT
+#elif defined(__loongarch__) && __SIZEOF_POINTER__ == 8
+#define OPENSSL_64_BIT
#elif defined(__pnacl__)
#define OPENSSL_32_BIT
#define OPENSSL_PNACL
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/3rdparty/chromium/third_party/skia/gn/core.gni b/src/3rdparty/chromium/third_party/skia/gn/core.gni
--- a/src/3rdparty/chromium/third_party/skia/gn/core.gni 2000-01-01 00:00:00.000000000 +0800
+++ b/src/3rdparty/chromium/third_party/skia/gn/core.gni 2000-01-01 00:00:00.000000000 +0800
@@ -272,7 +272,7 @@ skia_core_sources = [
"$_src/core/SkBitmapProcState.h",
"$_src/core/SkBitmapProcState_matrixProcs.cpp",
"$_src/core/SkBitmapProcState_opts.cpp",
- "$_src/core/SkBitmapProcState_opts_lasx.cpp",
+ # "$_src/core/SkBitmapProcState_opts_lasx.cpp",
"$_src/core/SkBitmapProcState_opts_ssse3.cpp",
"$_src/core/SkBlendMode.cpp",
"$_src/core/SkBlendModeBlender.cpp",
@@ -287,7 +287,7 @@ skia_core_sources = [
"$_src/core/SkBlitRow_D32.cpp",
"$_src/core/SkBlitRow_opts.cpp",
"$_src/core/SkBlitRow_opts_hsw.cpp",
- "$_src/core/SkBlitRow_opts_lasx.cpp",
+ # "$_src/core/SkBlitRow_opts_lasx.cpp",
"$_src/core/SkBlitter.cpp",
"$_src/core/SkBlitter.h",
"$_src/core/SkBlitter_A8.cpp",
@@ -569,7 +569,7 @@ skia_core_sources = [
"$_src/core/SkSwizzlePriv.h",
"$_src/core/SkSwizzler_opts.cpp",
"$_src/core/SkSwizzler_opts_hsw.cpp",
- "$_src/core/SkSwizzler_opts_lasx.cpp",
+ # "$_src/core/SkSwizzler_opts_lasx.cpp",
"$_src/core/SkSwizzler_opts_ssse3.cpp",
"$_src/core/SkTDynamicHash.h",
"$_src/core/SkTHash.h",
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/3rdparty/chromium/third_party/skia/include/private/base/SkFeatures.h b/src/3rdparty/chromium/third_party/skia/include/private/base/SkFeatures.h
--- a/src/3rdparty/chromium/third_party/skia/include/private/base/SkFeatures.h 2000-01-01 00:00:00.000000000 +0800
+++ b/src/3rdparty/chromium/third_party/skia/include/private/base/SkFeatures.h 2000-01-01 00:00:00.000000000 +0800
@@ -121,9 +121,9 @@
#endif
#ifndef SK_CPU_LSX_LEVEL
- #if defined(__loongarch_asx)
+ #if defined(__loongarch_asx) && 0
#define SK_CPU_LSX_LEVEL SK_CPU_LSX_LEVEL_LASX
- #elif defined(__loongarch_sx)
+ #elif defined(__loongarch_sx) && 0
#define SK_CPU_LSX_LEVEL SK_CPU_LSX_LEVEL_LSX
#endif
#endif
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/3rdparty/chromium/third_party/skia/src/core/SkBitmapProcState_opts.cpp b/src/3rdparty/chromium/third_party/skia/src/core/SkBitmapProcState_opts.cpp
--- a/src/3rdparty/chromium/third_party/skia/src/core/SkBitmapProcState_opts.cpp 2000-01-01 00:00:00.000000000 +0800
+++ b/src/3rdparty/chromium/third_party/skia/src/core/SkBitmapProcState_opts.cpp 2000-01-01 00:00:00.000000000 +0800
@@ -22,7 +22,6 @@ namespace SkOpts {
DEFINE_DEFAULT(S32_alpha_D32_filter_DXDY);
void Init_BitmapProcState_ssse3();
- void Init_BitmapProcState_lasx();
static bool init() {
#if defined(SK_ENABLE_OPTIMIZE_SIZE)
@@ -31,10 +30,6 @@ namespace SkOpts {
#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BitmapProcState_ssse3(); }
#endif
- #elif defined(SK_CPU_LOONGARCH)
- #if SK_CPU_LSX_LEVEL < SK_CPU_LSX_LEVEL_LASX
- if (SkCpu::Supports(SkCpu::LOONGARCH_ASX)) { Init_BitmapProcState_lasx(); }
- #endif
#endif
return true;
}
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/3rdparty/chromium/third_party/skia/src/core/SkBlitRow_opts.cpp b/src/3rdparty/chromium/third_party/skia/src/core/SkBlitRow_opts.cpp
--- a/src/3rdparty/chromium/third_party/skia/src/core/SkBlitRow_opts.cpp 2000-01-01 00:00:00.000000000 +0800
+++ b/src/3rdparty/chromium/third_party/skia/src/core/SkBlitRow_opts.cpp 2000-01-01 00:00:00.000000000 +0800
@@ -22,7 +22,6 @@ namespace SkOpts {
DEFINE_DEFAULT(blit_row_s32a_opaque);
void Init_BlitRow_hsw();
- void Init_BlitRow_lasx();
static bool init() {
#if defined(SK_ENABLE_OPTIMIZE_SIZE)
@@ -31,10 +30,6 @@ namespace SkOpts {
#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_AVX2
if (SkCpu::Supports(SkCpu::HSW)) { Init_BlitRow_hsw(); }
#endif
- #elif defined(SK_CPU_LOONGARCH)
- #if SK_CPU_LSX_LEVEL < SK_CPU_LSX_LEVEL_LASX
- if (SkCpu::Supports(SkCpu::LOONGARCH_ASX)) { Init_BlitRow_lasx(); }
- #endif
#endif
return true;
}
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/3rdparty/chromium/third_party/skia/src/core/SkSwizzler_opts.cpp b/src/3rdparty/chromium/third_party/skia/src/core/SkSwizzler_opts.cpp
--- a/src/3rdparty/chromium/third_party/skia/src/core/SkSwizzler_opts.cpp 2000-01-01 00:00:00.000000000 +0800
+++ b/src/3rdparty/chromium/third_party/skia/src/core/SkSwizzler_opts.cpp 2000-01-01 00:00:00.000000000 +0800
@@ -33,7 +33,6 @@ namespace SkOpts {
void Init_Swizzler_ssse3();
void Init_Swizzler_hsw();
- void Init_Swizzler_lasx();
static bool init() {
#if defined(SK_ENABLE_OPTIMIZE_SIZE)
@@ -46,10 +45,6 @@ namespace SkOpts {
#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_AVX2
if (SkCpu::Supports(SkCpu::HSW)) { Init_Swizzler_hsw(); }
#endif
- #elif defined(SK_CPU_LOONGARCH)
- #if SK_CPU_LSX_LEVEL < SK_CPU_LSX_LEVEL_LASX
- if (SkCpu::Supports(SkCpu::LOONGARCH_ASX)) { Init_Swizzler_lasx(); }
- #endif
#endif
return true;
}
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn 2000-01-01 00:00:00.000000000 +0800
+++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn 2000-01-01 00:00:00.000000000 +0800
@@ -156,6 +156,8 @@ swiftshader_llvm_source_set("swiftshader
deps += [ ":swiftshader_llvm_ppc" ]
} else if (current_cpu == "riscv64") {
deps += [ ":swiftshader_llvm_riscv64" ]
+ } else if (current_cpu == "loong64") {
+ # swiftshader unused in qt6-webengine
} else if (current_cpu == "x86" || current_cpu == "x64") {
deps += [ ":swiftshader_llvm_x86" ]
} else {
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/3rdparty/gn/src/util/sys_info.cc b/src/3rdparty/gn/src/util/sys_info.cc
--- a/src/3rdparty/gn/src/util/sys_info.cc 2000-01-01 00:00:00.000000000 +0800
+++ b/src/3rdparty/gn/src/util/sys_info.cc 2000-01-01 00:00:00.000000000 +0800
@@ -73,6 +73,8 @@ std::string OperatingSystemArchitecture(
arch = "x86_64";
} else if (arch == "amd64") {
arch = "x86_64";
+ } else if (arch == "loongarch64") {
+ arch = "loongarch64";
} else if (os == "AIX" || os == "OS400") {
arch = "ppc64";
} else if (std::string(info.sysname) == "OS/390") {
diff '--color=auto' -p -X ../chromium-loongarch64/qt6-webengine/exclude -N -u -r a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
--- a/src/core/CMakeLists.txt 2000-01-01 00:00:00.000000000 +0800
+++ b/src/core/CMakeLists.txt 2000-01-01 00:00:00.000000000 +0800
@@ -608,6 +608,7 @@ target_include_directories(WebEngineCore
${buildDir}/$<CONFIG>/${arch}/gen/third_party/perfetto/build_config
${buildDir}/$<CONFIG>/${arch}/gen/base/allocator/partition_allocator/src
)
+target_link_options(WebEngineCore PRIVATE -mno-relax)
set(stamps QtWebEngineCore.stamp)
if(QT_FEATURE_webengine_v8_context_snapshot)