From f407dfe9855ef15b27be8508032c5562aaa127a2 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Sun, 11 Oct 2015 00:48:11 +0000 Subject: [PATCH] always define DYNAMIC_CHAIN_ADDRESS gcc/ChangeLog: 2015-10-10 Trevor Saunders * defaults.h (DYNAMIC_CHAIN_ADDRESS): New default definition. * builtins.c (expand_builtin_return_addr): Adjust. From-SVN: r228687 --- gcc/ChangeLog | 5 +++++ gcc/builtins.c | 2 -- gcc/defaults.h | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0d9ab5cde48..ac4691ff6e5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-10-10 Trevor Saunders + + * defaults.h (DYNAMIC_CHAIN_ADDRESS): New default definition. + * builtins.c (expand_builtin_return_addr): Adjust. + 2015-10-10 Trevor Saunders * defaults.h (SETUP_FRAME_ADDRESSES): New default definition. diff --git a/gcc/builtins.c b/gcc/builtins.c index bd95acbca93..750488e7f73 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -799,9 +799,7 @@ expand_builtin_return_addr (enum built_in_function fndecl_code, int count) { /* Assume the dynamic chain pointer is in the word that the frame address points to, unless otherwise specified. */ -#ifdef DYNAMIC_CHAIN_ADDRESS tem = DYNAMIC_CHAIN_ADDRESS (tem); -#endif tem = memory_address (Pmode, tem); tem = gen_frame_mem (Pmode, tem); tem = copy_to_reg (tem); diff --git a/gcc/defaults.h b/gcc/defaults.h index 5f1ea7674bb..80ad35c6768 100644 --- a/gcc/defaults.h +++ b/gcc/defaults.h @@ -1285,6 +1285,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define SETUP_FRAME_ADDRESSES() do { } while (0) #endif +#ifndef DYNAMIC_CHAIN_ADDRESS +#define DYNAMIC_CHAIN_ADDRESS(x) (x) +#endif + #ifdef GCC_INSN_FLAGS_H /* Dependent default target macro definitions -- 2.30.2