Commit d46f3f5d authored by Morten Johan Sørvig's avatar Morten Johan Sørvig
Browse files

Remove PNaCl QUnicodeTables workaround.


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: default avatarMorten Johan Sørvig <morten.sorvig@theqtcompany.com>
parent 5b0bc3b7
No related merge requests found
Showing with 0 additions and 32 deletions
...@@ -55,37 +55,6 @@ QT_BEGIN_NAMESPACE ...@@ -55,37 +55,6 @@ QT_BEGIN_NAMESPACE
namespace QUnicodeTables { 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 { struct Properties {
ushort category : 8; /* 5 used */ ushort category : 8; /* 5 used */
ushort direction : 8; /* 5 used */ ushort direction : 8; /* 5 used */
...@@ -109,7 +78,6 @@ struct Properties { ...@@ -109,7 +78,6 @@ struct Properties {
ushort lineBreakClass : 8; /* 6 used */ ushort lineBreakClass : 8; /* 6 used */
ushort script : 8; 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(uint ucs4) Q_DECL_NOTHROW;
Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2) Q_DECL_NOTHROW; Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2) Q_DECL_NOTHROW;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment