Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -250,10 +250,14 @@
 			dnl files, but not for assembly files.
 			mips*-*-*)
 				flag="-integrated-as"
 				OBJCFLAGS="$OBJCFLAGS $flag"
 				OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS $flag"
+				;;
+			dnl Many older Clang versions don't support jmp short.
+			i?86-*-* | x86_64-*-*)
+				ASFLAGS="$ASFLAGS -no-integrated-as"
 				;;
 			dnl Clang's assembler on Windows is not complete yet
 			dnl and cannot compile all .S files.
 			*-*-mingw*)
 				ASFLAGS="$ASFLAGS -no-integrated-as"

Index: src/forwarding/forwarding-x86-elf.S
==================================================================
--- src/forwarding/forwarding-x86-elf.S
+++ src/forwarding/forwarding-x86-elf.S
@@ -17,175 +17,177 @@
 
 #include "config.h"
 
 #include "platform.h"
 
+.intel_syntax noprefix
+
 .globl of_forward
 .globl of_forward_stret
 
 .section .text
 of_forward:
-	pushl	%ebp
-	movl	%esp, %ebp
+	push	ebp
+	mov	ebp, esp
 
-	pushl	%ebx
-	subl	$20, %esp
+	push	ebx
+	sub	esp, 20
 
 	call	get_eip
 0:
-	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
-
-	movl	8(%ebp), %eax
-	movl	%eax, (%esp)
-	movl	object_getClass@GOT(%ebx), %eax
-	call	*%eax
-
-	movl	%eax, (%esp)
-	leal	sel_forwardingTargetForSelector_@GOTOFF(%ebx), %eax
-	movl	%eax, 4(%esp)
-	movl	class_respondsToSelector@GOT(%ebx), %eax
-	call	*%eax
-
-	testl	%eax, %eax
-	jz	1f
-
-	movl	8(%ebp), %eax
-	movl	%eax, (%esp)
-	leal	sel_forwardingTargetForSelector_@GOTOFF(%ebx), %eax
-	movl	%eax, 4(%esp)
-	movl	objc_msg_lookup@GOT(%ebx), %eax
-	call	*%eax
-
-	movl	8(%ebp), %edx
-	movl	%edx, (%esp)
-	leal	sel_forwardingTargetForSelector_@GOTOFF(%ebx), %edx
-	movl	%edx, 4(%esp)
-	movl	12(%ebp), %edx
-	movl	%edx, 8(%esp)
-	call	*%eax
-
-	testl	%eax, %eax
-	jz	1f
-	cmpl	8(%ebp), %eax
-	je	1f
-
-	movl	%eax, 8(%ebp)
-	movl	%eax, (%esp)
-	movl	12(%ebp), %eax
-	movl	%eax, 4(%esp)
-	movl	objc_msg_lookup@GOT(%ebx), %eax
-	call	*%eax
-
-	addl	$20, %esp
-	popl	%ebx
-	popl	%ebp
-
-	jmp	*%eax
+	add	ebx, offset _GLOBAL_OFFSET_TABLE_
+
+	mov	eax, [ebp+8]
+	mov	[esp], eax
+	mov	eax, [ebx+object_getClass@GOT]
+	call	eax
+
+	mov	[esp], eax
+	lea	eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF]
+	mov	[esp+4], eax
+	mov	eax, [ebx+class_respondsToSelector@GOT]
+	call	eax
+
+	test	eax, eax
+	jz	short 1f
+
+	mov	eax, [ebp+8]
+	mov	[esp], eax
+	lea	eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF]
+	mov	[esp+4], eax
+	mov	eax, [ebx+objc_msg_lookup@GOT]
+	call	eax
+
+	mov	edx, [ebp+8]
+	mov	[esp], edx
+	lea	edx, [ebx+sel_forwardingTargetForSelector_@GOTOFF]
+	mov	[esp+4], edx
+	mov	edx, [ebp+12]
+	mov	[esp+8], edx
+	call	eax
+
+	test	eax, eax
+	jz	short 1f
+	cmp	eax, [ebp+8]
+	je	short 1f
+
+	mov	[ebp+8], eax
+	mov	[esp], eax
+	mov	eax, [ebp+12]
+	mov	[esp+4], eax
+	mov	eax, [ebx+objc_msg_lookup@GOT]
+	call	eax
+
+	add	esp, 20
+	pop	ebx
+	pop	ebp
+
+	jmp	eax
 
 1:
