Index: src/forwarding/forwarding-x86-elf.S
==================================================================
--- src/forwarding/forwarding-x86-elf.S
+++ src/forwarding/forwarding-x86-elf.S
@@ -26,11 +26,11 @@
 	movl	%esp, %ebp
 
 	pushl	%ebx
 	subl	$20, %esp
 
-	call	get_eip
+	call	getEIP
 	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
 
 	movl	8(%ebp), %eax
 	movl	%eax, (%esp)
 	call	object_getClass@PLT
@@ -73,11 +73,11 @@
 	popl	%ebp
 
 	jmp	*%eax
 
 0:
-	leal	OFMethodNotFound@GOTOFF(%ebx), %eax
+	movl	OFMethodNotFound@GOT(%ebx), %eax
 
 	addl	$20, %esp
 	popl	%ebx
 	popl	%ebp
 
@@ -90,11 +90,11 @@
 	movl	%esp, %ebp
 
 	pushl	%ebx
 	subl	$20, %esp
 
-	call	get_eip
+	call	getEIP
 	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
 
 	movl	12(%ebp), %eax
 	movl	%eax, (%esp)
 	call	object_getClass@PLT
@@ -137,11 +137,11 @@
 	popl	%ebp
 
 	jmp	*%eax
 
 0:
-	leal	OFMethodNotFound_stret@GOTOFF(%ebx), %eax
+	movl	OFMethodNotFound_stret@GOT(%ebx), %eax
 
 	addl	$20, %esp
 	popl	%ebx
 	popl	%ebp
 
@@ -154,11 +154,11 @@
 	movl	%esp, %ebp
 
 	pushl	%ebx
 	subl	$4, %esp
 
-	call	get_eip
+	call	getEIP
 	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
 
 	leal	module@GOTOFF(%ebx), %eax
 	movl	%eax, (%esp)
 	call	__objc_exec_class@PLT
@@ -166,11 +166,11 @@
 	addl	$4, %esp
 	popl	%ebx
 	popl	%ebp
 	ret
 
-get_eip:
+getEIP:
 	movl	(%esp), %ebx
 	ret
 
 #ifdef OF_SOLARIS
 .section .init_array, "aw"

Index: src/runtime/lookup-asm/lookup-asm-x86-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-x86-elf.S
+++ src/runtime/lookup-asm/lookup-asm-x86-elf.S
@@ -53,23 +53,23 @@
 	ret
 
 0:
 	call	getEIP
 	addl	$_GLOBAL_OFFSET_TABLE_, %eax
-	lea	\notFound@GOTOFF(%eax), %eax
+	movl	\notFound@GOT(%eax), %eax
 	jmp	*%eax
 
 .LtaggedPointer_\name:
 	call	getEIP
 	addl	$_GLOBAL_OFFSET_TABLE_, %eax
 
-	leal	objc_taggedPointerSecret@GOTOFF(%eax), %ecx
+	movl	objc_taggedPointerSecret@GOT(%eax), %ecx
 	xorl	(%ecx), %edx
 	andb	$0xE, %dl
 	movzbl	%dl, %edx
 
-	leal	objc_taggedPointerClasses@GOTOFF(%eax), %eax
+	movl	objc_taggedPointerClasses@GOT(%eax), %eax
 	movl	(%eax,%edx,2), %edx
 	movl	32(%edx), %edx
 
 	jmp	.Lmain_\name
 .type \name, %function