From d9ea2d8f206af5a1ed68602778047d795b429de399687a36ae4c866f17835373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 3 Jul 2012 09:59:04 +0000 Subject: [PATCH] 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 --- gmp-support-kvm.diff | 18 +++++++++++++++--- gmp.changes | 5 +++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/gmp-support-kvm.diff b/gmp-support-kvm.diff index 65fb9c2..984363b 100644 --- a/gmp-support-kvm.diff +++ b/gmp-support-kvm.diff @@ -1,4 +1,4 @@ -From: Stephan Kulow +From: Stephan Kulow , Bernhard M. Wiedemann 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 */ diff --git a/gmp.changes b/gmp.changes index fbad240..51a13f8 100644 --- a/gmp.changes +++ b/gmp.changes @@ -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