diff --git a/llvm/include/llvm/Support/AArch64TargetParser.h b/llvm/include/llvm/Support/AArch64TargetParser.h
index 0a7ff4e25b8dd9..df560994a35039 100644
--- a/llvm/include/llvm/Support/AArch64TargetParser.h
+++ b/llvm/include/llvm/Support/AArch64TargetParser.h
@@ -16,8 +16,8 @@
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/VersionTuple.h"
-#include <vector>
 #include <array>
+#include <vector>
 
 namespace llvm {
 
@@ -27,6 +27,7 @@ namespace AArch64 {
 
 // Arch extension modifiers for CPUs. These are labelled with their Arm ARM
 // feature name (though the canonical reference for those is AArch64.td)
+// clang-format off
 enum ArchExtKind : uint64_t {
   AEK_INVALID =     0,
   AEK_NONE =        1,
@@ -83,6 +84,7 @@ enum ArchExtKind : uint64_t {
   AEK_D128 =        1ULL << 51, // FEAT_D128
   AEK_LSE128 =      1ULL << 52, // FEAT_LSE128
 };
+// clang-format on
 
 // Represents an extension that can be enabled with -march=<arch>+<extension>.
 // Typically these correspond to Arm Architecture extensions, unlike
diff --git a/llvm/lib/Support/AArch64TargetParser.cpp b/llvm/lib/Support/AArch64TargetParser.cpp
index a6a8777d3914c2..bb8c26cf0fee4c 100644
--- a/llvm/lib/Support/AArch64TargetParser.cpp
+++ b/llvm/lib/Support/AArch64TargetParser.cpp
@@ -73,10 +73,9 @@ bool AArch64::getExtensionFeatures(uint64_t Extensions,
 
 StringRef AArch64::resolveCPUAlias(StringRef CPU) {
   return StringSwitch<StringRef>(CPU)
-#define AARCH64_CPU_ALIAS(ALIAS,NAME)                                          \
-  .Case(ALIAS, NAME)
+#define AARCH64_CPU_ALIAS(ALIAS, NAME) .Case(ALIAS, NAME)
 #include "../../include/llvm/Support/AArch64TargetParser.def"
-  .Default(CPU);
+      .Default(CPU);
 }
 
 StringRef AArch64::getArchExtFeature(StringRef ArchExt) {