Only in rpm-4.4.2.3.ORIG: config.h.in~ diff -dur rpm-4.4.2.3.ORIG/installplatform rpm-4.4.2.3/installplatform --- rpm-4.4.2.3.ORIG/installplatform 2008-04-01 01:28:22.000000000 -0600 +++ rpm-4.4.2.3/installplatform 2008-05-19 16:44:29.000000000 -0600 @@ -21,7 +21,7 @@ RPM="./rpm --rcfile $TEMPRC" -canonarch_sed='s_i.86_i386_;s_pentium[34]_i386_;s_athlon_i386_;s_sparc[^-]*_sparc_;s_alpha[^-]*_alpha_;s_arm[^-]*_arm_;s_\(powerpc\|ppc\)[^-]*_ppc_;s,\(ia32e\|amd64\),x86_64,;s_sh4a_sh4_' +canonarch_sed='s_i.86_i386_;s_pentium[34m]_i386_;s_prescott_i386_;s_nocona_i386_;s_athlon_i386_;s_sparc[^-]*_sparc_;s_alpha[^-]*_alpha_;s_arm[^-]*_arm_;s_\(powerpc\|ppc\)[^-]*_ppc_;s,\(ia32e\|amd64|core2\),x86_64,;s_sh4a_sh4_' arch="`$RPM --eval '%{_arch}'|sed -e "$canonarch_sed"`" VENDOR="`$RPM --eval '%{_vendor}'`" OS="`$RPM --eval '%{_os}'`" @@ -30,14 +30,14 @@ target="`$RPM --eval '%{_target}'|sed -e "$canonarch_sed"`" case "$arch" in - i[3456]86|pentium[34]|athlon|geode) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_pentium3_ s_i386_pentium4_ s_i386_athlon_ s_i386_geode_' ;; + i[3456]86|pentium[34m]|prescott|nocona|athlon|geode) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_pentium3_ s_i386_pentium4_ s_i386_pentiumm_ s_i386_prescott_ s_i386_nocona_ s_i386_athlon_ s_i386_geode_' ;; alpha*) SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_' ;; arm*) SUBSTS='s_arm_armv3l_ s_arm_armv4l_ s_arm_armv4tl_ s_arm_armv5tel_ s_arm_armv5tejl_ s_arm_armv6l_' ;; sh4*) SUBSTS='s_sh4_sh4_ s_sh4_sh4a_' ;; sparc*) SUBSTS='s_sparc\(64\|64v\|v9v\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;; powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6ip]\|$\)_ppc64\1_ s_ppc\([^6ip]\|$\)_ppciseries_ s_ppc\([^6ip]\|$\)_ppcpseries_ s_ppc\([^6ip]\|$\)_ppc64iseries_ s_ppc\([^6ip]\|$\)_ppc64pseries_' ;; s390*) SUBSTS='s_s390x_s390_ s_s390\([^x]\|$\)_s390x\1_' ;; - x86_64|amd64|ia32e) SUBSTS='s,x86_64,x86_64, s,x86_64,ia32e, s,x86_64,amd64, s,x86_64,i386, s,x86_64,i486, s,x86_64,i586, s,x86_64,i686, s,x86_64,pentium3, s,x86_64,pentium4, s,x86_64,athlon, s,x86_64,geode,' ;; + x86_64|amd64|ia32e|core2) SUBSTS='s,x86_64,x86_64, s,x86_64,ia32e, s,x86_64,amd64, s,x86_64,core2, s,x86_64,i386, s,x86_64,i486, s,x86_64,i586, s,x86_64,i686, s,x86_64,pentium3, s,x86_64,pentium4, s,x86_64,pentiumm, s,x86_64,prescott, s,x86_64,nocona, s,x86_64,athlon, s,x86_64,geode,' ;; *) SUBSTS=y___ ;; esac @@ -71,8 +71,8 @@ s390x-linux) LIB=lib64; MULTILIBNO=2 ;; ppc-linux) MULTILIBNO=1 ;; ppc64-linux) LIB=lib64; MULTILIBNO=2 ;; - i?86-linux|pentium?-linux|athlon-linux|geode-linux) MULTILIBNO=1 ;; - x86_64-linux|amd64-linux|ia32e-linux) LIB=lib64; MULTILIBNO=2 ;; + i?86-linux|pentium?-linux|prescott-linux|nocona-linux|athlon-linux|geode-linux) MULTILIBNO=1 ;; + x86_64-linux|amd64-linux|ia32e-linux|core2-linux) LIB=lib64; MULTILIBNO=2 ;; esac if [ -n "$MULTILIBNO" ]; then diff -dur rpm-4.4.2.3.ORIG/lib/rpmts.c rpm-4.4.2.3/lib/rpmts.c --- rpm-4.4.2.3.ORIG/lib/rpmts.c 2008-05-19 16:23:46.000000000 -0600 +++ rpm-4.4.2.3/lib/rpmts.c 2008-05-19 16:46:05.000000000 -0600 @@ -226,7 +226,7 @@ /*@-nullassign@*/ /*@observer@*/ static const char *arches[] = { - "i386", "i486", "i586", "i686", "athlon", "pentium3", "pentium4", "x86_64", "amd64", "ia32e", "geode", + "i386", "i486", "i586", "i686", "athlon", "pentium3", "pentium4", "pentiumm", "prescott", "nocona", "x86_64", "amd64", "ia32e", "core2", "geode", "alpha", "alphaev5", "alphaev56", "alphapca56", "alphaev6", "alphaev67", "sparc", "sun4", "sun4m", "sun4c", "sun4d", "sparcv8", "sparcv9", "sparcv9v", "sparc64", "sparc64v", "sun4u", diff -dur rpm-4.4.2.3.ORIG/macros.in rpm-4.4.2.3/macros.in --- rpm-4.4.2.3.ORIG/macros.in 2008-05-19 16:23:46.000000000 -0600 +++ rpm-4.4.2.3/macros.in 2008-05-19 16:47:17.000000000 -0600 @@ -1197,12 +1197,12 @@ %perl_privlib %(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib) #------------------------------------------------------------------------------ -# arch macro for all Intel i?86 compatibile processors +# arch macro for all Intel i?86 compatible processors # (Note: This macro (and it's analogues) will probably be obsoleted when # rpm can use regular expressions against target platforms in macro # conditionals. # -%ix86 i386 i486 i586 i686 pentium3 pentium4 athlon geode +%ix86 i386 i486 i586 i686 pentium3 pentium4 athlon pentiumm prescott nocona geode #------------------------------------------------------------------------------ # arch macro for all supported ARM processors diff -dur rpm-4.4.2.3.ORIG/rpmrc.in rpm-4.4.2.3/rpmrc.in --- rpm-4.4.2.3.ORIG/rpmrc.in 2008-05-19 16:23:46.000000000 -0600 +++ rpm-4.4.2.3/rpmrc.in 2008-05-19 17:06:41.000000000 -0600 @@ -21,12 +21,16 @@ optflags: i686 -O2 -g -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables optflags: pentium3 -O2 -g -m32 -march=pentium3 -mtune=generic -fasynchronous-unwind-tables optflags: pentium4 -O2 -g -m32 -march=pentium4 -mtune=generic -fasynchronous-unwind-tables +optflags: pentiumm -O2 -g -m32 -march=pentium-m -fasynchronous-unwind-tables +optflags: prescott -O2 -g -m32 -march=prescott -fasynchronous-unwind-tables +optflags: nocona -O2 -g -m32 -march=nocona -fasynchronous-unwind-tables optflags: athlon -O2 -g -m32 -march=athlon -fasynchronous-unwind-tables optflags: geode -Os -g -m32 -march=geode optflags: ia64 -O2 -g -m64 -mtune=generic optflags: x86_64 -O2 -g -m64 -mtune=generic optflags: amd64 -O2 -g -mtune=generic -optflags: ia32e -O2 -g -m64 -mtune=generic +optflags: ia32e -O2 -g -m64 -march=nocona +optflags: core2 -O2 -g -m64 -march=core2 optflags: alpha -O2 -g -mieee optflags: alphaev5 -O2 -g -mieee -march=ev5 @@ -89,6 +93,9 @@ arch_canon: athlon: athlon 1 arch_canon: geode: geode 1 +arch_canon: nocona: nocona 1 +arch_canon: prescott: prescott 1 +arch_canon: pentiumm: pentiumm 1 arch_canon: pentium4: pentium4 1 arch_canon: pentium3: pentium3 1 arch_canon: i686: i686 1 @@ -98,6 +105,7 @@ arch_canon: x86_64: x86_64 1 arch_canon: amd64: amd64 1 arch_canon: ia32e: ia32e 1 +arch_canon: core2: core2 1 arch_canon: alpha: alpha 2 arch_canon: alphaev5: alphaev5 2 @@ -208,6 +216,9 @@ buildarchtranslate: athlon: i386 buildarchtranslate: geode: i386 +buildarchtranslate: nocona: i386 +buildarchtranslate: prescott: i386 +buildarchtranslate: pentiumm: i386 buildarchtranslate: pentium4: i386 buildarchtranslate: pentium3: i386 buildarchtranslate: i686: i386 @@ -265,6 +276,7 @@ buildarchtranslate: x86_64: x86_64 buildarchtranslate: amd64: x86_64 buildarchtranslate: ia32e: x86_64 +buildarchtranslate: core2: x86_64 buildarchtranslate: sh3: sh3 buildarchtranslate: sh4: sh4 @@ -282,6 +294,9 @@ arch_compat: athlon: i686 arch_compat: geode: i586 +arch_compat: nocona: prescott +arch_compat: prescott: pentium4 +arch_compat: pentiumm: pentium3 arch_compat: pentium4: pentium3 arch_compat: pentium3: i686 arch_compat: i686: i586 @@ -353,6 +368,7 @@ arch_compat: x86_64: amd64 athlon noarch arch_compat: amd64: x86_64 athlon noarch arch_compat: ia32e: x86_64 athlon noarch +arch_compat: core2: ia32e athlon noarch arch_compat: sh3: noarch arch_compat: sh4: noarch @@ -391,6 +407,9 @@ buildarch_compat: athlon: i686 buildarch_compat: geode: i586 +buildarch_compat: nocona: prescott +buildarch_compat: prescott: pentium4 +buildarch_compat: pentiumm: pentium3 buildarch_compat: pentium4: pentium3 buildarch_compat: pentium3: i686 buildarch_compat: i686: i586 @@ -461,6 +480,7 @@ buildarch_compat: x86_64: noarch buildarch_compat: amd64: x86_64 buildarch_compat: ia32e: x86_64 +buildarch_compat: core2: ia32e buildarch_compat: sh3: noarch buildarch_compat: sh4: noarch