From a9e0a99876e03cb3fedcded38d442fe53b185a84 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Sun, 11 Oct 2015 00:48:17 +0000 Subject: always define FRAME_ADDR_RTX gcc/ChangeLog: 2015-10-10 Trevor Saunders * defaults.h (FRAME_ADDR_RTX): New default definition. * builtins.c (expand_builtin_return_addr): Adjust. From-SVN: r228688 --- gcc/ChangeLog | 5 +++++ gcc/builtins.c | 4 ---- gcc/defaults.h | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ac4691f..ab61ec2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2015-10-10 Trevor Saunders + * defaults.h (FRAME_ADDR_RTX): New default definition. + * builtins.c (expand_builtin_return_addr): Adjust. + +2015-10-10 Trevor Saunders + * defaults.h (DYNAMIC_CHAIN_ADDRESS): New default definition. * builtins.c (expand_builtin_return_addr): Adjust. diff --git a/gcc/builtins.c b/gcc/builtins.c index 750488e..65aa71f 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -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 diff --git a/gcc/defaults.h b/gcc/defaults.h index 80ad35c..eb16fc8 100644 --- a/gcc/defaults.h +++ b/gcc/defaults.h @@ -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 -- cgit v1.1