@@ -13,10 +13,12 @@
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
 #include "config.h"
+
+#include "platform.h"
 
 .globl objc_msg_lookup
 .globl objc_msg_lookup_stret
 .globl objc_msg_lookup_super
 .globl objc_msg_lookup_super_stret
@@ -28,24 +30,22 @@
 
 	lw	$t0, 0($a0)
 	lw	$t0, 32($t0)
 
 .Lmain_\name:
-#if defined(__MIPSEL__)
-# ifdef OF_SELUID24
-	lbu	$t1, 2($a1)
-# endif
-	lbu	$t2, 1($a1)
-	lbu	$t3, 0($a1)
-#elif defined(__MIPSEB__)
+#ifdef OF_BIGENDIAN
 # ifdef OF_SELUID24
 	lbu	$t1, 1($a1)
 # endif
 	lbu	$t2, 2($a1)
 	lbu	$t3, 3($a1)
 #else
-# error Neither __MIPSEL__ nor __MIPSEB__ defined!
+# ifdef OF_SELUID24
+	lbu	$t1, 2($a1)
+# endif
+	lbu	$t2, 1($a1)
+	lbu	$t3, 0($a1)
 #endif
 
 #ifdef OF_SELUID24
 	sll	$t1, $t1, 2
 #endif
@@ -59,28 +59,28 @@
 	addu	$t0, $t0, $t2
 	lw	$t0, 0($t0)
 	addu	$t0, $t0, $t3
 	lw	$t0, 0($t0)
 
-#ifdef __PIC__
+#ifdef OF_PIC
 	beqz	$t0, 1f
 #else
 	beqz	$t0, \not_found
 #endif
 
 	move	$v0, $t0
 	j	$ra
 
 0:
-#ifdef __PIC__
+#ifdef OF_PIC
 	addiu	$v0, $t9, nil_method-\name
 #else
 	la	$v0, nil_method
 #endif
 	j	$ra
 
-#ifdef __PIC__
+#ifdef OF_PIC
 1:
 	lui	$gp, %hi(_gp_disp)
 	addiu	$gp, $gp, %lo(_gp_disp)
 	addu	$gp, $gp, $t9
 	addiu	$gp, $gp, 1b-\name
@@ -101,11 +101,11 @@
 	lw	$t0, 32($t0)
 
 	b	.Lmain_\lookup
 
 0:
-#ifdef __PIC__
+#ifdef OF_PIC
 	addiu	$v0, $t9, nil_method-\name
 #else
 	la	$v0, nil_method
 #endif
 	j	$ra
@@ -120,8 +120,8 @@
 
 nil_method:
 	move	$v0, $zero
 	j	$ra
 
-#ifdef __linux__
+#ifdef OF_LINUX
 .section .note.GNU-stack, "", %progbits
 #endif