-	movl	of_method_not_found@GOT(%ebx), %eax
+	mov	eax, [ebx+of_method_not_found@GOT]
 
-	addl	$20, %esp
-	popl	%ebx
-	popl	%ebp
+	add	esp, 20
+	pop	ebx
+	pop	ebp
 
-	jmp	*%eax
+	jmp	eax
 .type of_forward, %function
 .size of_forward, .-of_forward
 
 of_forward_stret:
-	pushl	%ebp
-	movl	%esp, %ebp
+	push	ebp
+	mov	ebp, esp
 
-	pushl	%ebx
-	subl	$20, %esp
+	push	ebx
+	sub	esp, 20
 
 	call	get_eip
 0:
-	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
-
-	movl	12(%ebp), %eax
-	movl	%eax, (%esp)
-	movl	object_getClass@GOT(%ebx), %eax
-	call	*%eax
-
-	movl	%eax, (%esp)
-	leal	sel_forwardingTargetForSelector_@GOTOFF(%ebx), %eax
-	movl	%eax, 4(%esp)
-	movl	class_respondsToSelector@GOT(%ebx), %eax
-	call	*%eax
-
-	testl	%eax, %eax
-	jz	1f
-
-	movl	12(%ebp), %eax
-	movl	%eax, (%esp)
-	leal	sel_forwardingTargetForSelector_@GOTOFF(%ebx), %eax
-	movl	%eax, 4(%esp)
-	movl	objc_msg_lookup@GOT(%ebx), %eax
-	call	*%eax
-
-	movl	12(%ebp), %edx
-	movl	%edx, (%esp)
-	leal	sel_forwardingTargetForSelector_@GOTOFF(%ebx), %edx
-	movl	%edx, 4(%esp)
-	movl	16(%ebp), %edx
-	movl	%edx, 8(%esp)
-	call	*%eax
-
-	testl	%eax, %eax
-	jz	1f
-	cmpl	12(%ebp), %eax
-	je	1f
-
-	movl	%eax, 12(%ebp)
-	movl	%eax, (%esp)
-	movl	16(%ebp), %eax
-	movl	%eax, 4(%esp)
-	movl	objc_msg_lookup_stret@GOT(%ebx), %eax
-	call	*%eax
-
-	addl	$20, %esp
-	popl	%ebx
-	popl	%ebp
-
-	jmp	*%eax
+	add	ebx, offset _GLOBAL_OFFSET_TABLE_
+
+	mov	eax, [ebp+12]
+	mov	[esp], eax
+	mov	eax, [ebx+object_getClass@GOT]
+	call	eax
+
+	mov	[esp], eax
+	lea	eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF]
+	mov	[esp+4], eax
+	mov	eax, [ebx+class_respondsToSelector@GOT]
+	call	eax
+
+	test	eax, eax
+	jz	short 1f
+
+	mov	eax, [ebp+12]
+	mov	[esp], eax
+	lea	eax, [ebx+sel_forwardingTargetForSelector_@GOTOFF]
+	mov	[esp+4], eax
+	mov	eax, [ebx+objc_msg_lookup@GOT]
+	call	eax
+
+	mov	edx, [ebp+12]
+	mov	[esp], edx
+	lea	edx, [ebx+sel_forwardingTargetForSelector_@GOTOFF]
+	mov	[esp+4], edx
+	mov	edx, [ebp+16]
+	mov	[esp+8], edx
+	call	eax
+
+	test	eax, eax
+	jz	short 1f
+	cmp	eax, [ebp+12]
+	je	short 1f
+
+	mov	[ebp+12], eax
+	mov	[esp], eax
+	mov	eax, [ebp+16]
+	mov	[esp+4], eax
+	mov	eax, [ebx+objc_msg_lookup_stret@GOT]
+	call	eax
+
+	add	esp, 20
+	pop	ebx
+	pop	ebp
+
+	jmp	eax
 
 1:
