diff options
| author | bergner <bergner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-02-26 16:05:49 +0000 |
|---|---|---|
| committer | bergner <bergner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-02-26 16:05:49 +0000 |
| commit | 05264df62892506a55804fa088c629eafb673fb8 (patch) | |
| tree | 016615f59330c1364ec9ebb4e69d192a0c5f4081 | |
| parent | e529b3d5c724f7370155ab04cb800dba61eae3ab (diff) | |
| download | gcc-05264df62892506a55804fa088c629eafb673fb8.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@221018 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/rs6000/htm.md | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 13 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/powerpc/htm-builtin-1.c | 7 |
4 files changed, 25 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 548a5ca6721..cc15b366e36 100644 --- 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 ca7f7fdf4fb..f8b02cb14ce 100644 --- 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 c86c2a33d65..4e44c1d02bf 100644 --- 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 e58816a7f0f..3e4b72919e9 100644 --- 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 } } */ |