From: Carl Love <cel@us.ibm.com>
Date: Tue, 14 Sep 2021 19:36:24 +0000 (+0000)
Subject: Fixes for mcrxr instruction
X-Git-Tag: VALGRIND_3_18_0~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d2cec7f247809f08ce2e93a1a81ce333c6c244b;p=thirdparty%2Fvalgrind.git

Fixes for mcrxr instruction

Add .machine directives to ensure the mcrxr instruction is assembled
for power 6.  The instruction is not supported on later platforms.
---

diff --git a/NEWS b/NEWS
index 3e570c7de6..161441e167 100644
--- a/NEWS
+++ b/NEWS
@@ -57,6 +57,7 @@ are not entered into bugzilla tend to get forgotten about or ignored.
 441512  Remove a unneeded / unnecessary prefix check.
 441534  Update the expected output for test_isa_3_1_VRT.
 442061  very slow execution under Fedora 34 (readdwarf3)
+443031  Gcc -many change requires explicit .machine directives
 
 To see details of a given bug, visit
   https://bugs.kde.org/show_bug.cgi?id=XXXXXX
diff --git a/none/tests/ppc32/jm-insns.c b/none/tests/ppc32/jm-insns.c
index 5316ce318d..3a169933f8 100644
--- a/none/tests/ppc32/jm-insns.c
+++ b/none/tests/ppc32/jm-insns.c
@@ -1460,7 +1460,8 @@ extern void test_mcrf (void);
 ASSEMBLY_FUNC("test_mcrf", "mcrf      0, 0");
 
 extern void test_mcrxr (void);
-ASSEMBLY_FUNC("test_mcrxr", "mcrxr      0");
+ASSEMBLY_FUNC("test_mcrxr", ".machine push; .machine power6;" \
+              "mcrxr 0; .machine pop");
 
 extern void test_mtcrf (void);
 ASSEMBLY_FUNC("test_mtcrf", "mtcrf      0, 14");