From 7634420f318a8f594f5267c1e0aea9a389c6c181 Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet@google.com>
Date: Tue, 13 Feb 2018 10:12:21 +0100
Subject: [PATCH] GCC does not discover all cpu features. Fixes #22

---
 CMakeLists.txt                                |  3 +-
 ...puid_x86_clang.c => cpuid_x86_clang_gcc.c} |  8 +++--
 src/cpuid_x86_gcc.c                           | 32 -------------------
 3 files changed, 7 insertions(+), 36 deletions(-)
 rename src/{cpuid_x86_clang.c => cpuid_x86_clang_gcc.c} (77%)
 delete mode 100644 src/cpuid_x86_gcc.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dcb364e..3dd10b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,8 +38,7 @@ add_library(cpu_features
   include/internal/string_view.h
   include/cpu_features_macros.h
   src/linux_features_aggregator.c
-  src/cpuid_x86_clang.c
-  src/cpuid_x86_gcc.c
+  src/cpuid_x86_clang_gcc.c
   src/cpuid_x86_msvc.c
   src/cpuinfo_aarch64.c
   src/cpuinfo_arm.c
diff --git a/src/cpuid_x86_clang.c b/src/cpuid_x86_clang_gcc.c
similarity index 77%
rename from src/cpuid_x86_clang.c
rename to src/cpuid_x86_clang_gcc.c
index fcc786a..472e712 100644
--- a/src/cpuid_x86_clang.c
+++ b/src/cpuid_x86_clang_gcc.c
@@ -14,7 +14,9 @@
 
 #include "internal/cpuid_x86.h"
 
-#if defined(CPU_FEATURES_ARCH_X86) && defined(CPU_FEATURES_COMPILER_CLANG)
+#if defined(CPU_FEATURES_ARCH_X86)
+#if defined(CPU_FEATURES_COMPILER_CLANG) || defined(CPU_FEATURES_COMPILER_GCC)
+
 #include <cpuid.h>
 
 Leaf CpuId(uint32_t leaf_id) {
@@ -29,4 +31,6 @@ uint32_t GetXCR0Eax(void) {
   return eax;
 }
 
-#endif  // defined(CPU_FEATURES_ARCH_X86) && defined(CPU_FEATURES_COMPILER_CLANG)
+#endif  // defined(CPU_FEATURES_COMPILER_CLANG) ||
+        // defined(CPU_FEATURES_COMPILER_GCC)
+#endif  // defined(CPU_FEATURES_ARCH_X86)
diff --git a/src/cpuid_x86_gcc.c b/src/cpuid_x86_gcc.c
deleted file mode 100644
index bf0139b..0000000
--- a/src/cpuid_x86_gcc.c
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2017 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "internal/cpuid_x86.h"
-
-#if defined(CPU_FEATURES_ARCH_X86) && defined(CPU_FEATURES_COMPILER_GCC)
-#include <cpuid.h>
-
-Leaf CpuId(uint32_t leaf_id) {
-  Leaf leaf;
-  __cpuid(leaf_id, leaf.eax, leaf.ebx, leaf.ecx, leaf.edx);
-  return leaf;
-}
-
-uint32_t GetXCR0Eax(void) {
-  uint32_t eax, edx;
-  __asm("XGETBV" : "=a"(eax), "=d"(edx) : "c"(0));
-  return eax;
-}
-
-#endif  // defined(CPU_FEATURES_ARCH_X86) && defined(CPU_FEATURES_COMPILER_GCC)