diff -dur redhat-rpm-config-9.0.2.ORIG/config.sub redhat-rpm-config-9.0.2/config.sub
--- redhat-rpm-config-9.0.2.ORIG/config.sub	2008-04-03 01:14:54.000000000 -0600
+++ redhat-rpm-config-9.0.2/config.sub	2008-05-22 09:22:19.000000000 -0600
@@ -467,6 +467,9 @@
 		basic_machine=c38-convex
 		os=-bsd
 		;;
+	core2 | core2-*)
+		basic_machine=x86_64-pc
+		;;
 	cray | j90)
 		basic_machine=j90-cray
 		os=-unicos
@@ -654,6 +657,9 @@
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
+	ia32e | ia32e-*)
+		basic_machine=x86_64-pc
+		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -834,10 +840,10 @@
 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
+	pentiumii | pentium2 | pentiumiii | pentium3 | pentiumm)
 		basic_machine=i686-pc
 		;;
-	pentium4)
+	pentium4 | prescott | nocona)
 		basic_machine=i786-pc
 		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
@@ -846,10 +852,10 @@
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-* | pentiumm-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentium4-*)
+	pentium4-* | prescott-* | nocona-*)
 		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
diff -dur redhat-rpm-config-9.0.2.ORIG/rpmrc redhat-rpm-config-9.0.2/rpmrc
--- redhat-rpm-config-9.0.2.ORIG/rpmrc	2008-04-03 01:14:54.000000000 -0600
+++ redhat-rpm-config-9.0.2/rpmrc	2008-05-22 09:24:39.000000000 -0600
@@ -4,9 +4,15 @@
 optflags: i486 %{__global_cflags} -m32 -march=i486 -fasynchronous-unwind-tables
 optflags: i586 %{__global_cflags} -m32 -march=i586 -fasynchronous-unwind-tables
 optflags: i686 %{__global_cflags} -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables
+optflags: pentium4 %{__global_cflags} -m32 -march=pentium4 -fasynchronous-unwind-tables
+optflags: pentiumm %{__global_cflags} -m32 -march=pentium-m -fasynchronous-unwind-tables
+optflags: prescott %{__global_cflags} -m32 -march=prescott -fasynchronous-unwind-tables
+optflags: nocona %{__global_cflags} -m32 -march=nocona -fasynchronous-unwind-tables
 optflags: athlon %{__global_cflags} -m32 -march=athlon -fasynchronous-unwind-tables
 optflags: ia64 %{__global_cflags}
 optflags: x86_64 %{__global_cflags} -m64 -mtune=generic
+optflags: ia32e %{__global_cflags} -m64 -march=nocona
+optflags: core2 %{__global_cflags} -m64 -march=core2
 
 optflags: alpha %{__global_cflags} -mieee
 optflags: alphaev5 %{__global_cflags} -mieee -mcpu=ev5