From 2f3e76da63628b8447679bed1a8bdc7cad449080 Mon Sep 17 00:00:00 2001 From: Jacek Poplawski Date: Tue, 18 Jul 2023 08:29:24 +0200 Subject: [PATCH] VxWorks does not have byteswap.h Change-Id: I9927fa64e76d59415d4974538383321c6dd6318b Reviewed-by: Thiago Macieira --- src/3rdparty/sha3/brg_endian.h | 2 +- src/3rdparty/sha3/brg_endian.h.patch | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/3rdparty/sha3/brg_endian.h b/src/3rdparty/sha3/brg_endian.h index 9bb306e678..0baac93dc9 100644 --- a/src/3rdparty/sha3/brg_endian.h +++ b/src/3rdparty/sha3/brg_endian.h @@ -42,7 +42,7 @@ Changes for ARM 9/9/2010 [Downstream relative to Gladman's GitHub, upstream to Q #elif defined( __linux__ ) || defined( __GNUC__ ) || defined( __GNU_LIBRARY__ ) # if !defined( __MINGW32__ ) && !defined( _AIX ) && !defined(Q_OS_QNX) # include -# if !defined( __BEOS__ ) && !defined(Q_OS_RTEMS) +# if !defined( __BEOS__ ) && !defined(Q_OS_RTEMS) && !defined(Q_OS_VXWORKS) # include # endif # endif diff --git a/src/3rdparty/sha3/brg_endian.h.patch b/src/3rdparty/sha3/brg_endian.h.patch index 395133ad2a..41807bdbbf 100644 --- a/src/3rdparty/sha3/brg_endian.h.patch +++ b/src/3rdparty/sha3/brg_endian.h.patch @@ -1,6 +1,5 @@ -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 +--- /home/jacek/git/sha/brg_endian.h 2023-07-25 23:20:58.157487162 +0200 ++++ brg_endian.h 2023-07-25 23:27:20.889797352 +0200 @@ -16,6 +16,7 @@ and fitness for purpose. --------------------------------------------------------------------------- @@ -9,6 +8,18 @@ diff -ub /home/eddy/.sys/tmp/sha/brg_endian.h /home/eddy/work/Qt-5.12/qtbase/src */ #ifndef _BRG_ENDIAN_H +@@ -39,9 +40,9 @@ + defined( __CYGWIN32__ ) || defined( __DJGPP__ ) || defined( __osf__ ) + # include + #elif defined( __linux__ ) || defined( __GNUC__ ) || defined( __GNU_LIBRARY__ ) +-# if !defined( __MINGW32__ ) && !defined( _AIX ) ++# if !defined( __MINGW32__ ) && !defined( _AIX ) && !defined(Q_OS_QNX) + # include +-# if !defined( __BEOS__ ) ++# if !defined( __BEOS__ ) && !defined(Q_OS_RTEMS) && !defined(Q_OS_VXWORKS) + # include + # endif + # endif @@ -119,12 +120,18 @@ defined( THINK_C ) || defined( __VMCMS__ ) || defined( _AIX ) # define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN @@ -30,5 +41,3 @@ diff -ub /home/eddy/.sys/tmp/sha/brg_endian.h /home/eddy/work/Qt-5.12/qtbase/src #endif #endif - -Diff finished. Mon Oct 22 16:31:46 2018