Commit 561b6d21 authored by Marko Mäkelä's avatar Marko Mäkelä

Revert "Merge pull request #275 from grooverdan/10.2-MDEV-11075-crc32-runtime-detect-getauxval"

This reverts commit edf4cc75, reversing
changes made to 9320d8ae.
parent 229dd711
...@@ -83,12 +83,6 @@ mysys/my_perf.c, contributed by Facebook under the following license. ...@@ -83,12 +83,6 @@ mysys/my_perf.c, contributed by Facebook under the following license.
#include "my_config.h" #include "my_config.h"
#include <string.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 "univ.i"
#include "ut0crc32.h" #include "ut0crc32.h"
...@@ -746,14 +740,8 @@ ut_crc32_init() ...@@ -746,14 +740,8 @@ ut_crc32_init()
} }
#elif defined(HAVE_CRC32_VPMSUM) #elif defined(HAVE_CRC32_VPMSUM)
#if defined(__linux__) ut_crc32 = ut_crc32_power8;
if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07) { ut_crc32_implementation = "Using POWER8 crc32 instructions";
#endif
ut_crc32 = ut_crc32_power8;
ut_crc32_implementation = "Using POWER8 crc32 instructions";
#if defined(__linux__)
}
#endif
#endif #endif
} }
...@@ -336,13 +336,7 @@ ut_crc32_init() ...@@ -336,13 +336,7 @@ ut_crc32_init()
} }
#elif defined(HAVE_CRC32_VPMSUM) #elif defined(HAVE_CRC32_VPMSUM)
#if defined(__linux__) ut_crc32 = ut_crc32_power8;
if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07) { ut_crc32_implementation = "Using POWER8 crc32 instructions";
#endif
ut_crc32 = ut_crc32_power8;
ut_crc32_implementation = "Using POWER8 crc32 instructions";
#if defined(__linux__)
}
#endif
#endif #endif
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment