Skip to content
Snippets Groups Projects
Commit 6a9a3481 authored by Bernard Spil's avatar Bernard Spil
Browse files

databases/mariadb106-server: Update to 10.6.20

parent 1c818fab
No related branches found
No related tags found
No related merge requests found
PORTNAME?= mariadb
PORTVERSION= 10.6.19
PORTVERSION= 10.6.20
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \
......
TIMESTAMP = 1723490771
SHA256 (mariadb-10.6.19.tar.gz) = bcecb0ff7b79a41344736fa994710787c15516d51eb7715f278c3f0fcb7e8703
SIZE (mariadb-10.6.19.tar.gz) = 99979223
TIMESTAMP = 1731237766
SHA256 (mariadb-10.6.20.tar.gz) = 47f05abc7dbebb3f26b31e75022b1b3969dbbc4752c4ae701f8920a604896d41
SIZE (mariadb-10.6.20.tar.gz) = 102697156
--- include/my_cpu.h.orig 2021-09-27 13:32:48 UTC
+++ include/my_cpu.h
@@ -23,7 +23,8 @@
The defines are the same ones used by the linux kernel
*/
-#ifdef _ARCH_PWR8
+#if defined(_ARCH_PWR8)
+#if defined(linux)
#include <sys/platform/ppc.h>
/* Very low priority */
#define HMT_very_low() __ppc_set_ppr_very_low()
@@ -37,6 +38,22 @@
#define HMT_medium_high() __ppc_set_ppr_med_high()
/* High priority */
#define HMT_high() asm volatile("or 3,3,3")
+#elif defined(__FreeBSD__)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+/* Very low priority */
+#define HMT_very_low() __asm__ volatile ("or 31,31,31")
+/* Low priority */
+#define HMT_low() __asm__ volatile ("or 1,1,1")
+/* Medium low priority */
+#define HMT_medium_low() __asm__ volatile ("or 6,6,6")
+/* Medium priority */
+#define HMT_medium() __asm__ volatile ("or 2,2,2")
+/* Medium high priority */
+#define HMT_medium_high() __asm__ volatile ("or 5,5,5")
+/* High priority */
+#define HMT_high() asm volatile("or 3,3,3")
+#endif
#else
#define HMT_very_low()
#define HMT_low()
@@ -81,7 +98,12 @@ static inline void MY_RELAX_CPU(void)
__asm__ __volatile__ ("pause");
#endif
#elif defined(_ARCH_PWR8)
+#if defined(linux)
__ppc_get_timebase();
+#elif defined(__FreeBSD__)
+ uint64_t __tb;
+ __asm__ volatile ("mfspr %0, 268" : "=r" (__tb));
+#endif
#elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
/* Mainly, prevent the compiler from optimizing away delay loops */
#ifdef _aarch64_
--- mysys/crc32/crc32c.cc.orig 2024-06-14 11:34:14 UTC
+++ mysys/crc32/crc32c.cc
@@ -455,7 +455,7 @@ static int arch_ppc_probe(void) {
return arch_ppc_crc32;
}
-# elif defined __FreeBSD_version && __FreeBSD_version >= 1200000
+# elif defined __FreeBSD__
# include <machine/cpu.h>
# include <sys/auxv.h>
# include <sys/elf_common.h>
--- sql/mysqld.cc.orig 2021-06-15 10:16:51 UTC
+++ sql/mysqld.cc
@@ -205,7 +205,7 @@ typedef fp_except fp_except_t;
inline void setup_fpu()
{
-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT)
+#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV)
/* We can't handle floating point exceptions with threads, so disable
this on freebsd
Don't fall for overflow, underflow,divide-by-zero or loss of precision.
@@ -218,7 +218,7 @@ inline void setup_fpu()
fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ |
FP_X_IMP));
#endif /* FP_X_DNML */
-#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */
+#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && FP_X_INV */
#ifdef HAVE_FEDISABLEEXCEPT
fedisableexcept(FE_ALL_EXCEPT);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment