Index: src/runtime/lookup-asm/lookup-asm-amd64-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-amd64-elf.S
+++ src/runtime/lookup-asm/lookup-asm-amd64-elf.S
@@ -28,11 +28,11 @@
 	jz	ret_nil
 
 	movq	(%rdi), %r8
 	movq	64(%r8), %r8
 
-.main_\name:
+.Lmain_\name:
 	movq	(%rsi), %rax
 	movzbl	%ah, %ecx
 	movzbl	%al, %edx
 #ifdef OF_SELUID24
 	shrl	$16, %eax
@@ -57,11 +57,11 @@
 	jz	ret_nil
 
 	movq	8(%rdi), %r8
 	movq	64(%r8), %r8
 	movq	%rdi, %rax
-	jmp	.main_\lookup
+	jmp	.Lmain_\lookup
 .type \name, %function
 .size \name, .-\name
 .endm
 
 generate_lookup objc_msg_lookup objc_method_not_found

Index: src/runtime/lookup-asm/lookup-asm-amd64-macho.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-amd64-macho.S
+++ src/runtime/lookup-asm/lookup-asm-amd64-macho.S
@@ -28,11 +28,11 @@
 	jz	ret_nil
 
 	movq	(%rdi), %r8
 	movq	64(%r8), %r8
 
-Lmain$0:
+Lmain_$0:
 	movq	(%rsi), %rax
 	movzbl	%ah, %ecx
 	movzbl	%al, %edx
 #ifdef OF_SELUID24
 	shrl	$16, %eax
@@ -55,11 +55,11 @@
 	jz	ret_nil
 
 	movq	8(%rdi), %r8
 	movq	64(%r8), %r8
 	movq	%rdi, %rax
-	jmp	Lmain$1
+	jmp	Lmain_$1
 .endmacro
 
 generate_lookup _objc_msg_lookup, _objc_method_not_found
 generate_lookup _objc_msg_lookup_stret, _objc_method_not_found_stret
 generate_lookup_super _objc_msg_lookup_super, _objc_msg_lookup

