SHA256
1
0
forked from pool/gmp

Accepting request 126956 from home:bmwiedemann:branches:devel:libraries:c_c++

- do not abort on kvm's x86_64 "CPU" on AMD (bnc#671262)

OBS-URL: https://build.opensuse.org/request/show/126956
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gmp?expand=0&rev=32
This commit is contained in:
Ismail Dönmez 2012-07-03 09:59:04 +00:00 committed by Git OBS Bridge
parent 27886421ed
commit d9ea2d8f20
2 changed files with 20 additions and 3 deletions

View File

@ -1,4 +1,4 @@
From: Stephan Kulow <coolo@suse.de>
From: Stephan Kulow <coolo@suse.de>, Bernhard M. Wiedemann <bwiedemann@suse.de>
KVM defaults to a basically non-existant CPUid, so it needs special
handling model 1 is Pentium Pro (1995) and model 3 is Pentium II (1997),
@ -6,8 +6,8 @@ model 2 was never released
Index: gmp-5.0.5/mpn/x86_64/fat/fat.c
===================================================================
--- gmp-5.0.5.orig/mpn/x86_64/fat/fat.c 2012-05-06 13:19:50.000000000 +0200
+++ gmp-5.0.5/mpn/x86_64/fat/fat.c 2012-05-29 09:58:12.540345955 +0200
--- gmp-5.0.5.orig/mpn/x86_64/fat/fat.c
+++ gmp-5.0.5/mpn/x86_64/fat/fat.c
@@ -201,9 +201,12 @@ __gmpn_cpuvec_init (void)
case 6:
switch (model)
@ -22,3 +22,15 @@ Index: gmp-5.0.5/mpn/x86_64/fat/fat.c
case 0x03:
case 0x04:
case 0x05:
@@ -276,8 +279,10 @@ __gmpn_cpuvec_init (void)
{
switch (family)
{
- case 5:
case 6:
+ if(model == 2) /* KVM default */
+ break; /* generic will do */
+ case 5:
abort ();
case 15: /* k8 */

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 3 07:49:57 UTC 2012 - bwiedemann@suse.com
- do not abort on kvm's x86_64 "CPU" on AMD (bnc#671262)
-------------------------------------------------------------------
Tue May 29 08:01:17 UTC 2012 - coolo@suse.com