From eb2f4e86472b85e3eda5633e0804029e8ce6f4c2 Mon Sep 17 00:00:00 2001
From: Sandra Loosemore <sandra@codesourcery.com>
Date: Tue, 12 May 2015 12:10:21 -0400
Subject: [PATCH] nios2.md (trap, ctrapsi4): Use "trap" instead of "break".
2015-05-12 Sandra Loosemore <sandra@codesourcery.com>
gcc/
* config/nios2/nios2.md (trap, ctrapsi4): Use "trap" instead of
"break".
gcc/testsuite/
* gcc.target/nios2/nios2-trap-insn.c: Expect "trap" instead of
"break".
* gcc.target/nios2/nios2-stack-check-1.c: Likewise.
From-SVN: r223083
---
gcc/ChangeLog | 5 +++++
gcc/config/nios2/nios2.md | 4 ++--
gcc/testsuite/ChangeLog | 6 ++++++
gcc/testsuite/gcc.target/nios2/nios2-stack-check-1.c | 2 +-
gcc/testsuite/gcc.target/nios2/nios2-trap-insn.c | 2 +-
5 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8d3887a74455..7787404d75d6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-12 Sandra Loosemore <sandra@codesourcery.com>
+
+ * config/nios2/nios2.md (trap, ctrapsi4): Use "trap" instead of
+ "break".
+
2015-05-12 Chung-Lin Tang <cltang@codesourcery.com>
Sandra Loosemore <sandra@codesourcery.com>
diff --git a/gcc/config/nios2/nios2.md b/gcc/config/nios2/nios2.md
index 36ef101443b1..709778020092 100644
--- a/gcc/config/nios2/nios2.md
+++ b/gcc/config/nios2/nios2.md
@@ -1000,7 +1000,7 @@
(define_insn "trap"
[(trap_if (const_int 1) (const_int 3))]
""
- "break\\t3"
+ "trap\\t3"
[(set_attr "type" "control")])
(define_insn "ctrapsi4"
@@ -1009,7 +1009,7 @@
(match_operand:SI 2 "reg_or_0_operand" "rM")])
(match_operand 3 "const_int_operand" "i"))]
""
- "b%R0\\t%z1, %z2, 1f\;break\\t%3\;1:"
+ "b%R0\\t%z1, %z2, 1f\;trap\\t%3\;1:"
[(set_attr "type" "control")
(set_attr "length" "8")])
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 558a676e96f5..16c6853dde2a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-12 Sandra Loosemore <sandra@codesourcery.com>
+
+ * gcc.target/nios2/nios2-trap-insn.c: Expect "trap" instead of
+ "break".
+ * gcc.target/nios2/nios2-stack-check-1.c: Likewise.
+
2015-05-12 Richard Biener <rguenther@suse.de>
PR tree-optimization/66101
diff --git a/gcc/testsuite/gcc.target/nios2/nios2-stack-check-1.c b/gcc/testsuite/gcc.target/nios2/nios2-stack-check-1.c
index 415906fc5ee2..e64e4f7e4117 100644
--- a/gcc/testsuite/gcc.target/nios2/nios2-stack-check-1.c
+++ b/gcc/testsuite/gcc.target/nios2/nios2-stack-check-1.c
@@ -1,7 +1,7 @@
/* { dg-do compile } */
/* { dg-options "-fstack-limit-register=et" } */
/* { dg-final { scan-assembler "bgeu\\tsp, et" } } */
-/* { dg-final { scan-assembler "break\\t3" } } */
+/* { dg-final { scan-assembler "trap\\t3" } } */
/* check stack checking */
void test()
{
diff --git a/gcc/testsuite/gcc.target/nios2/nios2-trap-insn.c b/gcc/testsuite/gcc.target/nios2/nios2-trap-insn.c
index dd881d166c8e..3f3900ffe1a1 100644
--- a/gcc/testsuite/gcc.target/nios2/nios2-trap-insn.c
+++ b/gcc/testsuite/gcc.target/nios2/nios2-trap-insn.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-final { scan-assembler "break\\t3" } } */
+/* { dg-final { scan-assembler "trap\\t3" } } */
/* Test the nios2 trap instruction */
void foo(void){
--
GitLab