Index: lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp
===================================================================
--- lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp
+++ lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp
@@ -1096,7 +1096,8 @@
   return Mnemonic;
 }
 
-bool IsMemoryAssignmentError(const OperandVector &Operands) {
+static bool
+IsMemoryAssignmentError(const OperandVector &Operands) {
   // Detects if a memory operation has an erroneous base register modification.
   // Memory operations are detected by matching the types of operands.
   //
Index: lib/Target/Lanai/MCTargetDesc/LanaiMCCodeEmitter.cpp
===================================================================
--- lib/Target/Lanai/MCTargetDesc/LanaiMCCodeEmitter.cpp
+++ lib/Target/Lanai/MCTargetDesc/LanaiMCCodeEmitter.cpp
@@ -89,6 +89,7 @@
 
 } // end anonymous namespace
 
+static
 Lanai::Fixups FixupKind(const MCExpr *Expr) {
   if (isa<MCSymbolRefExpr>(Expr))
     return Lanai::FIXUP_LANAI_21;
@@ -134,8 +135,9 @@
 }
 
 // Helper function to adjust P and Q bits on load and store instructions.
-unsigned adjustPqBits(const MCInst &Inst, unsigned Value, unsigned PBitShift,
-                      unsigned QBitShift) {
+static unsigned
+adjustPqBits(const MCInst &Inst, unsigned Value, unsigned PBitShift,
+            unsigned QBitShift) {
   const MCOperand AluOp = Inst.getOperand(3);
   unsigned AluCode = AluOp.getImm();