1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build in INTEGRITY: __mulh is not defined

Browse Source 
Commit 6b875f0625acc6c6a4f8899b829176baaf7d8502 created a macro for it,
but in the multiple updates to find the best solution, we forgot to use
it.

Fixes: QTBUG-72429
Change-Id: I4ac1156702324f0fb814fffd156f27c1789d1409
Reviewed-by: Thomas Miller <thomaslmiller91@gmail.com>
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Thiago Macieira 2018-12-10 18:55:09 -08:00
parent 193d19d86e
commit e3d1f8d075
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qnumeric_p.h
View File

@ -348,7 +348,7 @@ template <> inline bool mul_overflow(qint64 v1, qint64 v2, qint64 *r)
// as signed for the low bits and use a signed right shift to verify that // as signed for the low bits and use a signed right shift to verify that
// 'high' is nothing but sign bits that match the sign of 'low'. // 'high' is nothing but sign bits that match the sign of 'low'.
qint64 high = __mulh(v1, v2); qint64 high = Q_SMULH(v1, v2);
*r = qint64(quint64(v1) * quint64(v2)); *r = qint64(quint64(v1) * quint64(v2));
return (*r >> 63) != high; return (*r >> 63) != high;
} }