@@ -808,11 +808,7 @@ expand_builtin_return_addr (enum built_in_function fndecl_code, int count)
/* For __builtin_frame_address, return what we've got. But, on
the SPARC for example, we may have to add a bias. */
if (fndecl_code == BUILT_IN_FRAME_ADDRESS)
-#ifdef FRAME_ADDR_RTX
return FRAME_ADDR_RTX (tem);
-#else
- return tem;
-#endif
/* For __builtin_return_address, get the return address from that frame. */
#ifdef RETURN_ADDR_RTX
@@ -1289,6 +1289,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#define DYNAMIC_CHAIN_ADDRESS(x) (x)
#endif
+#ifndef FRAME_ADDR_RTX
+#define FRAME_ADDR_RTX(x) (x)
+#endif
+
#ifdef GCC_INSN_FLAGS_H
/* Dependent default target macro definitions
From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org> gcc/ChangeLog: 2015-10-10 Trevor Saunders <tbsaunde+gcc@tbsaunde.org> * defaults.h (FRAME_ADDR_RTX): New default definition. * builtins.c (expand_builtin_return_addr): Adjust. --- gcc/builtins.c | 4 ---- gcc/defaults.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-)