commit d93eb6ad2ba361c410611682797b09f6061a9776
Author: gretay <gretay@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Thu May 2 15:45:10 2013 +0000

    gcc/ChangeLog
    
    2013-05-02  Greta Yorsh  <Greta.Yorsh@arm.com>
    
    	PR target/56732
    	* config/arm/arm.c (arm_expand_epilogue): Check really_return before
    	generating simple_return for naked functions.
    
    gcc/testsuite/ChangeLog
    
    2013-05-02  Greta Yorsh  <Greta.Yorsh@arm.com>
    
    	PR target/56732
    	* gcc.target/arm/pr56732-1.c: New test.
    
    
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@198547 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5a3d466..cd257b1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-02  Greta Yorsh  <Greta.Yorsh@arm.com>
+
+	PR target/56732
+	* config/arm/arm.c (arm_expand_epilogue): Check really_return before
+	generating simple_return for naked functions.
+
 2013-05-02  Martin Jambor  <mjambor@suse.cz>
 
 	PR middle-end/56988
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index bc42473..0b97cf8 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -24114,7 +24114,8 @@ arm_expand_epilogue (bool really_return)
   if (IS_NAKED (func_type)
       || (IS_VOLATILE (func_type) && TARGET_ABORT_NORETURN))
     {
-      emit_jump_insn (simple_return_rtx);
+      if (really_return)
+        emit_jump_insn (simple_return_rtx);
       return;
     }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1f345ff..28a1f43 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-02  Greta Yorsh  <Greta.Yorsh@arm.com>
+
+	PR target/56732
+	* gcc.target/arm/pr56732-1.c: New test.
+
 2013-05-02  Martin Jambor  <mjambor@suse.cz>
 
 	PR middle-end/56988
diff --git a/gcc/testsuite/gcc.target/arm/pr56732-1.c b/gcc/testsuite/gcc.target/arm/pr56732-1.c
new file mode 100644
index 0000000..ac8b8cf
--- /dev/null
+++ b/gcc/testsuite/gcc.target/arm/pr56732-1.c
@@ -0,0 +1,20 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target naked_functions } */
+/* { dg-options "-O2 -Wall" } */
+extern void bar();
+
+void __attribute__((__naked__))
+foo(void)
+{
+  bar ();
+}
+
+int __attribute__((naked))
+zoo (int a, int b, int c, int d, int e, int f)
+{
+  bar ();
+  return e;
+}
+/* Verify that __attribute__((naked)) produces a naked function that
+   does not use bx to return. */
+/* { dg-final { scan-assembler-not "\tbx\tlr" } } */