-	movl	of_method_not_found_stret@GOT(%ebx), %eax
+	mov	eax, [ebx+of_method_not_found_stret@GOT]
 
-	addl	$20, %esp
-	popl	%ebx
-	popl	%ebp
+	add	esp, 20
+	pop	ebx
+	pop	ebp
 
-	jmp	*%eax
+	jmp	eax
 .type of_forward_stret, %function
 .size of_forward_stret, .-of_forward_stret
 
 init:
-	pushl	%ebp
-	movl	%esp, %ebp
+	push	ebp
+	mov	ebp, esp
 
-	pushl	%ebx
-	subl	$4, %esp
+	push	ebx
+	sub	esp, 4
 
 	call	get_eip
 0:
-	add	$_GLOBAL_OFFSET_TABLE_, %ebx
-
-	leal	module@GOTOFF(%ebx), %eax
-	movl	%eax, (%esp)
-	movl	__objc_exec_class@GOT(%ebx), %eax
-	call	*%eax
-
-	addl	$4, %esp
-	popl	%ebx
-	popl	%ebp
+	add	ebx, offset _GLOBAL_OFFSET_TABLE_
+
+	lea	eax, [ebx+module@GOTOFF]
+	mov	[esp], eax
+	mov	eax, [ebx+__objc_exec_class@GOT]
+	call	eax
+
+	add	esp, 4
+	pop	ebx
+	pop	ebp
 	ret
 
 get_eip:
-	movl	(%esp), %ebx
+	mov	ebx, [esp]
 	ret
 
 #ifdef OF_SOLARIS
 .section .init_array, "aw"
 #else

Index: src/forwarding/forwarding-x86_64-elf.S
==================================================================
--- src/forwarding/forwarding-x86_64-elf.S
+++ src/forwarding/forwarding-x86_64-elf.S
@@ -17,188 +17,190 @@
 
 #include "config.h"
 
 #include "platform.h"
 
+.intel_syntax noprefix
+
 .globl of_forward
 .globl of_forward_stret
 
 .section .text
 of_forward:
-	pushq	%rbp
-	movq	%rsp, %rbp
+	push	rbp
+	mov	rbp, rsp
 
 	/* Save all arguments */
-	subq	$0xC0, %rsp	/* 16-byte alignment */
-	movq	%rax, -0x8(%rbp)
-	movq	%rdi, -0x10(%rbp)
-	movq	%rsi, -0x18(%rbp)
-	movq	%rdx, -0x20(%rbp)
-	movq	%rcx, -0x28(%rbp)
-	movq	%r8, -0x30(%rbp)
-	movq	%r9, -0x38(%rbp)
-	movaps	%xmm0, -0x50(%rbp)
-	movaps	%xmm1, -0x60(%rbp)
-	movaps	%xmm2, -0x70(%rbp)
-	movaps	%xmm3, -0x80(%rbp)
-	movaps	%xmm4, -0x90(%rbp)
-	movaps	%xmm5, -0xA0(%rbp)
-	movaps	%xmm6, -0xB0(%rbp)
-	movaps	%xmm7, -0xC0(%rbp)
+	sub	rsp, 0xC0	/* 16-byte alignment */
+	mov	[rbp-0x08], rax
+	mov	[rbp-0x10], rdi
+	mov	[rbp-0x18], rsi
+	mov	[rbp-0x20], rdx
+	mov	[rbp-0x28], rcx
+	mov	[rbp-0x30], r8
+	mov	[rbp-0x38], r9
+	movaps	[rbp-0x50], xmm0
+	movaps	[rbp-0x60], xmm1
+	movaps	[rbp-0x70], xmm2
+	movaps	[rbp-0x80], xmm3
+	movaps	[rbp-0x90], xmm4
+	movaps	[rbp-0xA0], xmm5
+	movaps	[rbp-0xB0], xmm6
+	movaps	[rbp-0xC0], xmm7
 
 	call	object_getClass@PLT
 
