1 diff -uNr rpm-4.3.orig/installplatform rpm-4.3/installplatform
2 --- rpm-4.3.orig/installplatform 2004-02-25 23:42:56.000000000 +0100
3 +++ rpm-4.3/installplatform 2004-02-25 23:45:26.022172264 +0100
6 RPM="./rpm --rcfile $TEMPRC"
8 -canonarch_sed='s_i.86_i386_;s_athlon_i386_;s_sparc[^-]*_sparc_;s_alpha[^-]*_alpha_;s_\(powerpc\|ppc\)[^-]*_ppc_'
9 +canonarch_sed='s_i.86_i386_;s_pentium3_i386_;s_athlon_i386_;s_sparc[^-]*_sparc_;s_alpha[^-]*_alpha_;s_\(powerpc\|ppc\)[^-]*_ppc_'
10 arch="`$RPM --eval '%{_arch}'|sed -e "$canonarch_sed"`"
11 VENDOR="`$RPM --eval '%{_vendor}'`"
12 OS="`$RPM --eval '%{_os}'`"
14 target="`$RPM --eval '%{_target}'|sed -e "$canonarch_sed"`"
17 - i[3456]86|athlon) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_athlon_' ;;
18 + i[3456]86|pentium3|athlon) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_pentium3_ s_i386_athlon_' ;;
19 x86_64*|amd64*) SUBSTS="s/${arch}/x86_64/ s/${arch}/amd64/" ;;
20 alpha*) SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_' ;;
21 sparc*) SUBSTS='s_sparc\(64\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;;
23 s390x-linux) LIB=lib64; MULTILIBNO=2 ;;
24 ppc-linux) MULTILIBNO=1 ;;
25 ppc64-linux) LIB=lib64; MULTILIBNO=2 ;;
26 - i?86-linux|athlon-linux) MULTILIBNO=1 ;;
27 + i?86-linux|pentium3-linux|athlon-linux) MULTILIBNO=1 ;;
28 x86_64-linux|amd64-linux) LIB=lib64; MULTILIBNO=2 ;;
31 diff -uNr rpm-4.3.orig/lib/rpmrc.c rpm-4.3/lib/rpmrc.c
32 --- rpm-4.3.orig/lib/rpmrc.c 2004-02-25 23:42:56.000000000 +0100
33 +++ rpm-4.3/lib/rpmrc.c 2004-02-25 23:45:31.767298872 +0100
34 @@ -1038,6 +1038,25 @@
38 +static int is_pentium3()
40 + unsigned int eax, ebx, ecx, edx, family, model;
42 + cpuid(0, &eax, &ebx, &ecx, &edx);
43 + memset(vendor, 0, sizeof(vendor));
44 + *((unsigned int *)&vendor[0]) = ebx;
45 + *((unsigned int *)&vendor[4]) = edx;
46 + *((unsigned int *)&vendor[8]) = ecx;
47 + if (strncmp(vendor, "GenuineIntel", 12) != 0)
49 + cpuid(1, &eax, &ebx, &ecx, &edx);
50 + family = (eax >> 8) & 0x0f;
51 + model = (eax >> 4) & 0x0f;
52 + if ((family == 6) && ((model >= 7) && (model <= 11)))
59 #if defined(__linux__) && defined(__powerpc__)
62 if ((class == '6' && is_athlon()) || class == '7')
63 strcpy(un.machine, "athlon");
64 + else if (is_pentium3())
65 + strcpy(un.machine, "pentium3");
66 else if (strchr("3456", un.machine[1]) && un.machine[1] != class)
67 un.machine[1] = class;
69 diff -uNr rpm-4.3.orig/lib/rpmts.c rpm-4.3/lib/rpmts.c
70 --- rpm-4.3.orig/lib/rpmts.c 2004-01-07 01:39:05.000000000 +0100
71 +++ rpm-4.3/lib/rpmts.c 2004-02-25 23:45:52.566136968 +0100
75 static const char *arches[] = {
76 - "i386", "i486", "i586", "i686", "athlon", "x86_64",
77 + "i386", "i486", "i586", "i686", "pentium3", "athlon", "x86_64",
78 "alpha", "alphaev5", "alphaev56", "alphapca56", "alphaev6", "alphaev67",
79 "sparc", "sun4", "sun4m", "sun4c", "sun4d", "sparcv9",
81 diff -uNr rpm-4.3.orig/macros.in rpm-4.3/macros.in
82 --- rpm-4.3.orig/macros.in 2004-02-25 23:42:55.000000000 +0100
83 +++ rpm-4.3/macros.in 2004-02-25 23:45:31.773297960 +0100
85 # rpm can use regular expressions against target platforms in macro
88 -%ix86 i386 i486 i586 i686 athlon
89 +%ix86 i386 i486 i586 i686 pentium3 athlon
91 #------------------------------------------------------------------------
92 # Use in %install to generate locale specific file lists. For example,
93 diff -uNr rpm-4.3.orig/rpmrc.in rpm-4.3/rpmrc.in
94 --- rpm-4.3.orig/rpmrc.in 2004-02-25 23:42:56.000000000 +0100
95 +++ rpm-4.3/rpmrc.in 2004-02-25 23:45:31.775297656 +0100
97 optflags: i486 -O2 -march=i486%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i486: %{specflags_i486}}}
98 optflags: i586 -O2 -march=i586%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i586: %{specflags_i586}}}
99 optflags: i686 -O2 -march=i686%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i686: %{specflags_i686}}}
100 +optflags: pentium3 -O2 -march=pentium3%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_pentium3: %{specflags_pentium3}}}
101 optflags: athlon -O2 -march=athlon%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_athlon: %{specflags_athlon}}}
102 optflags: ia64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia64: %{specflags_ia64}}}
103 optflags: x86_64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_x86_64: %{specflags_x86_64}} %{?specflags_amd64: %{specflags_amd64}} }
105 # Canonical arch names and numbers
107 arch_canon: athlon: athlon 1
108 +arch_canon: pentium3: pentium3 1
109 arch_canon: i686: i686 1
110 arch_canon: i586: i586 1
111 arch_canon: i486: i486 1
113 buildarchtranslate: osfmach3_i386: i386
115 buildarchtranslate: athlon: athlon
116 +buildarchtranslate: pentium3: pentium3
117 buildarchtranslate: i686: i686
118 buildarchtranslate: i586: i586
119 buildarchtranslate: i486: i486
121 arch_compat: alpha: axp noarch
123 arch_compat: athlon: i686
124 +arch_compat: pentium3: i686
125 arch_compat: i686: i586
126 arch_compat: i586: i486
127 arch_compat: i486: i386
129 buildarch_compat: ia64: noarch
131 buildarch_compat: athlon: i686
132 +buildarch_compat: pentium3: i686
133 buildarch_compat: i686: i586
134 buildarch_compat: i586: i486
135 buildarch_compat: i486: i386