diff --git a/lib/Target/X86/X86Instr64bit.td b/lib/Target/X86/X86Instr64bit.td
index 2fe26c0..ba886e4 100644
--- a/lib/Target/X86/X86Instr64bit.td
+++ b/lib/Target/X86/X86Instr64bit.td
@@ -45,9 +45,8 @@
 // Complex Pattern Definitions.
 //
 def lea64addr : ComplexPattern<i64, 4, "SelectLEAAddr",
-                        [add, mul, X86mul_imm, shl, or, frameindex, X86Wrapper,
-                         X86WrapperRIP],
-                        []>;
+                        [add, mul, X86mul_imm, shl, or, frameindex,
+                         X86WrapperRIP], []>;
 
 def tls64addr : ComplexPattern<i64, 4, "SelectTLSADDRAddr",
                                [tglobaltlsaddr], []>;
@@ -1421,6 +1420,19 @@
 def : Pat<(i64 (X86Wrapper texternalsym:$dst)),
           (MOV64ri texternalsym:$dst)>, Requires<[NotSmallCode]>;
 
+// In static codegen with small code model, we can get the address of a label
+// into a register with 'movl'.  FIXME: This is a hack, the 'imm' predicate of
+// the MOV64ri64i32 should accept these.
+def : Pat<(i64 (X86Wrapper tconstpool  :$dst)),
+          (MOV64ri64i32 tconstpool  :$dst)>, Requires<[SmallCode]>;
+def : Pat<(i64 (X86Wrapper tjumptable  :$dst)),
+          (MOV64ri64i32 tjumptable  :$dst)>, Requires<[SmallCode]>;
+def : Pat<(i64 (X86Wrapper tglobaladdr :$dst)),
+          (MOV64ri64i32 tglobaladdr :$dst)>, Requires<[SmallCode]>;
+def : Pat<(i64 (X86Wrapper texternalsym:$dst)),
+          (MOV64ri64i32 texternalsym:$dst)>, Requires<[SmallCode]>;
+
+
 // If we have small model and -static mode, it is safe to store global addresses
 // directly as immediates.  FIXME: This is really a hack, the 'imm' predicate
 // for MOV64mi32 should handle this sort of thing.
diff --git a/test/CodeGen/X86/abi-isel.ll b/test/CodeGen/X86/abi-isel.ll
index 3362105..4d069e5 100644
--- a/test/CodeGen/X86/abi-isel.ll
+++ b/test/CodeGen/X86/abi-isel.ll
@@ -1010,7 +1010,7 @@
 entry:
 	ret i8* bitcast ([131072 x i32]* @src to i8*)
 ; LINUX-64-STATIC: bar00:
-; LINUX-64-STATIC: leaq    src, %rax
+; LINUX-64-STATIC: movl    $src, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1018,7 +1018,7 @@
 entry:
 	ret i8* bitcast ([32 x i32]* @xsrc to i8*)
 ; LINUX-64-STATIC: bxr00:
-; LINUX-64-STATIC: leaq    xsrc, %rax
+; LINUX-64-STATIC: movl    $xsrc, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1026,7 +1026,7 @@
 entry:
 	ret i8* bitcast ([131072 x i32]* @dst to i8*)
 ; LINUX-64-STATIC: bar01:
-; LINUX-64-STATIC: leaq    dst, %rax
+; LINUX-64-STATIC: movl    $dst, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1034,7 +1034,7 @@
 entry:
 	ret i8* bitcast ([32 x i32]* @xdst to i8*)
 ; LINUX-64-STATIC: bxr01:
-; LINUX-64-STATIC: leaq    xdst, %rax
+; LINUX-64-STATIC: movl    $xdst, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1042,7 +1042,7 @@
 entry:
 	ret i8* bitcast (i32** @ptr to i8*)
 ; LINUX-64-STATIC: bar02:
-; LINUX-64-STATIC: leaq    ptr, %rax
+; LINUX-64-STATIC: movl    $ptr, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1050,7 +1050,7 @@
 entry:
 	ret i8* bitcast ([131072 x i32]* @dsrc to i8*)
 ; LINUX-64-STATIC: bar03:
-; LINUX-64-STATIC: leaq    dsrc, %rax
+; LINUX-64-STATIC: movl    $dsrc, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1058,7 +1058,7 @@
 entry:
 	ret i8* bitcast ([131072 x i32]* @ddst to i8*)
 ; LINUX-64-STATIC: bar04:
-; LINUX-64-STATIC: leaq    ddst, %rax
+; LINUX-64-STATIC: movl    $ddst, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1066,7 +1066,7 @@
 entry:
 	ret i8* bitcast (i32** @dptr to i8*)
 ; LINUX-64-STATIC: bar05:
