@@ -204,12 +204,15 @@
 			yes
 			# endif
 			#endif
 		], [
 			AC_SUBST(LOOKUP_S, lookup-amd64-elf.S)
+			AC_SUBST(FORWARDING_S, forwarding-amd64-elf.S)
 			AC_DEFINE(OF_ASM_LOOKUP, 1,
 				[Whether to use assembly for lookup])
+			AC_DEFINE(OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR, 1,
+				[Whether we have forwardingTargetForSelector:])
 		], [
 			AC_EGREP_CPP(yes, [
 				#if defined(__i386__) && defined(__ELF__)
 				yes
 				#endif
@@ -269,11 +272,16 @@
 			LIBS="-lobjc $LIBS"
 		], [
 			AC_MSG_ERROR([libobjc not found!])
 		])
 
-		AC_SUBST(APPLE_FORWARDING_S, "apple-forwarding.S")
+		dnl We should check for PPC64, as this currently does not
+		dnl support forwardingTargetForSelector: as there is no test
+		dnl machine available.
+		AC_SUBST(FORWARDING_S, "apple-forwarding.S")
+		AC_DEFINE(OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR, 1,
+			[Whether we have forwardingTargetForSelector:])
 		;;
 esac
 
 AC_CHECK_FUNC(objc_constructInstance, [], [
 	AC_SUBST(INSTANCE_M, "instance.m")