mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 03:32:13 +02:00
webkitgtk: update 2.44.3 -> 2.46.4
Drop 0001-Fix-build-issues-with-latest-Clang.patch (backport) 30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch (issue fixed upstream) Add an option that when absent causes a build failure. (From OE-Core rev: dc72933c3393339c7e8b50f62a16832aeac32887) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
c88257609c
commit
92b8d6e559
@@ -1,4 +1,4 @@
|
||||
From 99a21305ae683a216e9299e5dbdd763190a8cfe3 Mon Sep 17 00:00:00 2001
|
||||
From bbf661310448d430350eb2ad8c5869ace648dcf8 Mon Sep 17 00:00:00 2001
|
||||
From: Kai Kang <kai.kang@windriver.com>
|
||||
Date: Fri, 11 Aug 2023 14:20:48 +0800
|
||||
Subject: [PATCH] Add a variable to control macro
|
||||
@@ -57,10 +57,10 @@ index 5d5fb38c..a554f700 100644
|
||||
#else
|
||||
#define __PAS_ALWAYS_INLINE_BUT_NOT_INLINE
|
||||
diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
|
||||
index 0732785e..4879ec40 100644
|
||||
index f5ec0a55..dfd741e7 100644
|
||||
--- a/Source/cmake/WebKitCompilerFlags.cmake
|
||||
+++ b/Source/cmake/WebKitCompilerFlags.cmake
|
||||
@@ -452,3 +452,10 @@ endif ()
|
||||
@@ -492,3 +492,10 @@ endif ()
|
||||
|
||||
# FIXME: Enable pre-compiled headers for all ports <https://webkit.org/b/139438>
|
||||
set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From d1f6a1b6a1298f6ef2f1677e9996aa60a002134a Mon Sep 17 00:00:00 2001
|
||||
From e0dfc113b016227da8a654d625e8f568b56761d0 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 27 Oct 2015 16:02:19 +0200
|
||||
Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
|
||||
@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake
|
||||
index fdc56b21..d42eca52 100644
|
||||
index 8cf372f3..40471487 100644
|
||||
--- a/Source/cmake/FindGI.cmake
|
||||
+++ b/Source/cmake/FindGI.cmake
|
||||
@@ -72,6 +72,9 @@ if (PKG_CONFIG_FOUND)
|
||||
|
||||
@@ -1,251 +0,0 @@
|
||||
From 257ed304fb3e71d412568dcbed7129c145812fdf Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 2 Sep 2024 21:38:12 -0700
|
||||
Subject: [PATCH] Fix build issues with latest Clang
|
||||
https://bugs.webkit.org/show_bug.cgi?id=276198 rdar://130933637
|
||||
|
||||
Reviewed by Yusuke Suzuki.
|
||||
|
||||
The use of the template keyword to reference template members without a template argument list was deprecated in the C++ standard.
|
||||
e.g. `foo.template bar()` nows needs to be `foo.template bar<>()`. I ran into a different issue with `std::reference_wrapper` that
|
||||
blocked me from going any further, which AFAICT is a bug on the Clang side.
|
||||
|
||||
This also fixes a few other warnings that popped up while building with the new Clang denoted inline
|
||||
|
||||
* Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp:
|
||||
(JSC::FTL::DFG::LowerDFGToB3::compileCompareStrictEq): Clang didn't like the implicit static_cast<int32_t>(UINT32_MAX) so make it explicit with a static_assert no data was lost.
|
||||
* Source/JavaScriptCore/jit/AssemblyHelpers.cpp:
|
||||
(JSC::AssemblyHelpers::emitNonNullDecodeZeroExtendedStructureID): Clang didn't like the implicit static_cast<int32_t>(UINT32_MAX) so make it explicit with a static_assert no data was lost.
|
||||
* Source/JavaScriptCore/llint/InPlaceInterpreter.cpp:
|
||||
* Source/JavaScriptCore/llint/LLIntData.h:
|
||||
(JSC::LLInt::getCodeFunctionPtr):
|
||||
(JSC::LLInt::getWide16CodeFunctionPtr):
|
||||
(JSC::LLInt::getWide32CodeFunctionPtr):
|
||||
* Source/JavaScriptCore/parser/Nodes.h: Missing definition of ModuleScopeData added include.
|
||||
* Source/JavaScriptCore/runtime/JSCast.h:
|
||||
(JSC::JSCastingHelpers::inherits):
|
||||
(JSC::jsDynamicCast):
|
||||
* Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/crypto/bio/connect.c:
|
||||
(conn_callback_ctrl): Had a warning about an incompatible function type. Seems like this is intentional suppressed the warning.
|
||||
* Source/WTF/wtf/cf/TypeCastsCF.h: Had a warning about extra namespace qualification. I just moved it out of the namespace. That said, it feels like this warning shouldn't apply to macro expansions...
|
||||
* Source/WebCore/PAL/ThirdParty/libavif/ThirdParty/dav1d/src/decode.c:
|
||||
(decode_b): Had a warning about different types on the middle/right of a ternary expression. I just pushed the comparison inside the ternary.
|
||||
|
||||
Canonical link: https://commits.webkit.org/280700@main
|
||||
|
||||
Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/62b6e2db547e#diff-136d848d7c1b400da9b486916b67592b54e5abf7c66ac247697a93ae2fb743a9]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp | 6 ++++--
|
||||
Source/JavaScriptCore/jit/AssemblyHelpers.cpp | 6 ++++--
|
||||
.../JavaScriptCore/llint/InPlaceInterpreter.cpp | 16 ++++++++--------
|
||||
Source/JavaScriptCore/llint/LLIntData.h | 12 ++++++------
|
||||
Source/JavaScriptCore/llint/LLIntThunks.cpp | 2 +-
|
||||
Source/JavaScriptCore/parser/Nodes.h | 4 ++--
|
||||
Source/JavaScriptCore/runtime/JSCast.h | 4 ++--
|
||||
7 files changed, 27 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
|
||||
index 42a4eae7..dd987726 100644
|
||||
--- a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
|
||||
+++ b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
|
||||
@@ -22930,8 +22930,10 @@ IGNORE_CLANG_WARNINGS_END
|
||||
return m_out.shl(m_out.zeroExtPtr(structureID), m_out.constIntPtr(StructureID::encodeShiftAmount));
|
||||
#else
|
||||
LValue maskedStructureID = structureID;
|
||||
- if constexpr (structureHeapAddressSize < 4 * GB)
|
||||
- maskedStructureID = m_out.bitAnd(structureID, m_out.constInt32(StructureID::structureIDMask));
|
||||
+ if constexpr (structureHeapAddressSize < 4 * GB) {
|
||||
+ static_assert(static_cast<uint32_t>(StructureID::structureIDMask) == StructureID::structureIDMask);
|
||||
+ maskedStructureID = m_out.bitAnd(structureID, m_out.constInt32(static_cast<uint32_t>(StructureID::structureIDMask)));
|
||||
+ }
|
||||
return m_out.bitOr(m_out.constIntPtr(startOfStructureHeap()), m_out.zeroExtPtr(maskedStructureID));
|
||||
#endif
|
||||
}
|
||||
diff --git a/Source/JavaScriptCore/jit/AssemblyHelpers.cpp b/Source/JavaScriptCore/jit/AssemblyHelpers.cpp
|
||||
index c939d27a..982dc46f 100644
|
||||
--- a/Source/JavaScriptCore/jit/AssemblyHelpers.cpp
|
||||
+++ b/Source/JavaScriptCore/jit/AssemblyHelpers.cpp
|
||||
@@ -677,8 +677,10 @@ void AssemblyHelpers::emitNonNullDecodeZeroExtendedStructureID(RegisterID source
|
||||
if constexpr (structureHeapAddressSize >= 4 * GB) {
|
||||
ASSERT(structureHeapAddressSize == 4 * GB);
|
||||
move(source, dest);
|
||||
- } else
|
||||
- and32(TrustedImm32(StructureID::structureIDMask), source, dest);
|
||||
+ } else {
|
||||
+ static_assert(static_cast<uint32_t>(StructureID::structureIDMask) == StructureID::structureIDMask);
|
||||
+ and32(TrustedImm32(static_cast<uint32_t>(StructureID::structureIDMask)), source, dest);
|
||||
+ }
|
||||
or64(TrustedImm64(startOfStructureHeap()), dest);
|
||||
#else // not CPU(ADDRESS64)
|
||||
move(source, dest);
|
||||
diff --git a/Source/JavaScriptCore/llint/InPlaceInterpreter.cpp b/Source/JavaScriptCore/llint/InPlaceInterpreter.cpp
|
||||
index b9442b4f..a1d5a6c4 100644
|
||||
--- a/Source/JavaScriptCore/llint/InPlaceInterpreter.cpp
|
||||
+++ b/Source/JavaScriptCore/llint/InPlaceInterpreter.cpp
|
||||
@@ -43,8 +43,8 @@ namespace JSC { namespace IPInt {
|
||||
do { \
|
||||
void* base = reinterpret_cast<void*>(ipint_unreachable_validate); \
|
||||
void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \
|
||||
- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \
|
||||
- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \
|
||||
+ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \
|
||||
+ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \
|
||||
RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \
|
||||
} while (false);
|
||||
|
||||
@@ -52,8 +52,8 @@ do { \
|
||||
do { \
|
||||
void* base = reinterpret_cast<void*>(ipint_i32_trunc_sat_f32_s_validate); \
|
||||
void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \
|
||||
- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \
|
||||
- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \
|
||||
+ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \
|
||||
+ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \
|
||||
RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \
|
||||
} while (false);
|
||||
|
||||
@@ -61,8 +61,8 @@ do { \
|
||||
do { \
|
||||
void* base = reinterpret_cast<void*>(ipint_simd_v128_load_mem_validate); \
|
||||
void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \
|
||||
- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \
|
||||
- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \
|
||||
+ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \
|
||||
+ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \
|
||||
RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \
|
||||
} while (false);
|
||||
|
||||
@@ -70,8 +70,8 @@ do { \
|
||||
do { \
|
||||
void* base = reinterpret_cast<void*>(ipint_memory_atomic_notify_validate); \
|
||||
void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \
|
||||
- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \
|
||||
- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \
|
||||
+ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \
|
||||
+ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \
|
||||
RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \
|
||||
} while (false);
|
||||
|
||||
diff --git a/Source/JavaScriptCore/llint/LLIntData.h b/Source/JavaScriptCore/llint/LLIntData.h
|
||||
index 97de867e..87a2971d 100644
|
||||
--- a/Source/JavaScriptCore/llint/LLIntData.h
|
||||
+++ b/Source/JavaScriptCore/llint/LLIntData.h
|
||||
@@ -217,7 +217,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionPtr(OpcodeID opcodeID)
|
||||
#if COMPILER(MSVC)
|
||||
return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).taggedPtr());
|
||||
#else
|
||||
- return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr());
|
||||
+ return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr<>());
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -227,7 +227,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFunctionPtr(OpcodeID opcodeID)
|
||||
#if COMPILER(MSVC)
|
||||
return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).taggedPtr());
|
||||
#else
|
||||
- return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr());
|
||||
+ return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr<>());
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -237,7 +237,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFunctionPtr(OpcodeID opcodeID)
|
||||
#if COMPILER(MSVC)
|
||||
return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).taggedPtr());
|
||||
#else
|
||||
- return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr());
|
||||
+ return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr<>());
|
||||
#endif
|
||||
}
|
||||
#else // not ENABLE(JIT)
|
||||
@@ -361,7 +361,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionPtr(WasmOpcodeID opcodeID)
|
||||
#if COMPILER(MSVC)
|
||||
return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).taggedPtr());
|
||||
#else
|
||||
- return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr());
|
||||
+ return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr<>());
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -371,7 +371,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFunctionPtr(WasmOpcodeID opcodeID)
|
||||
#if COMPILER(MSVC)
|
||||
return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).taggedPtr());
|
||||
#else
|
||||
- return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr());
|
||||
+ return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr<>());
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -381,7 +381,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFunctionPtr(WasmOpcodeID opcodeID)
|
||||
#if COMPILER(MSVC)
|
||||
return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).taggedPtr());
|
||||
#else
|
||||
- return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr());
|
||||
+ return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr<>());
|
||||
#endif
|
||||
}
|
||||
#else // not ENABLE(JIT)
|
||||
diff --git a/Source/JavaScriptCore/llint/LLIntThunks.cpp b/Source/JavaScriptCore/llint/LLIntThunks.cpp
|
||||
index 13269469..e41fa5b8 100644
|
||||
--- a/Source/JavaScriptCore/llint/LLIntThunks.cpp
|
||||
+++ b/Source/JavaScriptCore/llint/LLIntThunks.cpp
|
||||
@@ -227,7 +227,7 @@ ALWAYS_INLINE void* untaggedPtr(void* ptr)
|
||||
#if COMPILER(MSVC)
|
||||
return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).untaggedPtr();
|
||||
#else
|
||||
- return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr();
|
||||
+ return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>();
|
||||
#endif
|
||||
}
|
||||
|
||||
diff --git a/Source/JavaScriptCore/parser/Nodes.h b/Source/JavaScriptCore/parser/Nodes.h
|
||||
index 01af81b7..70b87088 100644
|
||||
--- a/Source/JavaScriptCore/parser/Nodes.h
|
||||
+++ b/Source/JavaScriptCore/parser/Nodes.h
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
|
||||
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
|
||||
- * Copyright (C) 2003-2019 Apple Inc. All rights reserved.
|
||||
+ * Copyright (C) 2003-2024 Apple Inc. All rights reserved.
|
||||
* Copyright (C) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca)
|
||||
* Copyright (C) 2007 Maks Orlovich
|
||||
* Copyright (C) 2007 Eric Seidel <eric@webkit.org>
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "ImplementationVisibility.h"
|
||||
#include "JITCode.h"
|
||||
#include "Label.h"
|
||||
+#include "ModuleScopeData.h"
|
||||
#include "ParserArena.h"
|
||||
#include "ParserModes.h"
|
||||
#include "ParserTokens.h"
|
||||
@@ -49,7 +50,6 @@ namespace JSC {
|
||||
class FunctionMetadataNode;
|
||||
class FunctionParameters;
|
||||
class ModuleAnalyzer;
|
||||
- class ModuleScopeData;
|
||||
class PropertyListNode;
|
||||
class ReadModifyResolveNode;
|
||||
class RegisterID;
|
||||
diff --git a/Source/JavaScriptCore/runtime/JSCast.h b/Source/JavaScriptCore/runtime/JSCast.h
|
||||
index a44b6e38..e5664a8b 100644
|
||||
--- a/Source/JavaScriptCore/runtime/JSCast.h
|
||||
+++ b/Source/JavaScriptCore/runtime/JSCast.h
|
||||
@@ -236,7 +236,7 @@ template<typename Target, typename From>
|
||||
bool inherits(From* from)
|
||||
{
|
||||
using Dispatcher = InheritsTraits<Target>;
|
||||
- return Dispatcher::template inherits(from);
|
||||
+ return Dispatcher::template inherits<>(from);
|
||||
}
|
||||
|
||||
} // namespace JSCastingHelpers
|
||||
@@ -245,7 +245,7 @@ template<typename To, typename From>
|
||||
To jsDynamicCast(From* from)
|
||||
{
|
||||
using Dispatcher = JSCastingHelpers::InheritsTraits<typename std::remove_cv<typename std::remove_pointer<To>::type>::type>;
|
||||
- if (LIKELY(Dispatcher::template inherits(from)))
|
||||
+ if (LIKELY(Dispatcher::template inherits<>(from)))
|
||||
return static_cast<To>(from);
|
||||
return nullptr;
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
From 57b80aa00be614218552fda67b2bf8d535b4f4cf Mon Sep 17 00:00:00 2001
|
||||
From 8b0ff0f2e2882f200f1c21ec76fa679444cb1c43 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Schonberg <schonm@gmail.com>
|
||||
Date: Wed, 20 Nov 2024 11:05:52 -0500
|
||||
Subject: [PATCH] Support ICU 76.1 build
|
||||
Subject: [PATCH] Support ICU 76.1 build
|
||||
|
||||
https://bugs.webkit.org/show_bug.cgi?id=282120
|
||||
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
From 2ee948191de1c561b72ebf462605376cfb3ce7af Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Devoogdt <thomas.devoogdt@barco.com>
|
||||
Date: Mon, 16 Jan 2023 17:03:30 +0100
|
||||
Subject: [PATCH] REGRESSION(257865@main): B3Validate.cpp: fix
|
||||
|
||||
!ENABLE(WEBASSEMBLY_B3JIT)
|
||||
|
||||
https://bugs.webkit.org/show_bug.cgi?id=250681
|
||||
|
||||
Reviewed by NOBODY (OOPS!).
|
||||
|
||||
WasmTypeDefinition.h isn't included if not ENABLE(WEBASSEMBLY_B3JIT).
|
||||
Also, toB3Type and simdScalarType are not defined if it is included.
|
||||
|
||||
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
|
||||
|
||||
Upstream-Status: Inappropriate [https://bugs.launchpad.net/ubuntu/+source/webkit2gtk/+bug/2008798]
|
||||
|
||||
Signed-off-by: Markus Volk <f_l_k@t-online.de>
|
||||
---
|
||||
Source/JavaScriptCore/b3/B3Validate.cpp | 12 +++++++++---
|
||||
1 file changed, 9 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/b3/B3Validate.cpp b/Source/JavaScriptCore/b3/B3Validate.cpp
|
||||
index eaaa3749..1d089783 100644
|
||||
--- a/Source/JavaScriptCore/b3/B3Validate.cpp
|
||||
+++ b/Source/JavaScriptCore/b3/B3Validate.cpp
|
||||
@@ -47,6 +47,12 @@
|
||||
#include <wtf/StringPrintStream.h>
|
||||
#include <wtf/text/CString.h>
|
||||
|
||||
+#if ENABLE(WEBASSEMBLY) && ENABLE(WEBASSEMBLY_B3JIT)
|
||||
+#define simdScalarTypeToB3Type(type) toB3Type(Wasm::simdScalarType(type))
|
||||
+#else
|
||||
+#define simdScalarTypeToB3Type(type) B3::Type()
|
||||
+#endif
|
||||
+
|
||||
namespace JSC { namespace B3 {
|
||||
|
||||
namespace {
|
||||
@@ -454,7 +460,7 @@ public:
|
||||
case VectorExtractLane:
|
||||
VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
|
||||
VALIDATE(value->numChildren() == 1, ("At ", *value));
|
||||
- VALIDATE(value->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
|
||||
+ VALIDATE(value->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
|
||||
VALIDATE(value->child(0)->type() == V128, ("At ", *value));
|
||||
break;
|
||||
case VectorReplaceLane:
|
||||
@@ -462,7 +468,7 @@ public:
|
||||
VALIDATE(value->numChildren() == 2, ("At ", *value));
|
||||
VALIDATE(value->type() == V128, ("At ", *value));
|
||||
VALIDATE(value->child(0)->type() == V128, ("At ", *value));
|
||||
- VALIDATE(value->child(1)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
|
||||
+ VALIDATE(value->child(1)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
|
||||
break;
|
||||
case VectorDupElement:
|
||||
VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
|
||||
@@ -484,7 +490,7 @@ public:
|
||||
VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
|
||||
VALIDATE(value->numChildren() == 1, ("At ", *value));
|
||||
VALIDATE(value->type() == V128, ("At ", *value));
|
||||
- VALIDATE(value->child(0)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
|
||||
+ VALIDATE(value->child(0)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
|
||||
break;
|
||||
|
||||
case VectorPopcnt:
|
||||
36
meta/recipes-sato/webkit/webkitgtk/bmalloc-fix.patch
Normal file
36
meta/recipes-sato/webkit/webkitgtk/bmalloc-fix.patch
Normal file
@@ -0,0 +1,36 @@
|
||||
From 6ab7d3f7d8d0d8e1ab401d0fb13f60bbc64279a2 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Klausner <wiz@gatalith.at>
|
||||
Date: Thu, 7 Nov 2024 11:54:30 -0800
|
||||
Subject: [PATCH] bmalloc: Build problem in bmalloc when X11/X.h is in the same
|
||||
namespace https://bugs.webkit.org/show_bug.cgi?id=282693
|
||||
|
||||
This avoids a build problem when the X11/X.h is included,
|
||||
which defines Success to '0'.
|
||||
|
||||
Reviewed by Fujii Hironori.
|
||||
|
||||
* Source/bmalloc/bmalloc/EligibilityResult.h:
|
||||
|
||||
Canonical link: https://commits.webkit.org/286295@main
|
||||
Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/6ab7d3f7d8d0d8e1ab401d0fb13f60bbc64279a2]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
Source/bmalloc/bmalloc/EligibilityResult.h | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/Source/bmalloc/bmalloc/EligibilityResult.h b/Source/bmalloc/bmalloc/EligibilityResult.h
|
||||
index ead7dbb52c07a..48f9e5bfe8a80 100644
|
||||
--- a/Source/bmalloc/bmalloc/EligibilityResult.h
|
||||
+++ b/Source/bmalloc/bmalloc/EligibilityResult.h
|
||||
@@ -29,6 +29,11 @@
|
||||
|
||||
#if !BUSE(LIBPAS)
|
||||
|
||||
+/* avoid conflict with symbol from X11 headers */
|
||||
+#ifdef Success
|
||||
+#undef Success
|
||||
+#endif
|
||||
+
|
||||
namespace bmalloc {
|
||||
|
||||
enum class EligibilityKind {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 31dca9601888f2a539dfb22693ffd62c22ee8912 Mon Sep 17 00:00:00 2001
|
||||
From 4602261fa44d6bbb4c3698c79e08a6a40a6edc5a Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 12 Jan 2024 09:21:39 -0800
|
||||
Subject: [PATCH] clang/arm: Do not use MUST_TAIL_CALL
|
||||
@@ -16,15 +16,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
|
||||
index 449ca502..daac29d7 100644
|
||||
index c01ed849..b69b1527 100644
|
||||
--- a/Source/WTF/wtf/Compiler.h
|
||||
+++ b/Source/WTF/wtf/Compiler.h
|
||||
@@ -321,7 +321,7 @@
|
||||
/* MUST_TAIL_CALL */
|
||||
|
||||
@@ -290,7 +290,7 @@
|
||||
#if COMPILER(CLANG)
|
||||
#if __SIZEOF_POINTER__ == 8
|
||||
#if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute)
|
||||
-#if __has_cpp_attribute(clang::musttail)
|
||||
+#if __has_cpp_attribute(clang::musttail) && !defined(__arm__)
|
||||
-#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__)
|
||||
+#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) && !defined(__arm__)
|
||||
#define MUST_TAIL_CALL [[clang::musttail]]
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From cb5458b5d15aafa3543a47a33975609026d45d32 Mon Sep 17 00:00:00 2001
|
||||
From 65e9a68c9d05f4902c2fc34303b7f8233ffa98d5 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Date: Mon, 3 Jan 2022 14:18:34 +0000
|
||||
Subject: [PATCH] webkitgtk: Add reproducibility fix
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 36c092723ec6d4908039341c9d157db8ab1c0a59 Mon Sep 17 00:00:00 2001
|
||||
From 29431aec88764072a032aa4411e26e566a3a6c0b Mon Sep 17 00:00:00 2001
|
||||
From: Michael Catanzaro <mcatanzaro@redhat.com>
|
||||
Date: Mon, 5 Feb 2024 11:00:49 -0600
|
||||
Subject: [PATCH] =?UTF-8?q?LowLevelInterpreter.cpp:339:21:=20error:=20?=
|
||||
@@ -21,10 +21,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
|
||||
index 75cecbbd..b1020ea4 100644
|
||||
index 76c46889..500be433 100644
|
||||
--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
|
||||
+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
|
||||
@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
|
||||
@@ -334,8 +334,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
|
||||
UNUSED_VARIABLE(t2);
|
||||
UNUSED_VARIABLE(t3);
|
||||
UNUSED_VARIABLE(t5);
|
||||
|
||||
@@ -15,11 +15,10 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
|
||||
file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \
|
||||
file://no-musttail-arm.patch \
|
||||
file://t6-not-declared.patch \
|
||||
file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \
|
||||
file://0001-Fix-build-issues-with-latest-Clang.patch \
|
||||
file://0001-Support-ICU-76.1-build.patch \
|
||||
file://bmalloc-fix.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54"
|
||||
SRC_URI[sha256sum] = "0eff5f0ab0a2872ec87df62bc32e3289c8af625716ac71e94b298d74e0374176"
|
||||
|
||||
inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
|
||||
|
||||
@@ -81,6 +80,7 @@ PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECOR
|
||||
PACKAGECONFIG[jpegxl] = "-DUSE_JPEGXL=ON,-DUSE_JPEGXL=OFF,libjxl"
|
||||
PACKAGECONFIG[backtrace] = "-DUSE_LIBBACKTRACE=ON,-DUSE_LIBBACKTRACE=OFF,libbacktrace"
|
||||
PACKAGECONFIG[gamepad] = "-DENABLE_GAMEPAD=ON,-DENABLE_GAMEPAD=OFF,libmanette"
|
||||
PACKAGECONFIG[sysprof-capture] = "-DUSE_SYSTEM_SYSPROF_CAPTURE=YES,-DUSE_SYSTEM_SYSPROF_CAPTURE=NO,sysprof"
|
||||
|
||||
EXTRA_OECMAKE = " \
|
||||
-DPORT=GTK \
|
||||
@@ -91,6 +91,7 @@ EXTRA_OECMAKE = " \
|
||||
-DENABLE_BUBBLEWRAP_SANDBOX=OFF \
|
||||
-DUSE_GTK4=ON \
|
||||
-DCMAKE_EXPORT_COMPILE_COMMANDS=OFF \
|
||||
-DENABLE_RELEASE_LOG=ON \
|
||||
"
|
||||
|
||||
# Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the
|
||||
Reference in New Issue
Block a user