Attachment #1634 for bug #9991

View | Details | Raw Unified | Return to bug 9991
Collapse All | Expand All

Lines 142-147 install-data-local: Link Here

(-)a/Makefile.am (+1 lines)
142	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/i686 ;\	142	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/i686 ;\
143	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/athlon ;\	143	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/athlon ;\
144	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/athlonxp ;\	144	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/athlonxp ;\
		145	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/athlon_xp ;\
145	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/pentium2 ;\	146	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/pentium2 ;\
146	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/pentium3 ;\	147	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/pentium3 ;\
147	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/pentium4 ;;\	148	$(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/pentium4 ;;\

Lines 30-37 target_platform="`$RPM --eval '%{?_gnu:% Link Here

(-)a/installplatform (-2 / +2 lines)
30	target="`$RPM --eval '%{_target}'`"	30	target="`$RPM --eval '%{_target}'`"
31		31
32	case "$arch" in	32	case "$arch" in
33	i[3456]86\|k6\|athlon\|athlonxp\|pentium[234])	33	i[3456]86\|k6\|athlon\|athlonxp\|athlon_xp\|pentium[234])
34	SUBSTS='s_$i[3456]86\\|k6\\|athlonxp\\|athlon\\|pentium[234]$_i386_ s_$i[3456]86\\|k6\\|athlonxp\\|athlon\\|pentium[234]$_i486_ s_$i[3456]86\\|k6\\|athlonxp\\|athlon\\|pentium[234]$_i586_ s_$i[3456]86\\|k6\\|athlonxp\\|athlon\\|pentium[234]$_i686_ s_$i[3456]86\\|k6\\|athlonxp\\|athlon\\|pentium[234]$_k6_ s_$i[3456]86\\|k6\\|athlonxp\\|athlon\\|pentium[234]$_athlon_ s_$i[3456]86\\|k6\\|athlonxp\\|athlon\\|pentium[234]$_athlonxp_ s_$i[3456]86\\|k6\\|athlonxp\\|athlon\\|pentium[234]$_pentium2_ s_$i[3456]86\\|k6\\|athlonxp\\|athlon\\|pentium[234]$_pentium3_ s_$i[3456]86\\|k6\\|athlonxp\\|athlon\\|pentium[234]$_pentium4_ s_$i[3456]86\\|k6\\|athlonxp\\|athlon\\|pentium[234]$_noarch_'	34	SUBSTS='s_$i[3456]86\\|k6\\|athlon\_xp\\|athlonxp\\|athlon\\|pentium[234]$_i386_ s_$i[3456]86\\|k6\\|athlon\_xp\\|athlonxp\\|athlon\\|pentium[234]$_i486_ s_$i[3456]86\\|k6\\|athlon\_xp\\|athlonxp\\|athlon\\|pentium[234]$_i586_ s_$i[3456]86\\|k6\\|athlon\_xp\\|athlonxp\\|athlon\\|pentium[234]$_i686_ s_$i[3456]86\\|k6\\|athlon\_xp\\|athlonxp\\|athlon\\|pentium[234]$_k6_ s_$i[3456]86\\|k6\\|athlon\_xp\\|athlonxp\\|athlon\\|pentium[234]$_athlon_ s_$i[3456]86\\|k6\\|athlon\_xp\\|athlonxp\\|athlon\\|pentium[234]$_athlon\_xp_ s_$i[3456]86\\|k6\\|athlon\_xp\\|athlonxp\\|athlon\\|pentium[234]$_athlonxp_ s_$i[3456]86\\|k6\\|athlon\_xp\\|athlonxp\\|athlon\\|pentium[234]$_pentium2_ s_$i[3456]86\\|k6\\|athlon\_xp\\|athlonxp\\|athlon\\|pentium[234]$_pentium3_ s_$i[3456]86\\|k6\\|athlon\_xp\\|athlonxp\\|athlon\\|pentium[234]$_pentium4_ s_$i[3456]86\\|k6\\|athlon\_xp\\|athlonxp\\|athlon\\|pentium[234]$_noarch_'
35	;;	35	;;
36	alpha*)	36	alpha*)
37	SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_'	37	SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_'




	return 1;
}


