aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKugan Vivekanandarajah <kuganv@linaro.org>2013-06-10 22:00:03 +0000
committerChristophe Lyon <christophe.lyon@linaro.org>2013-06-10 22:00:03 +0000
commitf33e107b82d1e1d4a8e34a350cfed80ec1799d19 (patch)
treed7e608777dd5c878383c6727dfa5bdd11ed58335
parent83ae13ddb8958b6d4ed2052475ee1cc7ffe32c63 (diff)
2013-06-06 Kugan Vivekanandarajah <kuganv@linaro.org>
Backport from mainline r198879. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/linaro/gcc-4_8-branch@199922 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog.linaro9
-rw-r--r--gcc/config/arm/arm.h2
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/ChangeLog.linaro b/gcc/ChangeLog.linaro
index 9edb463ea13..e5ef0e34c61 100644
--- a/gcc/ChangeLog.linaro
+++ b/gcc/ChangeLog.linaro
@@ -1,3 +1,12 @@
+2013-06-06 Kugan Vivekanandarajah <kuganv@linaro.org>
+
+ Backport from mainline r198879:
+
+ 2013-05-14 Chung-Lin Tang <cltang@codesourcery.com>
+ PR target/42017
+ * config/arm/arm.h (EPILOGUE_USES): Only return true
+ for LR_REGNUM after epilogue_completed.
+
2013-06-05 Christophe Lyon <christophe.lyon@linaro.org>
Backport from trunk r199652,199653,199656,199657,199658.
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 1fcf28c5be9..75325bf5220 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -1652,7 +1652,7 @@ typedef struct
frame. */
#define EXIT_IGNORE_STACK 1
-#define EPILOGUE_USES(REGNO) ((REGNO) == LR_REGNUM)
+#define EPILOGUE_USES(REGNO) (epilogue_completed && (REGNO) == LR_REGNUM)
/* Determine if the epilogue should be output as RTL.
You should override this if you define FUNCTION_EXTRA_EPILOGUE. */