From owner-svn-ports-head@freebsd.org Mon Nov 9 15:59:43 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6151C46704D; Mon, 9 Nov 2020 15:59:43 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CVG0H2N4Fz3FsS; Mon, 9 Nov 2020 15:59:43 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3FF0913D98; Mon, 9 Nov 2020 15:59:43 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A9FxhX8049517; Mon, 9 Nov 2020 15:59:43 GMT (envelope-from mikael@FreeBSD.org) Received: (from mikael@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A9Fxg9s049513; Mon, 9 Nov 2020 15:59:42 GMT (envelope-from mikael@FreeBSD.org) Message-Id: <202011091559.0A9Fxg9s049513@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mikael set sender to mikael@FreeBSD.org using -f From: Mikael Urankar Date: Mon, 9 Nov 2020 15:59:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554729 - in head/databases/galera26: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mikael X-SVN-Commit-Paths: in head/databases/galera26: . files X-SVN-Commit-Revision: 554729 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2020 15:59:43 -0000 Author: mikael Date: Mon Nov 9 15:59:42 2020 New Revision: 554729 URL: https://svnweb.freebsd.org/changeset/ports/554729 Log: databases/galera26: fix build on aarch64 The __bswapXX_var macro are not available on arm*, use bswapXX instead Add cpu feature detection on arm* PR: 250664 Reported by: Vincent Milum Jr Approved by: portmgr (tier-2 blanket) Added: head/databases/galera26/files/patch-galerautils_SConscript (contents, props changed) head/databases/galera26/files/patch-galerautils_src_gu__byteswap.h (contents, props changed) head/databases/galera26/files/patch-galerautils_src_gu__crc32c__arm64.c (contents, props changed) Modified: head/databases/galera26/Makefile Modified: head/databases/galera26/Makefile ============================================================================== --- head/databases/galera26/Makefile Mon Nov 9 15:28:13 2020 (r554728) +++ head/databases/galera26/Makefile Mon Nov 9 15:59:42 2020 (r554729) @@ -13,9 +13,6 @@ COMMENT= Synchronous multi-master replication engine 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 Added: head/databases/galera26/files/patch-galerautils_SConscript ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/galera26/files/patch-galerautils_SConscript Mon Nov 9 15:59:42 2020 (r554729) @@ -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); Added: head/databases/galera26/files/patch-galerautils_src_gu__byteswap.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/galera26/files/patch-galerautils_src_gu__byteswap.h Mon Nov 9 15:59:42 2020 (r554729) @@ -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 Added: head/databases/galera26/files/patch-galerautils_src_gu__crc32c__arm64.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/galera26/files/patch-galerautils_src_gu__crc32c__arm64.c Mon Nov 9 15:59:42 2020 (r554729) @@ -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.");