-	movq	%rax, %rdi
-	leaq	sel_forwardingTargetForSelector_(%rip), %rsi
+	mov	rdi, rax
+	lea	rsi, [rip+sel_forwardingTargetForSelector_]
 	call	class_respondsToSelector@PLT
 
-	testq	%rax, %rax
-	jz	0f
-
-	movq	-0x10(%rbp), %rdi
-	leaq	sel_forwardingTargetForSelector_(%rip), %rsi
-	call	objc_msg_lookup@PLT
-
-	movq	-0x10(%rbp), %rdi
-	leaq	sel_forwardingTargetForSelector_(%rip), %rsi
-	movq	-0x18(%rbp), %rdx
-	call	*%rax
-
-	testq	%rax, %rax
-	jz	0f
-	cmpq	-0x10(%rbp), %rax
-	je	0f
-
-	movq	%rax, -0x10(%rbp)
-
-	movq	%rax, %rdi
-	movq	-0x18(%rbp), %rsi
-	call	objc_msg_lookup@PLT
-	movq	%rax, %r11
+	test	rax, rax
+	jz	short 0f
+
+	mov	rdi, [rbp-0x10]
+	lea	rsi, [rip+sel_forwardingTargetForSelector_]
+	call	objc_msg_lookup@PLT
+
+	mov	rdi, [rbp-0x10]
+	lea	rsi, [rip+sel_forwardingTargetForSelector_]
+	mov	rdx, [rbp-0x18]
+	call	rax
+
+	test	rax, rax
+	jz	short 0f
+	cmp	rax, [rbp-0x10]
+	je	short 0f
+
+	mov	[rbp-0x10], rax
+
+	mov	rdi, rax
+	mov	rsi, [rbp-0x18]
+	call	objc_msg_lookup@PLT
+	mov	r11, rax
 
 	/* Restore all arguments */
-	movaps	-0xC0(%rbp), %xmm7
-	movaps	-0xB0(%rbp), %xmm6
-	movaps	-0xA0(%rbp), %xmm5
-	movaps	-0x90(%rbp), %xmm4
-	movaps	-0x80(%rbp), %xmm3
-	movaps	-0x70(%rbp), %xmm2
-	movaps	-0x60(%rbp), %xmm1
-	movaps	-0x50(%rbp), %xmm0
-	movq	-0x38(%rbp), %r9
-	movq	-0x30(%rbp), %r8
-	movq	-0x28(%rbp), %rcx
-	movq	-0x20(%rbp), %rdx
-	movq	-0x18(%rbp), %rsi
-	movq	-0x10(%rbp), %rdi
-	movq	-0x8(%rbp), %rax
-
-	movq	%rbp, %rsp
-	popq	%rbp
-
-	jmpq	*%r11
+	movaps	xmm7, [rbp-0xC0]
+	movaps	xmm6, [rbp-0xB0]
+	movaps	xmm5, [rbp-0xA0]
+	movaps	xmm4, [rbp-0x90]
+	movaps	xmm3, [rbp-0x80]
+	movaps	xmm2, [rbp-0x70]
+	movaps	xmm1, [rbp-0x60]
+	movaps	xmm0, [rbp-0x50]
+	mov	r9,   [rbp-0x38]
+	mov	r8,   [rbp-0x30]
+	mov	rcx,  [rbp-0x28]
+	mov	rdx,  [rbp-0x20]
+	mov	rsi,  [rbp-0x18]
+	mov	rdi,  [rbp-0x10]
+	mov	rax,  [rbp-0x08]
+
+	mov	rsp, rbp
+	pop	rbp
+
+	jmp	r11
 
 0:
-	movq	-0x10(%rbp), %rdi
-	movq	-0x18(%rbp), %rsi
+	mov	rdi, [rbp-0x10]
+	mov	rsi, [rbp-0x18]
 
-	movq	%rbp, %rsp
-	popq	%rbp
+	mov	rsp, rbp
+	pop	rbp
 
 	jmp	of_method_not_found@PLT
 .type of_forward, %function
 .size of_forward, .-of_forward
 
 of_forward_stret:
