diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-22 10:11:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-22 10:11:08 +0300 |
| commit | 641f09398fdc37c6f3b0ec6731d5f246ecf24866 (patch) | |
| tree | 0c6e4a290119928a42ad6ffe9d4bdb372d5482f1 /mysys | |
| parent | f43370baf3b00733ddfe0f704520a07092fc9a0e (diff) | |
| parent | 82d5994520c239da1b6edf1b24e08138ae0c753d (diff) | |
| download | mariadb-git-641f09398fdc37c6f3b0ec6731d5f246ecf24866.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/crc32/crc32_arm64.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mysys/crc32/crc32_arm64.c b/mysys/crc32/crc32_arm64.c index 62606c7ddea..0e70c21812a 100644 --- a/mysys/crc32/crc32_arm64.c +++ b/mysys/crc32/crc32_arm64.c @@ -2,13 +2,13 @@ #include <string.h> #include <stdint.h> +static int pmull_supported; + #if defined(HAVE_ARMV8_CRC) #if defined(__APPLE__) #include <sys/sysctl.h> -static int pmull_supported; - int crc32_aarch64_available(void) { int ret; @@ -48,8 +48,6 @@ static unsigned long getauxval(unsigned int key) # define HWCAP_PMULL (1 << 4) #endif -static int pmull_supported; - /* ARM made crc32 default from ARMv8.1 but optional in ARMv8A * Runtime check API. */ |