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:56:53.000000000 +0300
@@ -183,16 +183,7 @@ ninj() { [[ ${type} == "kern" ]] && echo
 		bfin*)		ninj blackfin bfin;;
 		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
-				echo i386
-			else
-				echo x86
-			fi
-			;;
+		i?86*)		ninj i386 x86;;
 		ia64*)		echo ia64;;
 		m68*)		echo m68k;;
 		mips*)		echo mips;;
@@ -227,15 +218,7 @@ ninj() { [[ ${type} == "kern" ]] && echo
 						|| echo sparc
 					;;
 		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
-			else
-				ninj x86_64 amd64
-			fi
-			;;
+		x86_64*)	ninj x86_64 amd64;;
 
 		# since our usage of tc-arch is largely concerned with
 		# normalizing inputs for testing ${CTARGET}, let's filter