--- toolchain-funcs.eclass.old	2009-09-02 13:12:39.000000000 -0700
+++ toolchain-funcs.eclass	2009-10-03 17:56:28.000000000 -0700
@@ -187,7 +187,8 @@
 			# Starting with linux-2.6.24, the 'x86_64' and 'i386'
 			# trees have been unified into 'x86'.
 			# FreeBSD still uses i386
-			if [[ ${type} == "kern" ]] && [[ $(KV_to_int ${KV}) -lt $(KV_to_int 2.6.24) || ${host} == *freebsd* ]] ; then
+			# In 2.6.32, this has been changed back.
+			if [[ ${type} == "kern" ]] && [[ $(KV_to_int ${KV}) -lt $(KV_to_int 2.6.24) ]] || [[ $(KV_to_int ${KV}) -ge $(KV_to_int 2.6.32) ]] || ${host} == *freebsd* ]] ; then
 				echo i386
 			else
 				echo x86
@@ -230,10 +231,11 @@
 		x86_64*)
 			# Starting with linux-2.6.24, the 'x86_64' and 'i386'
 			# trees have been unified into 'x86'.
-			if [[ ${type} == "kern" ]] && [[ $(KV_to_int ${KV}) -ge $(KV_to_int 2.6.24) ]] ; then
+			# In 2.6.32-rc1, this has been changed back.
+			if [[ ${type} == "kern" ]] && [[ $(KV_to_int ${KV}) -ge $(KV_to_int 2.6.24) ]] && [[ $(KV_to_int ${KV}) -lt $(KV_to_int 2.6.32) ]] ; then
 				echo x86
 			else
-				ninj x86_64 amd64
+				echo x86_64
 			fi
 			;;