Index: compiler-rt/trunk/lib/scudo/scudo_utils.cpp
===================================================================
--- compiler-rt/trunk/lib/scudo/scudo_utils.cpp
+++ compiler-rt/trunk/lib/scudo/scudo_utils.cpp
@@ -87,7 +87,7 @@
 
 bool testCPUFeature(CPUFeature Feature)
 {
-  static CPUIDRegs FeaturesRegs = getCPUFeatures();
+  CPUIDRegs FeaturesRegs = getCPUFeatures();
 
   switch (Feature) {
     case CRC32CPUFeature:  // CRC32 is provided by SSE 4.2.