Merge remote-tracking branch 'up/master' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
commit
180a31fdad
GPG Key ID:
8B7F1DA0E2C9FDBB
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
Name: qt5-%{qt_module}
|
||||
Version: 5.212.0
|
||||
Release: 0.39.%{?prerel}.0.riscv64%{?dist}
|
||||
Release: 0.42.%{?prerel}.0.riscv64%{?dist}
|
||||
Summary: Qt5 - QtWebKit components
|
||||
|
||||
License: LGPLv2 and BSD
|
||||
|
|
@ -25,15 +25,18 @@ Source0: https://github.com/qtwebkit/qtwebkit/releases/download/%{qt_modu
|
|||
|
||||
# Patch for new CMake policy CMP0071 to explicitly use old behaviour.
|
||||
Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch
|
||||
Patch3: qtwebkit-missing-semicolons.patch
|
||||
|
||||
# Enable RISC-V (riscv64)
|
||||
Patch10: qtwebkit-5.212.0-alpha2-add-riscv.patch
|
||||
Patch10: qtwebkit-5.212.0-alpha3-add-riscv.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: cmake
|
||||
BuildRequires: flex
|
||||
BuildRequires: pkgconfig(fontconfig)
|
||||
%if 0%{?rhel} != 8
|
||||
BuildRequires: pkgconfig(libwoff2dec)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(gio-2.0)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: gperf
|
||||
|
|
@ -240,9 +243,18 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)"
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Jul 31 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 5.212.0-0.39.alpha3.0.riscv64
|
||||
* Fri Apr 03 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 5.212.0-0.42.alpha3.0.riscv64
|
||||
- add support for RISC-V (riscv64)
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.42.alpha3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Dec 09 2019 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.41.alpha3
|
||||
- rebuild (qt5)
|
||||
|
||||
* Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.40.alpha3
|
||||
- rebuild (qt5)
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.39.alpha3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
|
|
@ -1,113 +0,0 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1f9bab8..d5aa2ee 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -86,6 +86,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390")
|
||||
set(WTF_CPU_S390 1)
|
||||
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
|
||||
set(WTF_CPU_S390X 1)
|
||||
+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64")
|
||||
+ set(WTF_CPU_RISCV64 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 1957446..96255d6 100644
|
||||
--- a/Source/JavaScriptCore/CMakeLists.txt
|
||||
+++ b/Source/JavaScriptCore/CMakeLists.txt
|
||||
@@ -1289,6 +1289,7 @@ elseif (WTF_CPU_MIPS)
|
||||
elseif (WTF_CPU_SH4)
|
||||
elseif (WTF_CPU_X86)
|
||||
elseif (WTF_CPU_X86_64)
|
||||
+elseif (WTF_CPU_RISCV64)
|
||||
if (MSVC AND ENABLE_JIT)
|
||||
add_custom_command(
|
||||
OUTPUT ${DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj
|
||||
diff --git a/Source/ThirdParty/brotli/dec/port.h b/Source/ThirdParty/brotli/dec/port.h
|
||||
index 19b457c..be1b2ad 100644
|
||||
--- a/Source/ThirdParty/brotli/dec/port.h
|
||||
+++ b/Source/ThirdParty/brotli/dec/port.h
|
||||
@@ -66,6 +66,10 @@
|
||||
#define BROTLI_TARGET_POWERPC64
|
||||
#endif
|
||||
|
||||
+#if defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
|
||||
+#define BROTLI_TARGET_RISCV64
|
||||
+#endif
|
||||
+
|
||||
#if defined(__GNUC__) && defined(__GNUC_MINOR__)
|
||||
#define BROTLI_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
|
||||
#else
|
||||
@@ -180,7 +184,7 @@ static inline void BrotliDump(const char* f, int l, const char* fn) {
|
||||
#elif defined(BROTLI_BUILD_32_BIT)
|
||||
#define BROTLI_64_BITS 0
|
||||
#elif defined(BROTLI_TARGET_X64) || defined(BROTLI_TARGET_ARMV8) || \
|
||||
- defined(BROTLI_TARGET_POWERPC64)
|
||||
+ defined(BROTLI_TARGET_POWERPC64) || defined(BROTLI_TARGET_RISCV64)
|
||||
#define BROTLI_64_BITS 1
|
||||
#else
|
||||
#define BROTLI_64_BITS 0
|
||||
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
|
||||
index 3f2069e..d4e02a8 100644
|
||||
--- a/Source/WTF/wtf/Platform.h
|
||||
+++ b/Source/WTF/wtf/Platform.h
|
||||
@@ -176,6 +176,11 @@
|
||||
#define WTF_CPU_X86_SSE2 1
|
||||
#endif
|
||||
|
||||
+/* CPU(RISCV64) - RISCV64 */
|
||||
+#if defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
|
||||
+#define WTF_CPU_RISCV64 1
|
||||
+#endif
|
||||
+
|
||||
/* CPU(ARM64) - Apple */
|
||||
#if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
|
||||
#define WTF_CPU_ARM64 1
|
||||
@@ -712,7 +717,8 @@
|
||||
|| CPU(S390X) \
|
||||
|| CPU(MIPS64) \
|
||||
|| CPU(PPC64) \
|
||||
- || CPU(PPC64LE)
|
||||
+ || CPU(PPC64LE) \
|
||||
+ || CPU(RISCV64)
|
||||
#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 889642c..176d590 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)
|
||||
+#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(RISCV64)
|
||||
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
|
||||
#elif defined(_M_IX86) || defined(__i386__)
|
||||
#if defined(_WIN32)
|
||||
diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
|
||||
index 84b18c7..b64d9d1 100755
|
||||
--- a/Tools/Scripts/webkitdirs.pm
|
||||
+++ b/Tools/Scripts/webkitdirs.pm
|
||||
@@ -1264,6 +1264,11 @@ sub isARM()
|
||||
return ($Config{archname} =~ /^arm[v\-]/) || ($Config{archname} =~ /^aarch64[v\-]/);
|
||||
}
|
||||
|
||||
+sub isRISCV()
|
||||
+{
|
||||
+ return ($Config{archname} =~ /^riscv(|32|64)\-/);
|
||||
+}
|
||||
+
|
||||
sub isX86_64()
|
||||
{
|
||||
return (architecture() eq "x86_64") || 0;
|
||||
@@ -2064,7 +2069,7 @@ sub generateBuildSystemFromCMakeProject
|
||||
# Compiler options to keep floating point values consistent
|
||||
# between 32-bit and 64-bit architectures.
|
||||
determineArchitecture();
|
||||
- if ($architecture ne "x86_64" && !isARM() && !isCrossCompilation() && !isAnyWindows()) {
|
||||
+ if ($architecture ne "x86_64" && !isARM() && !isRISCV && !isCrossCompilation() && !isAnyWindows()) {
|
||||
$ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CXXFLAGS'} || "");
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
|
||||
index 1bca2d0..19355f1 100644
|
||||
--- a/Source/WebCore/dom/Document.cpp
|
||||
+++ b/Source/WebCore/dom/Document.cpp
|
||||
@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
|
||||
unsigned i = 0;
|
||||
|
||||
UChar32 c;
|
||||
- U16_NEXT(characters, i, length, c)
|
||||
+ U16_NEXT(characters, i, length, c);
|
||||
if (!isValidNameStart(c))
|
||||
return false;
|
||||
|
||||
while (i < length) {
|
||||
- U16_NEXT(characters, i, length, c)
|
||||
+ U16_NEXT(characters, i, length, c);
|
||||
if (!isValidNamePart(c))
|
||||
return false;
|
||||
}
|
||||
@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S
|
||||
|
||||
for (unsigned i = 0; i < length;) {
|
||||
UChar32 c;
|
||||
- U16_NEXT(qualifiedName, i, length, c)
|
||||
+ U16_NEXT(qualifiedName, i, length, c);
|
||||
if (c == ':') {
|
||||
if (sawColon) {
|
||||
ec = NAMESPACE_ERR;
|
||||
Loading…
Reference in New Issue