--- flaginfo.x86.orig	2003-11-21 20:38:20.000000000 +0100
+++ flaginfo.x86	2003-11-21 20:40:28.000000000 +0100
@@ -2,192 +2,192 @@
 # vim: noexpandtab sw=16 ts=16 sts=16:
 
 SUBARCH x86
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	i686
 
 SUBARCH	am5x86
-CHOST	i586-unknown-gnu-linux
+CHOST	i586-pc-linux-gnu
 MINCPU	i586
 MAXCPU	i586
 
 SUBARCH	athlon
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	athlon
 
 SUBARCH	athlon-4
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	athlon-4
 
 SUBARCH	athlon-4 
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	athlon-4 
 
 SUBARCH	athlon-mp
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	athlon-mp
 
 SUBARCH	athlon-xp
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	athlon-xp
 
 SUBARCH	athlon4
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	athlon4
 
 SUBARCH	c3-ezra
-CHOST	i586-unknown-gnu-linux
+CHOST	i586-pc-linux-gnu
 MINCPU	i586
 MAXCPU	c3-ezra
 
 SUBARCH	c3-samuel
-CHOST	i586-unknown-gnu-linux
+CHOST	i586-pc-linux-gnu
 MINCPU	i586
 MAXCPU	c3-samuel
 
 SUBARCH	c3-samuel2
-CHOST	i586-unknown-gnu-linux
+CHOST	i586-pc-linux-gnu
 MINCPU	i586
 MAXCPU	c3-samuel2
 
 SUBARCH	cyrix-6x
-CHOST	i586-unknown-gnu-linux
+CHOST	i586-pc-linux-gnu
 MINCPU	i586
 MAXCPU	cyrix-6x
 
 SUBARCH	cyrix-geode
-CHOST	i586-unknown-gnu-linux
+CHOST	i586-pc-linux-gnu
 MINCPU	i586
 MAXCPU	cyrix-geode
 
 SUBARCH	cyrix-mediagx
-CHOST	i586-unknown-gnu-linux
+CHOST	i586-pc-linux-gnu
 MINCPU	i586
 MAXCPU	cyrix-mediagx
 
 SUBARCH	cyrix-mii
-CHOST	i586-unknown-gnu-linux
+CHOST	i586-pc-linux-gnu
 MINCPU	i586
 MAXCPU	cyrix-mii
 
 SUBARCH	duron
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	athlon
 
 SUBARCH	duron-mp
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	athlon-mp
 
 SUBARCH	i686
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	i686
 
 SUBARCH	i486
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i486
 MAXCPU	i486
 
 SUBARCH	i586
-CHOST	i586-unknown-gnu-linux
+CHOST	i586-pc-linux-gnu
 MINCPU	i686
 MAXCPU	i586
 
 SUBARCH	k5
-CHOST	i486-unknown-gnu-linux
+CHOST	i486-pc-linux-gnu
 MINCPU	i486
 MAXCPU	k5
 
 SUBARCH	k6
-CHOST	i586-unknown-gnu-linux
+CHOST	i586-pc-linux-gnu
 MINCPU	i586
 MAXCPU	k6
 
 SUBARCH	k6-2
-CHOST	i586-unknown-gnu-linux
+CHOST	i586-pc-linux-gnu
 MINCPU	i586
 MAXCPU	k6-2
 
 SUBARCH	k6-3
-CHOST	i586-unknown-gnu-linux
+CHOST	i586-pc-linux-gnu
 MINCPU	i586
 MAXCPU	k6-3
 
 SUBARCH	k7
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	k7
 
 SUBARCH	nexgen-586
-CHOST	i586-unknown-gnu-linux
+CHOST	i586-pc-linux-gnu
 MINCPU	i586
 MAXCPU	i586
 
 SUBARCH	pentium
-CHOST	i586-unknown-gnu-linux
+CHOST	i586-pc-linux-gnu
 MINCPU	i586
 MAXCPU	pentium
 
 SUBARCH	pentium-mmx
-CHOST	i586-unknown-gnu-linux
+CHOST	i586-pc-linux-gnu
 MINCPU	i586
 MAXCPU	pentium-mmx
 
 SUBARCH	pentium-pro
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	pentium-pro
 
 SUBARCH	pentium2
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	pentium2
 
 SUBARCH	pentium3
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	pentium3
 
 SUBARCH	pentium4
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	pentium4
 
 SUBARCH	tm
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	i686
 
 SUBARCH	tm120
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	i686
 
 SUBARCH	tm5600
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	i686
 
 SUBARCH	tm5800
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	i686
 
 SUBARCH	winchip
-CHOST	i586-unknown-gnu-linux
+CHOST	i586-pc-linux-gnu
 MINCPU	i586
 MAXCPU	i586
 
 SUBARCH	xeon
-CHOST	i686-unknown-gnu-linux
+CHOST	i686-pc-linux-gnu
 MINCPU	i686
 MAXCPU	pentium4