database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2025-01-20 09:57:37 +02:00
parent 8d6c9ef001 cbb24d9aa5
commit 98dbe3bfaf
142 changed files with 3642 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/my_cpu.h
View File

@@ -94,13 +94,8 @@ static inline void MY_RELAX_CPU(void)
__asm__ __volatile__ ("pause");
#endif
#elif defined(_ARCH_PWR8)
#ifdef __FreeBSD__
uint64_t __tb;
__asm__ volatile ("mfspr %0, 268" : "=r" (__tb));
#else
/* Changed from __ppc_get_timebase for musl compatibility */
/* Changed from __ppc_get_timebase for musl and clang compatibility */
__builtin_ppc_get_timebase();
#endif
#elif defined __GNUC__ && defined __riscv
__builtin_riscv_pause();
#elif defined __GNUC__