-	pushq	%rbp
-	movq	%rsp, %rbp
+	push	rbp
+	mov	rbp, rsp
 
 	/* Save all arguments */
-	subq	$0xC0, %rsp	/* 16-byte alignment */
-	movq	%rax, -0x8(%rbp)
-	movq	%rdi, -0x10(%rbp)
-	movq	%rsi, -0x18(%rbp)
-	movq	%rdx, -0x20(%rbp)
-	movq	%rcx, -0x28(%rbp)
-	movq	%r8, -0x30(%rbp)
-	movq	%r9, -0x38(%rbp)
-	movaps	%xmm0, -0x50(%rbp)
-	movaps	%xmm1, -0x60(%rbp)
-	movaps	%xmm2, -0x70(%rbp)
-	movaps	%xmm3, -0x80(%rbp)
-	movaps	%xmm4, -0x90(%rbp)
-	movaps	%xmm5, -0xA0(%rbp)
-	movaps	%xmm6, -0xB0(%rbp)
-	movaps	%xmm7, -0xC0(%rbp)
-
-	movq	%rsi, %rdi
+	sub	rsp, 0xC0	/* 16-byte alignment */
+	mov	[rbp-0x08], rax
+	mov	[rbp-0x10], rdi
+	mov	[rbp-0x18], rsi
+	mov	[rbp-0x20], rdx
+	mov	[rbp-0x28], rcx
+	mov	[rbp-0x30], r8
+	mov	[rbp-0x38], r9
+	movaps	[rbp-0x50], xmm0
+	movaps	[rbp-0x60], xmm1
+	movaps	[rbp-0x70], xmm2
+	movaps	[rbp-0x80], xmm3
+	movaps	[rbp-0x90], xmm4
+	movaps	[rbp-0xA0], xmm5
+	movaps	[rbp-0xB0], xmm6
+	movaps	[rbp-0xC0], xmm7
+
+	mov	rdi, rsi
 	call	object_getClass@PLT
 
-	movq	%rax, %rdi
-	leaq	sel_forwardingTargetForSelector_(%rip), %rsi
+	mov	rdi, rax
+	lea	rsi, [rip+sel_forwardingTargetForSelector_]
 	call	class_respondsToSelector@PLT
 
-	testq	%rax, %rax
-	jz	0f
+	test	rax, rax
+	jz	short 0f
 
-	movq	-0x18(%rbp), %rdi
-	leaq	sel_forwardingTargetForSelector_(%rip), %rsi
+	mov	rdi, [rbp-0x18]
+	lea	rsi, [rip+sel_forwardingTargetForSelector_]
 	call	objc_msg_lookup@PLT
 
-	movq	-0x18(%rbp), %rdi
-	leaq	sel_forwardingTargetForSelector_(%rip), %rsi
-	movq	-0x20(%rbp), %rdx
-	call	*%rax
-
-	testq	%rax, %rax
-	jz	0f
-	cmpq	-0x18(%rbp), %rax
-	je	0f
-
-	movq	%rax, -0x18(%rbp)
-
-	movq	%rax, %rdi
-	movq	-0x20(%rbp), %rsi
+	mov	rdi, [rbp-0x18]
+	lea	rsi, [rip+sel_forwardingTargetForSelector_]
+	mov	rdx, [rbp-0x20]
+	call	rax
+
+	test	rax, rax
+	jz	short 0f
+	cmp	rax, [rbp-0x18]
+	je	short 0f
+
+	mov	[rbp-0x18], rax
+
+	mov	rdi, rax
+	mov	rsi, [rbp-0x20]
 	call	objc_msg_lookup_stret@PLT
-	movq	%rax, %r11
+	mov	r11, rax
 
 	/* Restore all arguments */
