diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-20 22:46:29 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-20 22:46:29 +0200 |
| commit | 561b6d213c2c03d92a5b951d6e434604cf79dbf9 (patch) | |
| tree | 048eeb101cc1639e5fd6819eef648a483e2e1a64 /storage/innobase/ut/ut0crc32.cc | |
| parent | 229dd711d40a25dbbbabcc0f7cef06b01638fd43 (diff) | |
| download | mariadb-git-561b6d213c2c03d92a5b951d6e434604cf79dbf9.tar.gz | |
Revert "Merge pull request #275 from grooverdan/10.2-MDEV-11075-crc32-runtime-detect-getauxval"
This reverts commit edf4cc7519b84a2e00b5284761781352b3d376f3, reversing
changes made to 9320d8ae30c18420bef659618175836221d363ea.
Diffstat (limited to 'storage/innobase/ut/ut0crc32.cc')
| -rw-r--r-- | storage/innobase/ut/ut0crc32.cc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/storage/innobase/ut/ut0crc32.cc b/storage/innobase/ut/ut0crc32.cc index 1a5890eed42..386d32f6a60 100644 --- a/storage/innobase/ut/ut0crc32.cc +++ b/storage/innobase/ut/ut0crc32.cc @@ -83,12 +83,6 @@ mysys/my_perf.c, contributed by Facebook under the following license. #include "my_config.h" #include <string.h> -#if defined(__linux__) && defined(HAVE_CRC32_VPMSUM) -/* Used to detect at runtime if we have vpmsum instructions (PowerISA 2.07) */ -#include <sys/auxv.h> -#include <bits/hwcap.h> -#endif - #include "univ.i" #include "ut0crc32.h" @@ -746,14 +740,8 @@ ut_crc32_init() } #elif defined(HAVE_CRC32_VPMSUM) -#if defined(__linux__) - if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07) { -#endif - ut_crc32 = ut_crc32_power8; - ut_crc32_implementation = "Using POWER8 crc32 instructions"; -#if defined(__linux__) - } -#endif + ut_crc32 = ut_crc32_power8; + ut_crc32_implementation = "Using POWER8 crc32 instructions"; #endif } |