Index: .clang-format
===================================================================
--- .clang-format
+++ .clang-format
@@ -3,6 +3,8 @@
 ---
 BasedOnStyle: WebKit
 AlignAfterOpenBracket: DontAlign
+# This option works only starting with LLVM 12.
+#AlignConsecutiveMacros: AcrossEmptyLines
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: Left
@@ -91,6 +93,7 @@
   - TAILQ_FOREACH_SAFE
   - VM_MAP_ENTRY_FOREACH
   - VM_PAGE_DUMP_FOREACH
+SpaceBeforeParens: ControlStatementsExceptForEachMacros
 IndentCaseLabels: false
 IndentPPDirectives: None
 Language: Cpp
@@ -159,7 +162,7 @@
 # http://llvm.org/docs/CodingStandards.html#include-style
 IncludeIsMainRegex: 'BLAH_DONT_MATCH_ANYTHING'
 SortIncludes: true
-KeepEmptyLinesAtTheStartOfBlocks: true
+KeepEmptyLinesAtTheStartOfBlocks: false
 TypenameMacros:
   - ARB_ELMTYPE
   - ARB_HEAD