diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2018-10-22 16:37:09 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-11-06 16:41:08 +0000 |
commit | d16babf351e11c9bbfce57a7e92ae06194d9dab0 (patch) | |
tree | 4c8496b3fee07dbbf7a28e835cbff9ceb88d8f51 /src/3rdparty/sha3/brg_endian.h.patch | |
parent | 3f61873f497286af1bce97883f30bf9a520e6a75 (diff) |
Update sha3's brg_endian.h, document provenance and version
The existing copyright notice gave me a name; github found me a file;
but it doesn't match what we had before. Made some guesses at which
parts of the change relative to upstream to keep, documented the diff
as a patch and recorded details in qt_attribution.json
Task-number: QTBUG-70008
Change-Id: I423724435eaeeda7237f8b3df8691b436fed8652
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
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 |