diff --git a/lib/Target/X86/X86TargetMachine.cpp b/lib/Target/X86/X86TargetMachine.cpp
index fddb7fb0fb6..17e573300d2 100644
--- a/lib/Target/X86/X86TargetMachine.cpp
+++ b/lib/Target/X86/X86TargetMachine.cpp
@@ -95,12 +95,10 @@ X86TargetMachine::X86TargetMachine(const Target &T, StringRef TT,
 //===----------------------------------------------------------------------===//
 // Command line options for x86
 //===----------------------------------------------------------------------===//
-bool UseVZeroUpper;
-
-static cl::opt<bool, true>
-VZeroUpper("x86-use-vzeroupper",
+static cl::opt<bool>
+UseVZeroUpper("x86-use-vzeroupper",
   cl::desc("Minimize AVX to SSE transition penalty"),
-  cl::location(UseVZeroUpper), cl::init(false));
+  cl::init(false));
 
 //===----------------------------------------------------------------------===//
 // Pass Pipeline Configuration
diff --git a/lib/Target/X86/X86VZeroUpper.cpp b/lib/Target/X86/X86VZeroUpper.cpp
index d87efc99b24..39584942468 100644
--- a/lib/Target/X86/X86VZeroUpper.cpp
+++ b/lib/Target/X86/X86VZeroUpper.cpp
@@ -62,7 +62,7 @@ bool VZeroUpperInserter::runOnMachineFunction(MachineFunction &MF) {
   return Changed;
 }
 
-bool isCallToModuleFn(const MachineInstr *MI) {
+static bool isCallToModuleFn(const MachineInstr *MI) {
   assert(MI->getDesc().isCall() && "Isn't a call instruction");
 
   for (int i = 0, e = MI->getNumOperands(); i != e; ++i) {