My workaround for gcc pr 44174 caused cpuid support to be silently

disabled under gcc.

Hide asm labels in the x86-32 code; some did not begin with a .L so
they were being exported.

1 files changed, 8 insertions, 2 deletions

diff --git a/src/utils/cpuid.cpp b/src/utils/cpuid.cpp
index 7f3b4d9b8..ce3822d55 100644
--- a/src/utils/cpuid.cpp
+++ b/src/utils/cpuid.cpp
@@ -31,15 +31,21 @@
   // Only available starting in GCC 4.3
   #include <cpuid.h>
 
+namespace {
+
   /*
   * Prevent inlining to work around GCC bug 44174
   */
-  void __attribute__((__noinline__)) CALL_CPUID(Botan::u32bit type,
-                                                Botan::u32bit out[4])
+  void __attribute__((__noinline__)) call_gcc_cpuid(Botan::u32bit type,
+                                                    Botan::u32bit out[4])
      {
      __get_cpuid(type, out, out+1, out+2, out+3);
      }
 
+  #define CALL_CPUID call_gcc_cpuid
+
+}
+
 #else
   #warning "No method of calling CPUID for this compiler"
 #endif