-	movaps	-0xC0(%rbp), %xmm7
-	movaps	-0xB0(%rbp), %xmm6
-	movaps	-0xA0(%rbp), %xmm5
-	movaps	-0x90(%rbp), %xmm4
-	movaps	-0x80(%rbp), %xmm3
-	movaps	-0x70(%rbp), %xmm2
-	movaps	-0x60(%rbp), %xmm1
-	movaps	-0x50(%rbp), %xmm0
-	movq	-0x38(%rbp), %r9
-	movq	-0x30(%rbp), %r8
-	movq	-0x28(%rbp), %rcx
-	movq	-0x20(%rbp), %rdx
-	movq	-0x18(%rbp), %rsi
-	movq	-0x10(%rbp), %rdi
-	movq	-0x8(%rbp), %rax
-
-	movq	%rbp, %rsp
-	popq	%rbp
-
-	jmpq	*%r11
+	movaps	xmm7, [rbp-0xC0]
+	movaps	xmm6, [rbp-0xB0]
+	movaps	xmm5, [rbp-0xA0]
+	movaps	xmm4, [rbp-0x90]
+	movaps	xmm3, [rbp-0x80]
+	movaps	xmm2, [rbp-0x70]
+	movaps	xmm1, [rbp-0x60]
+	movaps	xmm0, [rbp-0x50]
+	mov	r9,   [rbp-0x38]
+	mov	r8,   [rbp-0x30]
+	mov	rcx,  [rbp-0x28]
+	mov	rdx,  [rbp-0x20]
+	mov	rsi,  [rbp-0x18]
+	mov	rdi,  [rbp-0x10]
+	mov	rax,  [rbp-0x08]
+
+	mov	rsp, rbp
+	pop	rbp
+
+	jmp	r11
 
 0:
-	movq	-0x10(%rbp), %rdi
-	movq	-0x18(%rbp), %rsi
-	movq	-0x20(%rbp), %rdx
+	mov	rdi, [rbp-0x10]
+	mov	rsi, [rbp-0x18]
+	mov	rdx, [rbp-0x20]
 
-	movq	%rbp, %rsp
-	popq	%rbp
+	mov	rsp, rbp
+	pop	rbp
 
 	jmp	of_method_not_found_stret@PLT
 .type of_forward_stret, %function
 .size of_forward_stret, .-of_forward_stret
 
 init:
-	leaq	module(%rip), %rdi
+	lea	rdi, [rip+module]
 	jmp	__objc_exec_class@PLT
 
 #ifdef OF_SOLARIS
 .section .init_array, "aw"
 #else

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
@@ -17,63 +17,65 @@
 
 #include "config.h"
 
 #include "platform.h"
 
+.intel_syntax noprefix
+
 .globl objc_msg_lookup
 .globl objc_msg_lookup_stret
 .globl objc_msg_lookup_super
 .globl objc_msg_lookup_super_stret
 
 .section .text
 .macro generate_lookup name not_found
 \name:
-	movl	4(%esp), %edx
-	testl	%edx, %edx
-	jz	ret_nil
+	mov	edx, [esp+4]
+	test	edx, edx
+	jz	short ret_nil
 
-	movl	(%edx), %edx
-	movl	32(%edx), %edx
+	mov	edx, [edx]
+	mov	edx, [edx+32]
 
 .Lmain_\name:
-	movl	8(%esp), %eax
+	mov	eax, [esp+8]
 
 #ifdef OF_SELUID24
-	movzbl	2(%eax), %ecx
-	movl	(%edx,%ecx,4), %edx
+	movzx	ecx, byte ptr [eax+2]
+	mov	edx, [edx+ecx*4]
 #endif
-	movzbl	1(%eax), %ecx
-	movl	(%edx,%ecx,4), %edx
-	movzbl	(%eax), %ecx
-	movl	(%edx,%ecx,4), %eax
+	movzx	ecx, byte ptr [eax+1]
+	mov	edx, [edx+ecx*4]
+	movzx	ecx, byte ptr [eax]
+	mov	eax, [edx+ecx*4]
 
-	testl	%eax, %eax
-	jz	0f
+	test	eax, eax
+	jz	short 0f
 
 	ret
 
 0:
 	call	get_eip
 1:
-	addl	$_GLOBAL_OFFSET_TABLE_, %eax
-	movl	\not_found@GOT(%eax), %eax
-	jmp	*%eax
+	add	eax, offset _GLOBAL_OFFSET_TABLE_
+	mov	eax, [eax+\not_found@GOT]
+	jmp	eax
 .type \name, %function
 .size \name, .-\name
 .endm
 
 .macro generate_lookup_super name lookup
 \name:
