diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8d3887a744557ac45b03cbdd5bc8b2040c2e4529..7787404d75d65f87d4db535e37b4b2b4204ac5bd 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 36ef101443b1cfbd52bf79a646f0b0381e3460c0..70977802009261210d33b9e2858ebd7825f57237 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 558a676e96f506c77901ac94bf3c41f576eb2835..16c6853dde2a90865203c83101af95a2d2ef88fe 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 415906fc5ee2936367d4631fb56555039cb14a85..e64e4f7e4117e33678329157a11cd2bdddc965b4 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 dd881d166c8eca49a5b6ddd4032bf3d449e82255..3f3900ffe1a1c62bc997e24c97d029417692283b 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){