static int is_athlon_xp(void)
{
    unsigned int eax, ebx, ecx, edx, family, model;
    char vendor[16];
    cpuid(0, &eax, &ebx, &ecx, &edx);
    memset(vendor, 0, sizeof(vendor));
    *((unsigned int *)&vendor[0]) = ebx;
    *((unsigned int *)&vendor[4]) = edx;
    *((unsigned int *)&vendor[8]) = ecx;
    if (strncmp(vendor, "AuthenticAMD", 12) != 0)
	return 0;
    cpuid(1, &eax, &ebx, &ecx, &edx);
    family = (eax >> 8) & 0x0f;
    model = (eax >> 4) & 0x0f;
    if (family == 6)
	switch (model)
	{
	    case 10:	// Athlon XP (model 10)
		return 1;
	}
    return 0;
}

static int is_pentium3(void)
{
    unsigned int eax, ebx, ecx, edx, family, model;

	{
	    char class = (char) (RPMClass() | '0');

	    if (is_athlon_xp())
	    	strcpy(un.machine, "athlon_xp");
	    else if ((class == '6' && is_athlon()) || class == '7')
	    	strcpy(un.machine, "athlon");
	    else if (is_pentium4())
		strcpy(un.machine, "pentium4");





Name: %rpm_name
Version: %rpm_version
Release: alt66.1

%define ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
%define get_dep() %(rpm -q --qf '%%{NAME} >= %%|SERIAL?{%%{SERIAL}:}|%%{VERSION}-%%{RELEASE}' %1 2>/dev/null || echo '%1 >= unknown')

%endif #with contrib

%changelog
* Fri Sep 15 2006 Aleksey Avdeev <solo@altlinux.ru> 4.0.4-alt66.1
- NMU (fixed #9991):
  + lib/rpmrc.c: added is_athlon_xp.
  + Added athlon_xp in:
    Makefile.am
    installplatform
    rpmrc.in

* Sun May 14 2006 Dmitry V. Levin <ldv@altlinux.org> 4.0.4-alt66
- Fixed build with gcc-4.1.0.





optflags: k6 %optflags_default -march=k6 -mtune=athlon-xp
optflags: athlon %optflags_default -march=athlon -mtune=athlon-xp
optflags: athlonxp %optflags_default -march=athlon-xp
optflags: athlon_xp %optflags_default -march=athlon-xp
optflags: amd64 %optflags_default
optflags: ia64 %optflags_default
optflags: ia32e %optflags_default

arch_canon:	pentium4:	pentium4	1
arch_canon:	pentium3:	pentium3	1
arch_canon:	pentium2:	pentium2	1
arch_canon:	athlon_xp:	athlon_xp	1
arch_canon:	athlonxp:	athlonxp	1
arch_canon:	athlon:	athlon	1
arch_canon:	i686:	i686	1

buildarchtranslate: pentium4: pentium4
buildarchtranslate: pentium3: pentium3
buildarchtranslate: pentium2: pentium2
buildarchtranslate: athlon_xp: athlon_xp
buildarchtranslate: athlonxp: athlonxp
buildarchtranslate: athlon: athlon
buildarchtranslate: i686: i686

arch_compat: alpha: axp noarch

arch_compat: pentium4: pentium3
arch_compat: athlon_xp: athlonxp
arch_compat: athlonxp: athlon pentium3
arch_compat: pentium3: pentium2
arch_compat: athlon: k6 pentium2


arch_compat: amd64: x86_64
arch_compat: ia32e: x86_64
arch_compat: x86_64: athlon_xp athlonxp pentium4

os_compat:   IRIX64: IRIX
os_compat: solaris2.7: solaris2.3 solaris2.4 solaris2.5 solaris2.6

buildarch_compat: ia32e: x86_64

buildarch_compat: pentium4: pentium3
buildarch_compat: athlon_xp: athlonxp
buildarch_compat: athlonxp: athlon pentium3
buildarch_compat: pentium3: pentium2
buildarch_compat: athlon: k6 pentium2

Return to bug 9991

Lines 990-995 static int is_athlon(void) Link Here

(-)a/lib/rpmrc.c (-1 / +27 lines)
990	return 1;	990	return 1;
991	}	991	}
992		992
		993
		994	static int is_athlon_xp(void)
		995	{
		996	unsigned int eax, ebx, ecx, edx, family, model;
		997	char vendor[16];
		998	cpuid(0, &eax, &ebx, &ecx, &edx);
		999	memset(vendor, 0, sizeof(vendor));
		1000	((unsigned int )&vendor[0]) = ebx;
		1001	((unsigned int )&vendor[4]) = edx;
		1002	((unsigned int )&vendor[8]) = ecx;
		1003	if (strncmp(vendor, "AuthenticAMD", 12) != 0)
		1004	return 0;
		1005	cpuid(1, &eax, &ebx, &ecx, &edx);
		1006	family = (eax >> 8) & 0x0f;
		1007	model = (eax >> 4) & 0x0f;
		1008	if (family == 6)
		1009	switch (model)
		1010	{
		1011	case 10: // Athlon XP (model 10)
		1012	return 1;
		1013	}
		1014	return 0;
		1015	}
		1016
993	static int is_pentium3(void)	1017	static int is_pentium3(void)
994	{	1018	{
995	unsigned int eax, ebx, ecx, edx, family, model;	1019	unsigned int eax, ebx, ecx, edx, family, model;
Lines 1298-1304 # if defined(__linux__) && defined(__i38 Link Here
1298	{	1322	{
1299	char class = (char) (RPMClass() \| '0');	1323	char class = (char) (RPMClass() \| '0');
1300		1324
1301	if ((class == '6' && is_athlon()) \|\| class == '7')	1325	if (is_athlon_xp())
		1326	strcpy(un.machine, "athlon_xp");
		1327	else if ((class == '6' && is_athlon()) \|\| class == '7')
1302	strcpy(un.machine, "athlon");	1328	strcpy(un.machine, "athlon");
1303	else if (is_pentium4())	1329	else if (is_pentium4())
1304	strcpy(un.machine, "pentium4");	1330	strcpy(un.machine, "pentium4");

Lines 4-10 Link Here

(-)a/rpm-4_0.spec (-1 / +9 lines)
4		4
5	Name: %rpm_name	5	Name: %rpm_name
6	Version: %rpm_version	6	Version: %rpm_version
7	Release: alt66	7	Release: alt66.1
8		8
9	%define ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}}	9	%define ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
10	%define get_dep() %(rpm -q --qf '%%{NAME} >= %%\|SERIAL?{%%{SERIAL}:}\|%%{VERSION}-%%{RELEASE}' %1 2>/dev/null \|\| echo '%1 >= unknown')	10	%define get_dep() %(rpm -q --qf '%%{NAME} >= %%\|SERIAL?{%%{SERIAL}:}\|%%{VERSION}-%%{RELEASE}' %1 2>/dev/null \|\| echo '%1 >= unknown')
Lines 522-527 #%config(noreplace,missingok) %_sysconfd Link Here
522	%endif #with contrib	522	%endif #with contrib
523		523
524	%changelog	524	%changelog
		525	* Fri Sep 15 2006 Aleksey Avdeev <solo@altlinux.ru> 4.0.4-alt66.1
		526	- NMU (fixed #9991):
		527	+ lib/rpmrc.c: added is_athlon_xp.
		528	+ Added athlon_xp in:
		529	Makefile.am
		530	installplatform
		531	rpmrc.in
		532
525	* Sun May 14 2006 Dmitry V. Levin <ldv@altlinux.org> 4.0.4-alt66	533	* Sun May 14 2006 Dmitry V. Levin <ldv@altlinux.org> 4.0.4-alt66
526	- Fixed build with gcc-4.1.0.	534	- Fixed build with gcc-4.1.0.
527		535

Lines 20-25 optflags: pentium4 %optflags_default -ma Link Here

(-)a/rpmrc.in (-1 / +6 lines)
20	optflags: k6 %optflags_default -march=k6 -mtune=athlon-xp	20	optflags: k6 %optflags_default -march=k6 -mtune=athlon-xp
21	optflags: athlon %optflags_default -march=athlon -mtune=athlon-xp	21	optflags: athlon %optflags_default -march=athlon -mtune=athlon-xp
22	optflags: athlonxp %optflags_default -march=athlon-xp	22	optflags: athlonxp %optflags_default -march=athlon-xp
		23	optflags: athlon_xp %optflags_default -march=athlon-xp
23	optflags: amd64 %optflags_default	24	optflags: amd64 %optflags_default
24	optflags: ia64 %optflags_default	25	optflags: ia64 %optflags_default
25	optflags: ia32e %optflags_default	26	optflags: ia32e %optflags_default
Lines 80-85 # Canonical arch names and numbers Link Here
80	arch_canon: pentium4: pentium4 1	81	arch_canon: pentium4: pentium4 1
81	arch_canon: pentium3: pentium3 1	82	arch_canon: pentium3: pentium3 1
82	arch_canon: pentium2: pentium2 1	83	arch_canon: pentium2: pentium2 1
		84	arch_canon: athlon_xp: athlon_xp 1
83	arch_canon: athlonxp: athlonxp 1	85	arch_canon: athlonxp: athlonxp 1
84	arch_canon: athlon: athlon 1	86	arch_canon: athlon: athlon 1
85	arch_canon: i686: i686 1	87	arch_canon: i686: i686 1
Lines 195-200 buildarchtranslate: ia32e: x86_64 Link Here
195	buildarchtranslate: pentium4: pentium4	197	buildarchtranslate: pentium4: pentium4
196	buildarchtranslate: pentium3: pentium3	198	buildarchtranslate: pentium3: pentium3
197	buildarchtranslate: pentium2: pentium2	199	buildarchtranslate: pentium2: pentium2
		200	buildarchtranslate: athlon_xp: athlon_xp
198	buildarchtranslate: athlonxp: athlonxp	201	buildarchtranslate: athlonxp: athlonxp
199	buildarchtranslate: athlon: athlon	202	buildarchtranslate: athlon: athlon
200	buildarchtranslate: i686: i686	203	buildarchtranslate: i686: i686
Lines 244-249 arch_compat: alphaev5: alpha Link Here
244	arch_compat: alpha: axp noarch	247	arch_compat: alpha: axp noarch
245		248
246	arch_compat: pentium4: pentium3	249	arch_compat: pentium4: pentium3
		250	arch_compat: athlon_xp: athlonxp
247	arch_compat: athlonxp: athlon pentium3	251	arch_compat: athlonxp: athlon pentium3
248	arch_compat: pentium3: pentium2	252	arch_compat: pentium3: pentium2
249	arch_compat: athlon: k6 pentium2	253	arch_compat: athlon: k6 pentium2
Lines 308-314 arch_compat: ia64: noarch Link Here
308		312
309	arch_compat: amd64: x86_64	313	arch_compat: amd64: x86_64
310	arch_compat: ia32e: x86_64	314	arch_compat: ia32e: x86_64
311	arch_compat: x86_64: athlonxp pentium4	315	arch_compat: x86_64: athlon_xp athlonxp pentium4
312		316
313	os_compat: IRIX64: IRIX	317	os_compat: IRIX64: IRIX
314	os_compat: solaris2.7: solaris2.3 solaris2.4 solaris2.5 solaris2.6	318	os_compat: solaris2.7: solaris2.3 solaris2.4 solaris2.5 solaris2.6
Lines 346-351 buildarch_compat: amd64: x86_64 Link Here
346	buildarch_compat: ia32e: x86_64	350	buildarch_compat: ia32e: x86_64
347		351
348	buildarch_compat: pentium4: pentium3	352	buildarch_compat: pentium4: pentium3
		353	buildarch_compat: athlon_xp: athlonxp
349	buildarch_compat: athlonxp: athlon pentium3	354	buildarch_compat: athlonxp: athlon pentium3
350	buildarch_compat: pentium3: pentium2	355	buildarch_compat: pentium3: pentium2
351	buildarch_compat: athlon: k6 pentium2	356	buildarch_compat: athlon: k6 pentium2