rebase

Created using spr 1.3.8-beta.1

Author: melver

llvm/lib/Support/CMakeLists.txt

@@ -147,9 +147,9 @@ add_llvm_component_library(LLVMSupport
   ARMBuildAttributes.cpp
   AArch64AttributeParser.cpp
   AArch64BuildAttributes.cpp
-  AllocToken.cpp
   ARMAttributeParser.cpp
   ARMWinEH.cpp
+  AllocToken.cpp
   Allocator.cpp
   AutoConvert.cpp
   Base64.cpp

llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn

@@ -45,6 +45,7 @@ static_library("Support") {
     "ARMAttributeParser.cpp",
     "ARMBuildAttributes.cpp",
     "ARMWinEH.cpp",
+    "AllocToken.cpp",
     "Allocator.cpp",
     "AutoConvert.cpp",
     "BalancedPartitioning.cpp",