Attachment #219152 for bug #250664

Lines 13-21 Link Here

(-)databases/galera26/Makefile (-3 lines)
13		13
14	LICENSE= GPLv2	14	LICENSE= GPLv2
15		15
16	BROKEN_aarch64= fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
17	BROKEN_armv6= fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
18	BROKEN_armv7= fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
19	NOT_FOR_ARCHS= i386	16	NOT_FOR_ARCHS= i386
20	# On i386 older versions of clang produce:	17	# On i386 older versions of clang produce:
21	# cannot compile this atomic library call yet ... __atomic_add_fetch	18	# cannot compile this atomic library call yet ... __atomic_add_fetch




--- galerautils/src/gu_byteswap.h.orig	2020-10-12 06:33:51 UTC
+++ galerautils/src/gu_byteswap.h
@@ -54,10 +54,15 @@ static GU_FORCE_INLINE uint64_t GU_ROTL64 (uint64_t x,
 #  define gu_bswap32 _OSSwapInt32
 #  define gu_bswap64 _OSSwapInt64
 #elif defined(__FreeBSD__)
-/* do not use bswapXX, because gcc44 gives old-style cast warnings */
-#  define gu_bswap16 __bswap16_var
-#  define gu_bswap32 __bswap32_var
-#  define gu_bswap64 __bswap64_var
+#  if defined(__aarch64__) || defined(__arm__)
+#    define gu_bswap16 bswap16
+#    define gu_bswap32 bswap32
+#    define gu_bswap64 bswap64
+#  else
+#    define gu_bswap16 __bswap16_var
+#    define gu_bswap32 __bswap32_var
+#    define gu_bswap64 __bswap64_var
+#  endif // __FreeBSD__
 #elif defined(__sun__)
 #  define gu_bswap16 BSWAP_16
 #  define gu_bswap32 BSWAP_32

Return to bug 250664

Line 0 Link Here

(-)databases/galera26/files/patch-galerautils_src_gu__byteswap.h (+22 lines)
	1	--- galerautils/src/gu_byteswap.h.orig 2020-10-12 06:33:51 UTC
	2	+++ galerautils/src/gu_byteswap.h
	3	@@ -54,10 +54,15 @@ static GU_FORCE_INLINE uint64_t GU_ROTL64 (uint64_t x,
	4	# define gu_bswap32 _OSSwapInt32
	5	# define gu_bswap64 _OSSwapInt64
	6	#elif defined(__FreeBSD__)
	7	-/* do not use bswapXX, because gcc44 gives old-style cast warnings */
	8	-# define gu_bswap16 __bswap16_var
	9	-# define gu_bswap32 __bswap32_var
	10	-# define gu_bswap64 __bswap64_var
	11	+# if defined(__aarch64__) \|\| defined(__arm__)
	12	+# define gu_bswap16 bswap16
	13	+# define gu_bswap32 bswap32
	14	+# define gu_bswap64 bswap64
	15	+# else
	16	+# define gu_bswap16 __bswap16_var
	17	+# define gu_bswap32 __bswap32_var
	18	+# define gu_bswap64 __bswap64_var
	19	+# endif // __FreeBSD__
	20	#elif defined(__sun__)
	21	# define gu_bswap16 BSWAP_16
	22	# define gu_bswap32 BSWAP_32