diff options
| author |  Abseil Team <absl-team@google.com> | 2023-05-22 16:05:19 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-worker@google.com> | 2023-05-22 16:06:03 -0700 |
| commit | 830dabdbf3d8eded2490be634c34e033a32bad71 (patch) | |
| tree | ff8dd4905dc6ec00ad50d33307529d53eb283088 | |
| parent | 051aa9805f28cf156d232b6319f09da4d5b5cb3e (diff) | |
Rollback of add a declaration for __cpuid for the IntelLLVM compiler.
PiperOrigin-RevId: 534213948
Change-Id: I56b897060b9afe9d3d338756c80e52f421653b55
| -rw-r--r-- | absl/crc/internal/cpu_detect.cc | 10 | ||||
| -rw-r--r-- | absl/random/internal/randen_detect.cc | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/absl/crc/internal/cpu_detect.cc b/absl/crc/internal/cpu_detect.cc index 4e29d0fa..d61b7018 100644 --- a/absl/crc/internal/cpu_detect.cc +++ b/absl/crc/internal/cpu_detect.cc @@ -34,11 +34,9 @@ namespace crc_internal { #if defined(__x86_64__) || defined(_M_X64) -#if ABSL_HAVE_BUILTIN(__cpuid) -// MSVC-equivalent __cpuid intrinsic declaration for clang-like compilers -// for non-Windows build environments. -extern void __cpuid(int[4], int); -#elif !defined(_WIN32) && !defined(_WIN64) +namespace { + +#if !defined(_WIN32) && !defined(_WIN64) // MSVC defines this function for us. // https://learn.microsoft.com/en-us/cpp/intrinsics/cpuid-cpuidex static void __cpuid(int cpu_info[4], int info_type) { @@ -49,8 +47,6 @@ static void __cpuid(int cpu_info[4], int info_type) { } #endif // !defined(_WIN32) && !defined(_WIN64) -namespace { - enum class Vendor { kUnknown, kIntel, diff --git a/absl/random/internal/randen_detect.cc b/absl/random/internal/randen_detect.cc index bdeab877..6dababa3 100644 --- a/absl/random/internal/randen_detect.cc +++ b/absl/random/internal/randen_detect.cc @@ -45,10 +45,6 @@ #if defined(ABSL_INTERNAL_USE_X86_CPUID) #if defined(_WIN32) || defined(_WIN64) #include <intrin.h> // NOLINT(build/include_order) -#elif ABSL_HAVE_BUILTIN(__cpuid) -// MSVC-equivalent __cpuid intrinsic declaration for clang-like compilers -// for non-Windows build environments. -extern void __cpuid(int[4], int); #else // MSVC-equivalent __cpuid intrinsic function. static void __cpuid(int cpu_info[4], int info_type) { |