-	movl	4(%esp), %edx
-	movl	(%edx), %eax
-	cmpl	$0, %eax
-	je	ret_nil
-
-	movl	%eax, 4(%esp)
-	movl	4(%edx), %edx
-	movl	32(%edx), %edx
-	jmp	.Lmain_\lookup
+	mov	edx, [esp+4]
+	mov	eax, [edx]
+	test	eax, eax
+	jz	short ret_nil
+
+	mov	[esp+4], eax
+	mov	edx, [edx+4]
+	mov	edx, [edx+32]
+	jmp	short .Lmain_\lookup
 .type \name, %function
 .size \name, .-\name
 .endm
 
 generate_lookup objc_msg_lookup objc_method_not_found
@@ -82,19 +84,19 @@
 generate_lookup_super objc_msg_lookup_super_stret objc_msg_lookup_stret
 
 ret_nil:
 	call	get_eip
 0:
-	addl	$nil_method-0b, %eax
+	add	eax, nil_method-0b
 	ret
 
 nil_method:
-	xorl	%eax, %eax
+	xor	eax, eax
 	ret
 
 get_eip:
-	movl	(%esp), %eax
+	mov	eax, [esp]
 	ret
 
 #ifdef OF_LINUX
 .section .note.GNU-stack, "", %progbits
 #endif

Index: src/runtime/lookup-asm/lookup-asm-x86_64-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-x86_64-elf.S
+++ src/runtime/lookup-asm/lookup-asm-x86_64-elf.S
@@ -17,53 +17,55 @@
 
 #include "config.h"
 
 #include "platform.h"
 
+.intel_syntax noprefix
+
 .globl objc_msg_lookup
 .globl objc_msg_lookup_stret
 .globl objc_msg_lookup_super
 .globl objc_msg_lookup_super_stret
 
 .section .text
 .macro generate_lookup name not_found
 \name:
-	testq	%rdi, %rdi
-	jz	ret_nil
+	test	rdi, rdi
+	jz	short ret_nil
 
-	movq	(%rdi), %r8
-	movq	64(%r8), %r8
+	mov	r8, [rdi]
+	mov	r8, [r8+64]
 
 .Lmain_\name:
-	movq	(%rsi), %rax
-	movzbl	%ah, %ecx
-	movzbl	%al, %edx
+	mov	rax, [rsi]
+	movzx	ecx, ah
+	movzx	edx, al
 #ifdef OF_SELUID24
-	shrl	$16, %eax
+	shr	eax, 16
 
-	movq	(%r8,%rax,8), %r8
+	mov	r8, [r8+rax*8]
 #endif
-	movq	(%r8,%rcx,8), %r8
-	movq	(%r8,%rdx,8), %rax
+	mov	r8, [r8+rcx*8]
+	mov	rax, [r8+rdx*8]
 
-	testq	%rax, %rax
-	jz	\not_found@PLT
+	test	rax, rax
+	jz	short \not_found@PLT
 
 	ret
 .type \name, %function
 .size \name, .-\name
 .endm
 
 .macro generate_lookup_super name lookup
 \name:
-	movq	%rdi, %r8
-	movq	(%rdi), %rdi
-	testq	%rdi, %rdi
+	mov	r8, rdi
+	mov	rdi, [rdi]
+	test	rdi, rdi
 	jz	ret_nil
 
-	movq	8(%r8), %r8
-	movq	64(%r8), %r8
+	mov	r8, [r8+8]
+	mov	r8, [r8+64]
 	jmp	.Lmain_\lookup
 .type \name, %function
 .size \name, .-\name
 .endm
 
@@ -71,15 +73,15 @@
 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:
-	leaq	nil_method(%rip), %rax
+	lea	rax, [rip+nil_method]
 	ret
 
 nil_method:
-	xorq	%rax, %rax
+	xor	rax, rax
 	ret
 
 #ifdef OF_LINUX
 .section .note.GNU-stack, "", %progbits
 #endif