diff options
| author |  Benjamin Barenblat <bbaren@google.com> | 2022-07-12 21:47:19 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2022-07-12 21:47:19 -0400 |
| commit | d055841ab4147dac20d5c46d04ca3a2fb13748b7 (patch) | |
| tree | 15a01389c86f10a8844ff2a86bddf46640d065e8 /absl/random/internal/randen_detect.cc | |
| parent | 2d23a3e16abfcf8f22ba850d67e972cc77e98874 (diff) | |
| parent | 273292d1cfc0a94a65082ee350509af1d113344d (diff) | |
Merge new upstream LTS 20220623.0
Diffstat (limited to 'absl/random/internal/randen_detect.cc')
| -rw-r--r-- | absl/random/internal/randen_detect.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/absl/random/internal/randen_detect.cc b/absl/random/internal/randen_detect.cc index bbe7b965..6dababa3 100644 --- a/absl/random/internal/randen_detect.cc +++ b/absl/random/internal/randen_detect.cc @@ -24,6 +24,11 @@ #include "absl/random/internal/platform.h" +#if !defined(__UCLIBC__) && defined(__GLIBC__) && \ + (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) +#define ABSL_HAVE_GETAUXVAL +#endif + #if defined(ABSL_ARCH_X86_64) #define ABSL_INTERNAL_USE_X86_CPUID #elif defined(ABSL_ARCH_PPC) || defined(ABSL_ARCH_ARM) || \ @@ -31,7 +36,7 @@ #if defined(__ANDROID__) #define ABSL_INTERNAL_USE_ANDROID_GETAUXVAL #define ABSL_INTERNAL_USE_GETAUXVAL -#elif defined(__linux__) +#elif defined(__linux__) && defined(ABSL_HAVE_GETAUXVAL) #define ABSL_INTERNAL_USE_LINUX_GETAUXVAL #define ABSL_INTERNAL_USE_GETAUXVAL #endif @@ -40,7 +45,6 @@ #if defined(ABSL_INTERNAL_USE_X86_CPUID) #if defined(_WIN32) || defined(_WIN64) #include <intrin.h> // NOLINT(build/include_order) -#pragma intrinsic(__cpuid) #else // MSVC-equivalent __cpuid intrinsic function. static void __cpuid(int cpu_info[4], int info_type) { |