From 8df840d08602f1ac93e4270b9fe211cfb8215fa176fc3fdc3659c65667c3f094 Mon Sep 17 00:00:00 2001
From: Torsten Duwe <duwe@suse.com>
Date: Fri, 5 Oct 2012 13:25:20 +0000
Subject: [PATCH] Accepting request 137247 from home:duwe:branches:Base:System

- declare that the asm inline snippets in movinvr call e.g. rand()
  and might clobber caller-saved registers a, d, _and_ c.
  (bnc#773569)

OBS-URL: https://build.opensuse.org/request/show/137247
OBS-URL: https://build.opensuse.org/package/show/Base:System/memtest86+?expand=0&rev=16
---
 asm-inline-fix     | 11 +++++++++++
 memtest86+.changes |  7 +++++++
 memtest86+.spec    |  2 ++
 3 files changed, 20 insertions(+)
 create mode 100644 asm-inline-fix

diff --git a/asm-inline-fix b/asm-inline-fix
new file mode 100644
index 0000000..4226682
--- /dev/null
+++ b/asm-inline-fix
@@ -0,0 +1,11 @@
+--- memtest86+-4.20/test.c.orig	2011-01-23 19:11:04.000000000 +0100
++++ memtest86+-4.20/test.c	2012-10-05 14:57:19.000000000 +0200
+@@ -313,7 +313,7 @@ void movinvr()
+ 				"jb L200\n\t"
+ 				: "=D" (p)
+ 				: "D" (p), "b" (pe)
+-				: "eax", "edx"
++				: "eax", "ecx", "edx"
+ 			);
+ 
+ 			do_tick();
diff --git a/memtest86+.changes b/memtest86+.changes
index 93bbe09..f4de69d 100644
--- a/memtest86+.changes
+++ b/memtest86+.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Oct  5 13:16:57 UTC 2012 - duwe@suse.com
+
+- declare that the asm inline snippets in movinvr call e.g. rand()
+  and might clobber caller-saved registers a, d, _and_ c.
+  (bnc#773569)
+
 -------------------------------------------------------------------
 Wed Sep  5 10:07:27 UTC 2012 - lars@samba.org
 
diff --git a/memtest86+.spec b/memtest86+.spec
index 932b4ca..655e07a 100644
--- a/memtest86+.spec
+++ b/memtest86+.spec
@@ -36,6 +36,7 @@ Provides:       memtest86 > 3.2
 Url:            http://www.memtest.org
 Source:         http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.bz2
 Patch0:         fix-destdir
+Patch1:         asm-inline-fix
 Summary:        Memory Testing Image for x86 Architecture
 License:        BSD-3-Clause
 Group:          System/Boot
@@ -62,6 +63,7 @@ Authors:
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
 
 %build
   make