diff -pruN old/toolchain-funcs.eclass new/toolchain-funcs.eclass
--- old/toolchain-funcs.eclass	2009-09-02 23:12:39.000000000 +0300
+++ new/toolchain-funcs.eclass	2009-10-07 16:39:23.000000000 +0300
@@ -184,10 +184,7 @@ ninj() { [[ ${type} == "kern" ]] && echo
 		cris*)		echo cris;;
 		hppa*)		ninj parisc hppa;;
 		i?86*)
-			# 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
+			if [[ ${type} == "kern" ]] ; then
 				echo i386
 			else
 				echo x86
@@ -228,10 +225,8 @@ ninj() { [[ ${type} == "kern" ]] && echo
 					;;
 		vax*)		echo vax;;
 		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
-				echo x86
+			if [[ ${type} == "kern" ]] ; then
+				echo x86_64
 			else
 				ninj x86_64 amd64
 			fi