backport: htm.md (tcheck): Fix assembly encoding.

gcc/
	Backport from mainline
	2015-02-25  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>

	* config/rs6000/htm.md (tcheck): Fix assembly encoding.

gcc/testsuite/
	Backport from mainline
	2015-02-25  Peter Bergner  <bergner@vnet.ibm.com>

	* gcc.target/powerpc/htm-builtin-1.c (dg-do) Change to assemble.
	(dg-options): Add -save-temps.
	(dg-final): Add cleanup-saved-temps.

	2015-02-25  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>

	* gcc.target/powerpc/htm-builtin-1.c: Fix tcheck expect value.

From-SVN: r221018

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 548a5ca6721b8dad0aaf54da36b5ea527762a88d..cc15b366e36cd45dde7c4c1d31efad473a203ed9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-25  Peter Bergner  <bergner@vnet.ibm.com>
+
+       Backport from mainline
+       2015-02-25  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
+
+       * config/rs6000/htm.md (tcheck): Fix assembly encoding.
+
 2015-02-26  Matthew Fortune  <matthew.fortune@imgtec.com>
 
        PR target/64569

diff --git a/gcc/config/rs6000/htm.md b/gcc/config/rs6000/htm.md
index ca7f7fdf4fb720f8dd8a7e92afb7e4eb765d6c57..f8b02cb14ce2cebb1b2682c71793a4c82fa61819 100644 (file)
--- a/gcc/config/rs6000/htm.md
+++ b/gcc/config/rs6000/htm.md
@@ -245,7 +245,7 @@
        (unspec_volatile:CC [(match_operand 0 "u3bit_cint_operand" "n")]
                            UNSPECV_HTM_TCHECK))]
   "TARGET_HTM"
-  "tcheck. %0"
+  "tcheck %0"
   [(set_attr "type" "htm")
    (set_attr "length" "4")])
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c86c2a33d650f95564ceff6c3d227e3bf75f3674..4e44c1d02bfc60fa6e388c5fdccc440d7b6018d1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+2015-02-26  Peter Bergner  <bergner@vnet.ibm.com>
+
+       Backport from mainline
+       2015-02-25  Peter Bergner  <bergner@vnet.ibm.com>
+
+       * gcc.target/powerpc/htm-builtin-1.c (dg-do) Change to assemble.
+       (dg-options): Add -save-temps.
+       (dg-final): Add cleanup-saved-temps.
+
+       2015-02-25  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
+
+       * gcc.target/powerpc/htm-builtin-1.c: Fix tcheck expect value.
+
 2015-02-25  Kai Tietz  <ktietz@redhat.com>
 
        Backported from mainline

diff --git a/gcc/testsuite/gcc.target/powerpc/htm-builtin-1.c b/gcc/testsuite/gcc.target/powerpc/htm-builtin-1.c
index e58816a7f0f695ff61136ba99d8103a18be1e82c..3e4b72919e944b0bb7451203d555565d74d9f198 100644 (file)
--- a/gcc/testsuite/gcc.target/powerpc/htm-builtin-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/htm-builtin-1.c
@@ -1,7 +1,7 @@
-/* { dg-do compile { target { powerpc*-*-* } } } */
+/* { dg-do assemble { target { powerpc*-*-* } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
 /* { dg-require-effective-target powerpc_htm_ok } */
-/* { dg-options "-O2 -mhtm" } */
+/* { dg-options "-O2 -mhtm -save-temps" } */
 
 /* { dg-final { scan-assembler-times "tbegin\\." 1 } } */
 /* { dg-final { scan-assembler-times "tend\\." 2 } } */
@@ -10,7 +10,7 @@
 /* { dg-final { scan-assembler-times "tabortdci\\." 1 } } */
 /* { dg-final { scan-assembler-times "tabortwc\\." 1 } } */
 /* { dg-final { scan-assembler-times "tabortwci\\." 2 } } */
-/* { dg-final { scan-assembler-times "tcheck\\." 1 } } */
+/* { dg-final { scan-assembler-times "tcheck" 1 } } */
 /* { dg-final { scan-assembler-times "trechkpt\\." 1 } } */
 /* { dg-final { scan-assembler-times "treclaim\\." 1 } } */
 /* { dg-final { scan-assembler-times "tsr\\." 3 } } */
@@ -49,3 +49,4 @@ void use_builtins (long *p, char code, long *a, long *b)
   __builtin_set_tfhar (a[22]);
   __builtin_set_tfiar (a[23]);
 }
+/* { dg-final { cleanup-saved-temps } } */