1 files changed, 54 insertions, 14 deletions
diff --git a/lib/spack/llnl/util/cpu/microarchitectures.json b/lib/spack/llnl/util/cpu/microarchitectures.json
index 0b934e5157..10cad1670a 100644
--- a/lib/spack/llnl/util/cpu/microarchitectures.json
+++ b/lib/spack/llnl/util/cpu/microarchitectures.json
@@ -1134,14 +1134,13 @@
         },
         "clang": {
           "versions": ":",
-          "family": "aarch64",
-          "flags": "-march={family} -mcpu=generic"
+          "flags": "-march=armv8-a -mtune=generic"
         }
       }
     },
     "thunderx2": {
       "from": "aarch64",
-      "vendor": "0x43",
+      "vendor": "Cavium",
       "features": [
         "fp",
         "asimd",
@@ -1174,15 +1173,21 @@
             "flags": "-mcpu=thunderx2t99"
           }
         ],
-        "clang": {
-          "versions": ":",
-          "flags": "-march=armv8-a -mcpu=generic"
-        }
+        "clang": [
+          {
+            "versions": "3.9:4.9",
+            "flags": "-march=armv8.1-a+crc+crypto"
+          },
+          {
+            "versions": "5:",
+            "flags": "-mcpu=thunderx2t99"
+          }
+        ]
       }
     },
     "a64fx": {
       "from": "aarch64",
-      "vendor": "0x46",
+      "vendor": "Fujitsu",
       "features": [
         "fp",
         "asimd",
@@ -1217,17 +1222,23 @@
           },
           {
             "versions": "7:7.9",
-            "flags": "-arch=armv8.2a+crc+crypt+fp16"
+            "flags": "-march=armv8.2a+crc+crypto+fp16"
           },
           {
             "versions": "8:",
-            "flags": "-arch=armv8.2a+crc+aes+sh2+fp16+sve -msve-vector-bits=512"
+            "flags": "-march=armv8.2a+crc+aes+sha2+fp16+sve -msve-vector-bits=512"
           }
         ],
-        "clang": {
-          "versions": ":",
-          "flags": "-march=armv8-a -mcpu=generic"
-        }
+        "clang": [
+          {
+            "versions": "3.9:4.9",
+            "flags": "-march=armv8.2-a+crc+crypto+fp16"
+          },
+          {
+            "versions": "5:",
+            "flags": "-march=armv8.2-a+crc+crypto+fp16+sve"
+          }
+        ]
       }
     },
     "arm": {
@@ -1313,5 +1324,34 @@
         "aarch64"
       ]
     }
+  },
+  "conversions": {
+    "description": "Conversions that map some platform specific values to canonical values",
+    "arm_vendors": {
+      "0x41": "ARM",
+      "0x42": "Broadcom",
+      "0x43": "Cavium",
+      "0x44": "DEC",
+      "0x46": "Fujitsu",
+      "0x48": "HiSilicon",
+      "0x49": "Infineon Technologies AG",
+      "0x4d": "Motorola",
+      "0x4e": "Nvidia",
+      "0x50": "APM",
+      "0x51": "Qualcomm",
+      "0x53": "Samsung",
+      "0x56": "Marvell",
+      "0x61": "Apple",
+      "0x66": "Faraday",
+      "0x68": "HXT",
+      "0x69": "Intel"
+    },
+    "darwin_flags": {
+      "sse4.1": "sse4_1",
+      "sse4.2": "sse4_2",
+      "avx1.0": "avx",
+      "clfsopt": "clflushopt",
+      "xsave": "xsavec xsaveopt"
+    }
   }
 }