From 91244b1801e270127e13c9eeba0ded4d620ae4e7 Mon Sep 17 00:00:00 2001
From: pcpa <paulo.cesar.pereira.de.andrade@gmail.com>
Date: Wed, 5 Dec 2012 22:40:02 -0200
Subject: [PATCH] Correct test cases in i586 build.

	* check/ldstxi.tst, check/ldstxr.tst: Correct wrong argument
	order for 32 bit mode tests.

	* configure.ac: Correct check for ix86 target_cpu.
---
 ChangeLog        | 7 +++++++
 check/ldstxi.tst | 2 +-
 check/ldstxr.tst | 4 +---
 configure.ac     | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f73029e94..e8d5de229 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-05 Paulo Andrade <pcpa@gnu.org>
+
+	* check/ldstxi.tst, check/ldstxr.tst: Correct wrong argument
+	order for 32 bit mode tests.
+
+	* configure.ac: Correct check for ix86 target_cpu.
+
 2012-12-05 Paulo Andrade <pcpa@gnu.org>
 
 	* check/ldstr.ok, check/ldstr.tst, check/ldsti.ok,
diff --git a/check/ldstxi.tst b/check/ldstxi.tst
index e981b7ff4..710ee42c7 100644
--- a/check/ldstxi.tst
+++ b/check/ldstxi.tst
@@ -111,7 +111,7 @@ L##x##C:
 #else
 #  define LDSTL(C, R0, R1)
 #  define SI(C, N, x, X, R0, R1)				\
-	ldxi_##x $off##x %R1 %R0				\
+	ldxi_##x %R1 %R0 $off##x				\
 	beqi L##x##C %R1 I##X##N				\
 	calli @abort						\
 L##x##C:
diff --git a/check/ldstxr.tst b/check/ldstxr.tst
index c989cb686..6fb7d7d81 100644
--- a/check/ldstxr.tst
+++ b/check/ldstxr.tst
@@ -115,7 +115,7 @@ L##x##C:
 #  define LDSTL(C, R0, R1, R2)
 #  define SI(C, N, x, X, R0, R1, R2)				\
 	movi %R2 $off##x					\
-	ldxr_##x %R2 %R1 %R0					\
+	ldxr_##x %R1 %R0 %R2					\
 	beqi L##x##C %R1 I##X##N				\
 	calli @abort						\
 L##x##C:
@@ -218,7 +218,6 @@ L##x##C:
 main:
 	prolog
 
-#if 0
 	/* Simple test to simplify validating encodings before
 	 * brute force tests */
 	movi %r0 t0
@@ -307,7 +306,6 @@ Lf:
 	beqi_d Ld %f0 0.25
 	calli @abort
 Ld:
-#endif
 
 	LDST(v0, v1, v2, r0, r1, r2, f0, f1, f2, f3, f4, f5)
 	// just to know did not abort
diff --git a/configure.ac b/configure.ac
index de78e10c8..e7051c721 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,7 @@ fi
 
 cpu=
 case "$target_cpu" in
-    i?x86|x86_64)	cpu=x86		;;
+    i?86|x86_64)	cpu=x86		;;
     *arm*)		cpu=arm		;;
     *mips*)		cpu=mips	;;
     *ppc*)		cpu=ppc		;;