diff options
author | Liang Qi <liang.qi@qt.io> | 2018-11-16 08:10:15 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-11-16 08:10:15 +0100 |
commit | 37d3bc9ad7731a131485a9be1ae5b5aac430f82e (patch) | |
tree | 2456b1d9bb5050bd5c871c62d0a2d362a1a003c7 /src/3rdparty/sha3/brg_endian.h.patch | |
parent | 1983abddc06350541ac7a4bb4b2da14091e96311 (diff) | |
parent | 900b57ea90ebe60414a5188337bc85ee4faac220 (diff) |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: Ic1dd39044e19f50e1068d4ac70dacaad6440e570
Diffstat (limited to 'src/3rdparty/sha3/brg_endian.h.patch')
-rw-r--r-- | src/3rdparty/sha3/brg_endian.h.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/src/3rdparty/sha3/brg_endian.h.patch b/src/3rdparty/sha3/brg_endian.h.patch new file mode 100644 index 0000000000..395133ad2a --- /dev/null +++ b/src/3rdparty/sha3/brg_endian.h.patch @@ -0,0 +1,34 @@ +diff -ub /home/eddy/.sys/tmp/sha/brg_endian.h /home/eddy/work/Qt-5.12/qtbase/src/3rdparty/sha3/brg_endian.h +--- upstream/sha/brg_endian.h 2018-10-22 16:27:04.106128670 +0200 ++++ qtbase/src/3rdparty/sha3/brg_endian.h 2018-10-22 16:30:35.098891562 +0200 +@@ -16,6 +16,7 @@ + and fitness for purpose. + --------------------------------------------------------------------------- + Issue Date: 20/12/2007 ++Changes for ARM 9/9/2010 [Downstream relative to Gladman's GitHub, upstream to Qt] + */ + + #ifndef _BRG_ENDIAN_H +@@ -119,12 +120,18 @@ + defined( THINK_C ) || defined( __VMCMS__ ) || defined( _AIX ) + # define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN + +-#elif 0 /* **** EDIT HERE IF NECESSARY **** */ ++#elif defined(__arm__) ++# ifdef __BIG_ENDIAN ++# define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN ++# else ++# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN ++# endif ++#elif 1 /* **** EDIT HERE IF NECESSARY **** */ + # define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN + #elif 0 /* **** EDIT HERE IF NECESSARY **** */ + # define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN + #else +-# error Please edit lines 126 or 128 in brg_endian.h to set the platform byte order ++# error Please edit lines 129 or 131 in brg_endian.h to set the platform byte order + #endif + + #endif + +Diff finished. Mon Oct 22 16:31:46 2018 |