diff options
| author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-05-22 19:38:28 -0300 |
|---|---|---|
| committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-05-22 19:38:28 -0300 |
| commit | ae8f2fff3d56b269ff859995e93cd5e920047ed0 (patch) | |
| tree | f5c580b05d70d0775916971465fafff48b0c0129 /debian | |
| parent | efc13dc33c6c0a55f9bacb8c57dd1fca4cf4d7a0 (diff) | |
| download | qt5webkit-ae8f2fff3d56b269ff859995e93cd5e920047ed0.tar.gz | |
Remove fix_ftbfs_in_archs_without_jit_support.patch
Applied upstream.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/fix_ftbfs_in_archs_without_jit_support.patch | 44 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 45 deletions
diff --git a/debian/changelog b/debian/changelog index ed2b28f..f331cf2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ qtwebkit-opensource-src (5.3.0+dfsg-1) UNRELEASED; urgency=medium libqt5webkit5-dev without creating a circular dependency. * Do not force dh_builddeb to use xz compression: it's now the default. * Bump Qt build dependencies. + * Remove fix_ftbfs_in_archs_without_jit_support.patch, applied upstream. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 17 May 2014 23:25:31 -0300 diff --git a/debian/patches/fix_ftbfs_in_archs_without_jit_support.patch b/debian/patches/fix_ftbfs_in_archs_without_jit_support.patch deleted file mode 100644 index 27965ed..0000000 --- a/debian/patches/fix_ftbfs_in_archs_without_jit_support.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 433796d860326e4ffa344fd2b361f332470ad357 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@digia.com> -Date: Fri, 21 Feb 2014 15:12:45 +0100 -Subject: [PATCH] Fix Qt WebKit build on architectures without JIT support - -The fallback LLINT interpreter was triggering YARR JIT which would -fail to compile and also trigger ENABLE_ASSEMBLER which would trigger -even more not to compile. YARR JIT is only supported on platforms with -valid JIT or native LLINT support. So we must avoid it when the fallback -is used - -Task-number: QTBUG-36969 -Change-Id: Ie94bcb316e192feb33ab528ddc3a328af154cebf ---- - Source/JavaScriptCore/bytecode/CodeBlock.cpp | 4 ++++ - Source/WTF/wtf/Platform.h | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - ---- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp -+++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp -@@ -2947,8 +2947,12 @@ void CodeBlock::countReoptimization() - - unsigned CodeBlock::numberOfDFGCompiles() - { -+#if ENABLE(JIT) - ASSERT(JITCode::isBaselineCode(getJITType())); - return (JITCode::isOptimizingJIT(replacement()->getJITType()) ? 1 : 0) + m_reoptimizationRetryCounter; -+#else -+ return 0; -+#endif - } - - int32_t CodeBlock::codeTypeThresholdMultiplier() const ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -872,7 +872,7 @@ - #define ENABLE_REGEXP_TRACING 0 - - /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */ --#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !(OS(QNX) && PLATFORM(QT)) -+#if !defined(ENABLE_YARR_JIT) && !ENABLE(LLINT_C_LOOP) && !(OS(QNX) && PLATFORM(QT)) - #define ENABLE_YARR_JIT 1 - - /* Setting this flag compares JIT results with interpreter results. */ diff --git a/debian/patches/series b/debian/patches/series index 1ee8b12..9065b06 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ # Upstream patches -fix_ftbfs_in_archs_without_jit_support.patch dont_pollute_pri_and_pc_with_private_deps.patch # debian patches |