Index: tools/llvm-cfi-verify/FileAnalysis.cpp
===================================================================
--- tools/llvm-cfi-verify/FileAnalysis.cpp
+++ tools/llvm-cfi-verify/FileAnalysis.cpp
@@ -50,7 +50,7 @@
     cl::desc("Ignore all DWARF data (warning: may generate false positives)."),
     cl::location(IgnoreDWARF), cl::init(false));
 
-cl::opt<uint64_t> DWARFSearchRange(
+cl::opt<unsigned long long> DWARFSearchRange(
     "dwarf-search-range",
     cl::desc("Address search range used to determine if instruction is valid."),
     cl::init(0x10));
Index: tools/llvm-cfi-verify/GraphBuilder.h
===================================================================
--- tools/llvm-cfi-verify/GraphBuilder.h
+++ tools/llvm-cfi-verify/GraphBuilder.h
@@ -46,8 +46,8 @@
 namespace llvm {
 namespace cfi_verify {
 
-extern uint64_t SearchLengthForUndef;
-extern uint64_t SearchLengthForConditionalBranch;
+extern unsigned long long SearchLengthForUndef;
+extern unsigned long long SearchLengthForConditionalBranch;
 
 struct ControlFlowNode {
   void printControlFlowNode(unsigned depth, raw_ostream& os) const;
Index: tools/llvm-cfi-verify/GraphBuilder.cpp
===================================================================
--- tools/llvm-cfi-verify/GraphBuilder.cpp
+++ tools/llvm-cfi-verify/GraphBuilder.cpp
@@ -41,17 +41,17 @@
 namespace llvm {
 namespace cfi_verify {
 
-uint64_t SearchLengthForUndef;
-uint64_t SearchLengthForConditionalBranch;
+unsigned long long SearchLengthForUndef;
+unsigned long long SearchLengthForConditionalBranch;
 
-static cl::opt<uint64_t, true> SearchLengthForUndefArg(
+static cl::opt<unsigned long long, true> SearchLengthForUndefArg(
     "search-length-undef",
     cl::desc("Specify the maximum amount of instructions "
              "to inspect when searching for an undefined "
              "instruction from a conditional branch."),
     cl::location(SearchLengthForUndef), cl::init(2));
 
-static cl::opt<uint64_t, true> SearchLengthForConditionalBranchArg(
+static cl::opt<unsigned long long, true> SearchLengthForConditionalBranchArg(
     "search-length-cb",
     cl::desc("Specify the maximum amount of instructions "
              "to inspect when searching for a conditional "