diff options
-rw-r--r-- | gcc/ChangeLog.linaro | 9 | ||||
-rw-r--r-- | gcc/config/arm/arm.h | 2 |
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. */ |