-; LINUX-64-STATIC: leaq    dptr, %rax
+; LINUX-64-STATIC: movl    $dptr, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1074,7 +1074,7 @@
 entry:
 	ret i8* bitcast ([131072 x i32]* @lsrc to i8*)
 ; LINUX-64-STATIC: bar06:
-; LINUX-64-STATIC: leaq    lsrc, %rax
+; LINUX-64-STATIC: movl    $lsrc, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1082,7 +1082,7 @@
 entry:
 	ret i8* bitcast ([131072 x i32]* @ldst to i8*)
 ; LINUX-64-STATIC: bar07:
-; LINUX-64-STATIC: leaq    ldst, %rax
+; LINUX-64-STATIC: movl    $ldst, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1090,7 +1090,7 @@
 entry:
 	ret i8* bitcast (i32** @lptr to i8*)
 ; LINUX-64-STATIC: bar08:
-; LINUX-64-STATIC: leaq    lptr, %rax
+; LINUX-64-STATIC: movl    $lptr, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1098,7 +1098,7 @@
 entry:
 	ret i8* bitcast ([131072 x i32]* @src to i8*)
 ; LINUX-64-STATIC: har00:
-; LINUX-64-STATIC: leaq    src, %rax
+; LINUX-64-STATIC: movl    $src, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1106,7 +1106,7 @@
 entry:
 	ret i8* bitcast ([32 x i32]* @xsrc to i8*)
 ; LINUX-64-STATIC: hxr00:
-; LINUX-64-STATIC: leaq    xsrc, %rax
+; LINUX-64-STATIC: movl    $xsrc, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1114,7 +1114,7 @@
 entry:
 	ret i8* bitcast ([131072 x i32]* @dst to i8*)
 ; LINUX-64-STATIC: har01:
-; LINUX-64-STATIC: leaq    dst, %rax
+; LINUX-64-STATIC: movl    $dst, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1122,7 +1122,7 @@
 entry:
 	ret i8* bitcast ([32 x i32]* @xdst to i8*)
 ; LINUX-64-STATIC: hxr01:
-; LINUX-64-STATIC: leaq    xdst, %rax
+; LINUX-64-STATIC: movl    $xdst, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1140,7 +1140,7 @@
 entry:
 	ret i8* bitcast ([131072 x i32]* @dsrc to i8*)
 ; LINUX-64-STATIC: har03:
-; LINUX-64-STATIC: leaq    dsrc, %rax
+; LINUX-64-STATIC: movl    $dsrc, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1148,7 +1148,7 @@
 entry:
 	ret i8* bitcast ([131072 x i32]* @ddst to i8*)
 ; LINUX-64-STATIC: har04:
-; LINUX-64-STATIC: leaq    ddst, %rax
+; LINUX-64-STATIC: movl    $ddst, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1166,7 +1166,7 @@
 entry:
 	ret i8* bitcast ([131072 x i32]* @lsrc to i8*)
 ; LINUX-64-STATIC: har06:
-; LINUX-64-STATIC: leaq    lsrc, %rax
+; LINUX-64-STATIC: movl    $lsrc, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1174,7 +1174,7 @@
 entry:
 	ret i8* bitcast ([131072 x i32]* @ldst to i8*)
 ; LINUX-64-STATIC: har07:
-; LINUX-64-STATIC: leaq    ldst, %rax
+; LINUX-64-STATIC: movl    $ldst, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1192,7 +1192,7 @@
 entry:
 	ret i8* bitcast (i32* getelementptr ([131072 x i32]* @src, i32 0, i64 16) to i8*)
 ; LINUX-64-STATIC: bat00:
-; LINUX-64-STATIC: leaq    src+64, %rax
+; LINUX-64-STATIC: movl    $src+64, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1200,7 +1200,7 @@
 entry:
 	ret i8* bitcast (i32* getelementptr ([32 x i32]* @xsrc, i32 0, i64 16) to i8*)
 ; LINUX-64-STATIC: bxt00:
-; LINUX-64-STATIC: leaq    xsrc+64, %rax
+; LINUX-64-STATIC: movl    $xsrc+64, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1208,7 +1208,7 @@
 entry:
 	ret i8* bitcast (i32* getelementptr ([131072 x i32]* @dst, i32 0, i64 16) to i8*)
 ; LINUX-64-STATIC: bat01:
-; LINUX-64-STATIC: leaq    dst+64, %rax
+; LINUX-64-STATIC: movl    $dst+64, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1216,7 +1216,7 @@
 entry:
 	ret i8* bitcast (i32* getelementptr ([32 x i32]* @xdst, i32 0, i64 16) to i8*)
 ; LINUX-64-STATIC: bxt01:
-; LINUX-64-STATIC: leaq    xdst+64, %rax
+; LINUX-64-STATIC: movl    $xdst+64, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1236,7 +1236,7 @@
 entry:
 	ret i8* bitcast (i32* getelementptr ([131072 x i32]* @dsrc, i32 0, i64 16) to i8*)
 ; LINUX-64-STATIC: bat03:
-; LINUX-64-STATIC: leaq    dsrc+64, %rax
+; LINUX-64-STATIC: movl    $dsrc+64, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1244,7 +1244,7 @@
 entry:
 	ret i8* bitcast (i32* getelementptr ([131072 x i32]* @ddst, i32 0, i64 16) to i8*)
 ; LINUX-64-STATIC: bat04:
-; LINUX-64-STATIC: leaq    ddst+64, %rax
+; LINUX-64-STATIC: movl    $ddst+64, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1264,7 +1264,7 @@
 entry:
 	ret i8* bitcast (i32* getelementptr ([131072 x i32]* @lsrc, i32 0, i64 16) to i8*)
 ; LINUX-64-STATIC: bat06:
-; LINUX-64-STATIC: leaq    lsrc+64, %rax
+; LINUX-64-STATIC: movl    $lsrc+64, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1272,7 +1272,7 @@
 entry:
 	ret i8* bitcast (i32* getelementptr ([131072 x i32]* @ldst, i32 0, i64 16) to i8*)
 ; LINUX-64-STATIC: bat07:
-; LINUX-64-STATIC: leaq    ldst+64, %rax
+; LINUX-64-STATIC: movl    $ldst+64, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1292,7 +1292,7 @@
 entry:
 	ret i8* bitcast (i32* getelementptr ([131072 x i32]* @src, i32 0, i64 65536) to i8*)
 ; LINUX-64-STATIC: bam00:
-; LINUX-64-STATIC: leaq    src+262144, %rax
+; LINUX-64-STATIC: movl    $src+262144, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1300,7 +1300,7 @@
 entry:
 	ret i8* bitcast (i32* getelementptr ([131072 x i32]* @dst, i32 0, i64 65536) to i8*)
 ; LINUX-64-STATIC: bam01:
-; LINUX-64-STATIC: leaq    dst+262144, %rax
+; LINUX-64-STATIC: movl    $dst+262144, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1308,7 +1308,7 @@
 entry:
 	ret i8* bitcast (i32* getelementptr ([32 x i32]* @xdst, i32 0, i64 65536) to i8*)
 ; LINUX-64-STATIC: bxm01:
-; LINUX-64-STATIC: leaq    xdst+262144, %rax
+; LINUX-64-STATIC: movl    $xdst+262144, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1328,7 +1328,7 @@
 entry:
 	ret i8* bitcast (i32* getelementptr ([131072 x i32]* @dsrc, i32 0, i64 65536) to i8*)
 ; LINUX-64-STATIC: bam03:
-; LINUX-64-STATIC: leaq    dsrc+262144, %rax
+; LINUX-64-STATIC: movl    $dsrc+262144, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1336,7 +1336,7 @@
 entry:
 	ret i8* bitcast (i32* getelementptr ([131072 x i32]* @ddst, i32 0, i64 65536) to i8*)
 ; LINUX-64-STATIC: bam04:
-; LINUX-64-STATIC: leaq    ddst+262144, %rax
+; LINUX-64-STATIC: movl    $ddst+262144, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1356,7 +1356,7 @@
 entry:
 	ret i8* bitcast (i32* getelementptr ([131072 x i32]* @lsrc, i32 0, i64 65536) to i8*)
 ; LINUX-64-STATIC: bam06:
-; LINUX-64-STATIC: leaq    lsrc+262144, %rax
+; LINUX-64-STATIC: movl    $lsrc+262144, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1364,7 +1364,7 @@
 entry:
 	ret i8* bitcast (i32* getelementptr ([131072 x i32]* @ldst, i32 0, i64 65536) to i8*)
 ; LINUX-64-STATIC: bam07:
-; LINUX-64-STATIC: leaq    ldst+262144, %rax
+; LINUX-64-STATIC: movl    $ldst+262144, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1684,7 +1684,7 @@
 entry:
 	ret void ()* @callee
 ; LINUX-64-STATIC: address:
-; LINUX-64-STATIC: leaq    callee, %rax
+; LINUX-64-STATIC: movl    $callee, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1694,7 +1694,7 @@
 entry:
 	ret void ()* @lcallee
 ; LINUX-64-STATIC: laddress:
-; LINUX-64-STATIC: leaq    lcallee, %rax
+; LINUX-64-STATIC: movl    $lcallee, %eax
 ; LINUX-64-STATIC: ret
 }
 
@@ -1702,7 +1702,7 @@
 entry:
 	ret void ()* @dcallee
 ; LINUX-64-STATIC: daddress:
-; LINUX-64-STATIC: leaq    dcallee, %rax
+; LINUX-64-STATIC: movl    $dcallee, %eax
 ; LINUX-64-STATIC: ret
 }