diff options
| author |   Zoltán Böszörményi <zboszor@gmail.com> | 2021-07-06 08:57:49 +0200 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2021-07-18 09:34:32 -0700 |
| commit | 13a011b4500f81d212408ba8f9894ed183c07fd1 (patch) | |
| tree | f14d63a4c5c8110a1c9165aadb15733480aab092 /meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch | |
| parent | 48a84cb8a18b291cb8a00de96a66176ed340f94b (diff) | |
| download | meta-openembedded-13a011b4500f81d212408ba8f9894ed183c07fd1.tar.gz | |
mariadb: Upgrade to 10.5.11
Forward port musl patches
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 287ffdf1d03731fadd6a90b224d08cf9a3b50de5)
[Stable branch]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch')
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch b/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch index d082d424b0..d6e53c29e1 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch @@ -36,7 +36,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> + __builtin_ppc_get_timebase(); #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) /* Mainly, prevent the compiler from optimizing away delay loops */ - __asm__ __volatile__ ("isb":::"memory"); + #ifdef _aarch64_ --- a/storage/tokudb/PerconaFT/portability/toku_time.h +++ b/storage/tokudb/PerconaFT/portability/toku_time.h @@ -124,7 +124,7 @@ static inline tokutime_t toku_time_now(v |