Fix wrong assignment in compiler_rt

Author: mikolaj-pirog

compiler-rt/lib/builtins/cpu_model/x86.c

@@ -62,7 +62,6 @@ enum ProcessorTypes {
   ZHAOXIN_FAM7H,
   INTEL_SIERRAFOREST,
   INTEL_GRANDRIDGE,
-  INTEL_CLEARWATERFOREST,
   AMDFAM1AH,
   CPU_TYPE_MAX
 };
@@ -105,6 +104,7 @@ enum ProcessorSubtypes {
   AMDFAM1AH_ZNVER5,
   INTEL_COREI7_DIAMONDRAPIDS,
   INTEL_COREI7_NOVALAKE,
+  INTEL_CLEARWATERFOREST,
   CPU_SUBTYPE_MAX
 };
 
@@ -322,8 +322,8 @@ static void detectX86FamilyModel(unsigned EAX, unsigned *Family,
 static const char *getIntelProcessorTypeAndSubtype(unsigned Family,
                                                    unsigned Model,
                                                    const unsigned *Features,
-                                                   unsigned *Type,
-                                                   unsigned *Subtype) {
+                                                   enum ProcessorTypes *Type,
+                                                   enum ProcessorSubtypes *Subtype) {
   // We select CPU strings to match the code in Host.cpp, but we don't use them
   // in compiler-rt.
   const char *CPU = 0;
@@ -670,8 +670,8 @@ static const char *getIntelProcessorTypeAndSubtype(unsigned Family,
 static const char *getAMDProcessorTypeAndSubtype(unsigned Family,
                                                  unsigned Model,
                                                  const unsigned *Features,
-                                                 unsigned *Type,
-                                                 unsigned *Subtype) {
+                                                 enum ProcessorTypes *Type,
+                                                 enum ProcessorSubtypes *Subtype) {
   const char *CPU = 0;
 
   switch (Family) {
@@ -1162,8 +1162,8 @@ __attribute__((visibility("hidden")))
 #endif
 struct __processor_model {
   unsigned int __cpu_vendor;
-  unsigned int __cpu_type;
-  unsigned int __cpu_subtype;
+  enum ProcessorTypes  __cpu_type;
+  enum ProcessorSubtypes  __cpu_subtype;
   unsigned int __cpu_features[1];
 } __cpu_model = {0, 0, 0, {0}};