--- buildutils/config.sub.orig	2003-06-24 21:06:02.000000000 +0200
+++ buildutils/config.sub	2003-07-24 11:13:07.000000000 +0200
@@ -215,7 +215,7 @@
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
+	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc \
 	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
 		| pyramid | mn10200 | mn10300 | tron | a29k \
 		| 580 | i960 | h8300 \
@@ -709,6 +709,15 @@
 	pentiumii-* | pentium2-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+        ia64)
+                basic_machine=ia64-intel
+                ;;
+        ia64-*)
+                basic_machine=ia64-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        x86_64-*)
+                basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
 	pn)
 		basic_machine=pn-gould
 		;;