Attachment 219153 Details for Bug 250664 – v2

[patch] v2

galera26.patch (text/plain), 4.59 KB, created by Mikael Urankar on 2020-10-27 20:39:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2020-10-27 20:39:58 UTC

Size: 4.59 KB

patch

obsolete

>Index: databases/galera26/Makefile
>===================================================================
>--- databases/galera26/Makefile	(revision 553476)
>+++ databases/galera26/Makefile	(working copy)
>@@ -13,9 +13,6 @@
> 
> LICENSE=	GPLv2
> 
>-BROKEN_aarch64=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
>-BROKEN_armv6=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
>-BROKEN_armv7=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
> NOT_FOR_ARCHS=		i386
> # On i386 older versions of clang produce:
> #   cannot compile this atomic library call yet ... __atomic_add_fetch
>Index: databases/galera26/files/patch-galerautils_SConscript
>===================================================================
>--- databases/galera26/files/patch-galerautils_SConscript	(nonexistent)
>+++ databases/galera26/files/patch-galerautils_SConscript	(working copy)
>@@ -0,0 +1,12 @@
>+--- galerautils/SConscript.orig	2020-10-27 20:24:02 UTC
>++++ galerautils/SConscript
>+@@ -48,7 +48,9 @@ if not crc32c_no_hardware:
>+ 
>+                             int main()
>+                             {
>++				#if defined(__linux__)
>+                                 (void)getauxval(AT_HWCAP);
>++				#endif
>+ 
>+                                 (void)__crc32b(0, 0);
>+                                 (void)__crc32h(0, 0);
>
>Property changes on: databases/galera26/files/patch-galerautils_SConscript
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/galera26/files/patch-galerautils_src_gu__byteswap.h
>===================================================================
>--- databases/galera26/files/patch-galerautils_src_gu__byteswap.h	(nonexistent)
>+++ databases/galera26/files/patch-galerautils_src_gu__byteswap.h	(working copy)
>@@ -0,0 +1,22 @@
>+--- 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
>
>Property changes on: databases/galera26/files/patch-galerautils_src_gu__byteswap.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/galera26/files/patch-galerautils_src_gu__crc32c__arm64.c
>===================================================================
>--- databases/galera26/files/patch-galerautils_src_gu__crc32c__arm64.c	(nonexistent)
>+++ databases/galera26/files/patch-galerautils_src_gu__crc32c__arm64.c	(working copy)
>@@ -0,0 +1,16 @@
>+--- galerautils/src/gu_crc32c_arm64.c.orig	2020-10-27 20:24:41 UTC
>++++ galerautils/src/gu_crc32c_arm64.c
>+@@ -74,7 +74,13 @@ gu_crc32c_arm64(gu_crc32c_t state, const void* data, s
>+ gu_crc32c_func_t
>+ gu_crc32c_hardware()
>+ {
>++#if defined(__linux__)
>+     unsigned long int const hwcaps = getauxval(AT_HWCAP);
>++#endif
>++#if defined(__FreeBSD__)
>++    unsigned long hwcaps;
>++    elf_aux_info(AT_HWCAP, &hwcaps, sizeof(hwcaps));
>++#endif
>+     if (hwcaps & HWCAP_CRC32)
>+     {
>+         gu_info ("CRC-32C: using hardware acceleration.");
>
>Property changes on: databases/galera26/files/patch-galerautils_src_gu__crc32c__arm64.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 250664: 219152 | 219153