@@ -48,14 +48,11 @@
 	jz	0f
 
 	ret
 
 0:
-	call	get_eip
-1:
-	addl	$\not_found-1b, %eax
-	jmp	*%eax
+	jmp	\not_found
 .endm
 
 .macro generate_lookup_super name lookup
 \name:
 	movl	4(%esp), %edx
@@ -73,17 +70,11 @@
 generate_lookup _objc_msg_lookup_stret _objc_method_not_found_stret
 generate_lookup_super _objc_msg_lookup_super _objc_msg_lookup
 generate_lookup_super _objc_msg_lookup_super_stret _objc_msg_lookup_stret
 
 ret_nil:
-	call	get_eip
-0:
-	addl	$nil_method-0b, %eax
+	movl	$nil_method, %eax
 	ret
 
 nil_method:
 	xorl	%eax, %eax
 	ret
-
-get_eip:
-	movl	(%esp), %eax
-	ret