Index: src/runtime/lookup-asm/lookup-asm-arm-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-arm-elf.S
+++ src/runtime/lookup-asm/lookup-asm-arm-elf.S
@@ -28,11 +28,11 @@
 	beq	ret_nil
 
 	ldr	r2, [r0, #0]
 	ldr	r2, [r2, #32]
 
-.main_\name:
+.Lmain_\name:
 #ifdef OF_SELUID24
 	ldrb	r3, [r1, #2]
 	ldr	r2, [r2, r3, lsl #2]
 #endif
 	ldrb	r3, [r1, #1]
@@ -56,11 +56,11 @@
 	beq	ret_nil
 
 	ldr	r2, [r0, #4]
 	ldr	r2, [r2, #32]
 
-	b	.main_\lookup
+	b	.Lmain_\lookup
 .type \name, %function
 .size \name, .-\name
 .endm
 
 generate_lookup objc_msg_lookup objc_method_not_found

Index: src/runtime/lookup-asm/lookup-asm-mips-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-mips-elf.S
+++ src/runtime/lookup-asm/lookup-asm-mips-elf.S
@@ -22,16 +22,16 @@
 .globl objc_msg_lookup_super_stret
 
 .section .text
 .macro generate_lookup name not_found
 \name:
-	beqz	$a0, .ret_nil_\name
+	beqz	$a0, 0f
 
 	lw	$t0, 0($a0)
 	lw	$t0, 32($t0)
 
-.main_\name:
+.Lmain_\name:
 #if defined(__MIPSEL__)
 # ifdef OF_SELUID24
 	lbu	$t1, 2($a1)
 # endif
 	lbu	$t2, 1($a1)
@@ -60,32 +60,32 @@
 	lw	$t0, 0($t0)
 	addu	$t0, $t0, $t3
 	lw	$t0, 0($t0)
 
 #ifdef __PIC__
-	beqz	$t0, .forward_\name
+	beqz	$t0, 1f
 #else
 	beqz	$t0, \not_found
 #endif
 
 	move	$v0, $t0
 	j	$ra
 
-.ret_nil_\name:
+0:
 #ifdef __PIC__
 	addiu	$v0, $t9, nil_method-\name
 #else
 	la	$v0, nil_method
 #endif
 	j	$ra
 
 #ifdef __PIC__
-.forward_\name:
+1:
 	lui	$gp, %hi(_gp_disp)
 	addiu	$gp, $gp, %lo(_gp_disp)
 	addu	$gp, $gp, $t9
-	addiu	$gp, $gp, .forward_\name-\name
+	addiu	$gp, $gp, 1b-\name
 
 	lw	$t9, %call16(\not_found)($gp)
 	jr	$t9
 #endif
 .type \name, %function
@@ -93,18 +93,18 @@
 .endm
 
 .macro generate_lookup_super name lookup
 \name:
 	lw	$t0, 0($a0)
-	beqz	$t0, .ret_nil_\name
+	beqz	$t0, 0f
 
 	lw	$t0, 4($a0)
 	lw	$t0, 32($t0)
 
-	b	.main_\lookup
+	b	.Lmain_\lookup
 
-.ret_nil_\name:
+0:
 #ifdef __PIC__
 	addiu	$v0, $t9, nil_method-\name
 #else
 	la	$v0, nil_method
 #endif

Index: src/runtime/lookup-asm/lookup-asm-ppc-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-ppc-elf.S
+++ src/runtime/lookup-asm/lookup-asm-ppc-elf.S
@@ -28,11 +28,11 @@
 	beq-	ret_nil
 
 	lwz	%r5, 0(%r3)
 	lwz	%r5, 32(%r5)
 
-.main_\name:
+.Lmain_\name:
 #ifdef OF_SELUID24
 	lbz	%r6, 1(%r4)
 #endif
 	lbz	%r7, 2(%r4)
 	lbz	%r8, 3(%r4)
@@ -48,16 +48,16 @@
 #endif
 	lwzx	%r5, %r5, %r7
 	lwzx	%r5, %r5, %r8
 
 	cmpwi	%r5, 0
-	beq-	.forward_\name
+	beq-	0f
 
 	mr	%r3, %r5
 	blr
 
-.forward_\name:
+0:
 	b	\not_found@plt
 .type \name, %function
 .size \name, .-\name
 .endm
 
@@ -68,11 +68,11 @@
 	beq-	ret_nil
 
 	lwz	%r5, 4(%r3)
 	lwz	%r5, 32(%r5)
 
-	b	.main_\lookup
+	b	.Lmain_\lookup
 .type \name, %function
 .size \name, .-\name
 .endm
 
 generate_lookup objc_msg_lookup objc_method_not_found
@@ -82,12 +82,12 @@
 
 ret_nil:
 	mflr	%r0
 	bl	get_pc
 	mtlr	%r0
-.L0:
-	addi	%r3, %r3, nil_method-.L0
+0:
+	addi	%r3, %r3, nil_method-0b
 	blr
 
 nil_method:
 	li	%r3, 0
 	blr

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
@@ -29,11 +29,11 @@
 	jz	ret_nil
 
 	movl	(%edx), %edx
 	movl	32(%edx), %edx
 
-.main_\name:
+.Lmain_\name:
 	movl	8(%esp), %eax
 
 #ifdef OF_SELUID24
 	movzbl	2(%eax), %ecx
 	movl	(%edx,%ecx,4), %edx
@@ -42,18 +42,18 @@
 	movl	(%edx,%ecx,4), %edx
 	movzbl	(%eax), %ecx
 	movl	(%edx,%ecx,4), %eax
 
 	testl	%eax, %eax
-	jz	.forward_\name
+	jz	0f
 
 	ret
 
-.forward_\name:
+0:
 	call	get_eip
-.forward_L0_\name:
-	addl	$\not_found-.forward_L0_\name, %eax
+1:
+	addl	$\not_found-1b, %eax
 	jmp	*%eax
 .type \name, %function
 .size \name, .-\name
 .endm
 
@@ -63,11 +63,11 @@
 	cmpl	$0, (%edx)
 	je	ret_nil
 
 	movl	4(%edx), %edx
 	movl	32(%edx), %edx
-	jmp	.main_\lookup
+	jmp	.Lmain_\lookup
 .type \name, %function
 .size \name, .-\name
 .endm
 
 generate_lookup objc_msg_lookup objc_method_not_found
@@ -75,12 +75,12 @@
 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
-.L0:
-	addl	$nil_method-.L0, %eax
+0:
+	addl	$nil_method-0b, %eax
 	ret
 
 nil_method:
 	xorl	%eax, %eax
 	ret

Index: src/runtime/lookup-asm/lookup-asm-x86-win32.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-x86-win32.S
+++ src/runtime/lookup-asm/lookup-asm-x86-win32.S
@@ -29,11 +29,11 @@
 	jz	ret_nil
 
 	movl	(%edx), %edx
 	movl	32(%edx), %edx
 
-.main_\name:
+.Lmain_\name:
 	movl	8(%esp), %eax
 
 #ifdef OF_SELUID24
 	movzbl	2(%eax), %ecx
 	movl	(%edx,%ecx,4), %edx
@@ -42,18 +42,18 @@
 	movl	(%edx,%ecx,4), %edx
 	movzbl	(%eax), %ecx
 	movl	(%edx,%ecx,4), %eax
 
 	testl	%eax, %eax
-	jz	.forward_\name
+	jz	0f
 
 	ret
 
-.forward_\name:
+0:
 	call	get_eip
-.forward_L0_\name:
-	addl	$\not_found-.forward_L0_\name, %eax
+1:
+	addl	$\not_found-1b, %eax
 	jmp	*%eax
 .endm
 
 .macro generate_lookup_super name lookup
 \name:
@@ -61,26 +61,26 @@
 	cmpl	$0, (%edx)
 	je	ret_nil
 
 	movl	4(%edx), %edx
 	movl	32(%edx), %edx
-	jmp	.main_\lookup
+	jmp	.Lmain_\lookup
 .endm
 
 generate_lookup _objc_msg_lookup _objc_method_not_found
 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
-.L0:
-	addl	$nil_method-.L0, %eax
+0:
+	addl	$nil_method-0b, %eax
 	ret
 
 nil_method:
 	xorl	%eax, %eax
 	ret
 
 get_eip:
 	movl	(%esp), %eax
 	ret

Index: src/runtime/lookup-asm/lookup-asm.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm.S
+++ src/runtime/lookup-asm/lookup-asm.S
@@ -24,15 +24,15 @@
 # elif defined(__arm__) || defined(__ARM__)
 #  include "lookup-asm-arm-elf.S"
 # elif defined(__ppc__) || defined(__PPC__)
 #  include "lookup-asm-ppc-elf.S"
 # elif (defined(_MIPS_SIM) && _MIPS_SIM == _ABIO32) || \
-    (defined(__mips_eabi) && _MIPS_SZPTR == 32)
+	(defined(__mips_eabi) && _MIPS_SZPTR == 32)
 #  include "lookup-asm-mips-elf.S"
 # endif
 #elif defined(__MACH__)
 # if defined(__amd64__) || defined(__x86_64__)
 #  include "lookup-asm-amd64-macho.S"
 # endif
 #elif defined(_WIN32) && defined(__i386__)
 # include "lookup-asm-x86-win32.S"
 #endif

Index: src/runtime/runtime-private.h
==================================================================
--- src/runtime/runtime-private.h
+++ src/runtime/runtime-private.h
@@ -175,15 +175,16 @@
 #endif
 }
 
 #if defined(__ELF__)
 # if defined(__amd64__) || defined(__x86_64__) || defined(__i386__) || \
-    defined(__ppc__) || defined(__PPC__) || defined(__arm__) || defined(__ARM__)
+	defined(__ppc__) || defined(__PPC__) || defined(__arm__) || \
+	defined(__ARM__)
 #  define OF_ASM_LOOKUP
 # endif
 # if (defined(_MIPS_SIM) && _MIPS_SIM == _ABIO32) || \
-    (defined(__mips_eabi) && _MIPS_SZPTR == 32)
+	(defined(__mips_eabi) && _MIPS_SZPTR == 32)
 #  define OF_ASM_LOOKUP
 # endif
 #elif defined(__MACH__)
 # if defined(__amd64__) || defined(__x86_64__)
 #  define OF_ASM_LOOKUP