--- objc/objc-msg.s	2018/04/24 19:13:57	1.1.1.1
+++ objc/objc-msg.s	2018/04/24 19:14:09	1.1.1.2
@@ -33,7 +33,7 @@
 #include "objc-msg-m68k-lock.s"
 #endif
 
-#elif defined (i386)
+#elif defined (__i386__)
 #if defined(OBJC_COLLECTING_CACHE)
 #include "objc-msg-i386-nolock.s"
 #elif  defined(OBJC_COPY_CACHE)
@@ -42,7 +42,7 @@
 #include "objc-msg-i386-lock.s"
 #endif
 
-#elif defined (ppc)
+#elif defined (__ppc__)
 #include "objc-msg-ppc.s"
 
 #elif defined (hppa)