From d46f3f5d5df80e0dc59db27d35d8b8f8909303d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Sun, 7 Feb 2016 09:03:00 +0100 Subject: Remove PNaCl QUnicodeTables workaround. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The bug is no longer present on current versions of the toolchain (tested: pepper_42). This was also causing QChar::toLower() and QML compilation errors. Change-Id: I9fda442d9ec954ceaa5bf63312bcc1d656e2e543 Task-number: QTBUG-50302 Reviewed-by: Morten Johan Sørvig --- src/corelib/tools/qunicodetables_p.h | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/src/corelib/tools/qunicodetables_p.h b/src/corelib/tools/qunicodetables_p.h index d84602eadf..6a2797be0e 100644 --- a/src/corelib/tools/qunicodetables_p.h +++ b/src/corelib/tools/qunicodetables_p.h @@ -55,37 +55,6 @@ QT_BEGIN_NAMESPACE namespace QUnicodeTables { -#ifdef Q_OS_PNACL -// Work around bit-field related compiler bug on PNaCl -// -// Function _ZN5QChar14isSpace_helperEj disallowed: bad result type: i160* %gep9.asptr = inttoptr i32 %gep9 to i160* -// Function _ZN5QChar14isSpace_helperEj disallowed: bad pointer: %bf.load = load i160* %gep9.asptr, align 1 -// LLVM ERROR: PNaCl ABI verification failed -// -struct Properties { - ushort category; - ushort direction; - ushort combiningClass; - ushort joining; - signed short digitValue; - signed short mirrorDiff; - signed short lowerCaseDiff; - signed short upperCaseDiff; - signed short titleCaseDiff; - signed short caseFoldDiff; - ushort lowerCaseSpecial; - ushort upperCaseSpecial; - ushort titleCaseSpecial; - ushort caseFoldSpecial; - ushort unicodeVersion; - ushort nfQuickCheck; - ushort graphemeBreakClass; - ushort wordBreakClass; - ushort sentenceBreakClass; - ushort lineBreakClass; - ushort script; -}; -#else struct Properties { ushort category : 8; /* 5 used */ ushort direction : 8; /* 5 used */ @@ -109,7 +78,6 @@ struct Properties { ushort lineBreakClass : 8; /* 6 used */ ushort script : 8; }; -#endif Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4) Q_DECL_NOTHROW; Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2) Q_DECL_NOTHROW; -- cgit v1.2.3