Index: src/runtime/lookup-asm/lookup-asm-sparc-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-sparc-elf.S
+++ src/runtime/lookup-asm/lookup-asm-sparc-elf.S
@@ -25,12 +25,14 @@
 .globl objc_msg_lookup_super_stret
 
 .section .text
 .macro generate_lookup name not_found
 \name:
-	cmp	%o0, 0
-	be	ret_nil
+	tst	%o0
+	bz	ret_nil
+	 btst	1, %o0
+	bnz	.Ltagged_pointer_\name	
 	 nop
 
 	ld	[%o0], %o2
 	ld	[%o2 + 32], %o2
 
@@ -57,10 +59,34 @@
 	be	\not_found
 	 nop
 
 	retl
 	 mov	%o2, %o0
+
+.Ltagged_pointer_\name:
+	and	%o0, 0xE, %o2
+	sll	%o2, 1, %o2
+
+#ifdef OF_PIC
+	mov	%o7, %g1
+	sethi	%hi(_GLOBAL_OFFSET_TABLE_ - 4), %o3
+	call	0f
+	 or	%o3, %lo(_GLOBAL_OFFSET_TABLE_ + 4), %o3
+0:
+	add	%o7, %o3, %o3
+	mov	%g1, %o7
+
+	sethi	%hi(objc_tagged_pointer_classes), %o0
+	or	%o0, %lo(objc_tagged_pointer_classes), %o0
+	ld	[%o3 + %o0], %o0
+#else
+	sethi	%hi(objc_tagged_pointer_classes), %o0
+	or	%o0, %lo(objc_tagged_pointer_classes), %o0
+#endif
+	ld	[%o0 + %o2], %o2
+	ba	.Lmain_\name
+	 ld	[%o2 + 32], %o2
 .type \name, %function
 .size \name, .-\name
 .endm
 
 .macro generate_lookup_super name lookup

Index: src/runtime/lookup-asm/lookup-asm-sparc64-elf.S
==================================================================
--- src/runtime/lookup-asm/lookup-asm-sparc64-elf.S
+++ src/runtime/lookup-asm/lookup-asm-sparc64-elf.S
@@ -86,11 +86,10 @@
 	or	%o0, %lo(objc_tagged_pointer_classes), %o0
 #endif
 	ldx	[%o0 + %o2], %o2
 	ba	.Lmain_\name
 	 ldx	[%o2 + 64], %o2
-
 .type \name, %function
 .size \name, .-\name
 .endm
 
 .macro generate_lookup_super name lookup