always define DYNAMIC_CHAIN_ADDRESS

gcc/ChangeLog:

2015-10-10  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>

	* defaults.h (DYNAMIC_CHAIN_ADDRESS): New default definition.
	* builtins.c (expand_builtin_return_addr): Adjust.

From-SVN: r228687

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0d9ab5cde4841b1bcca280cb31ebf972eb99bebd..ac4691ff6e503c1321732bc4611d031cfcc38492 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-10  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+       * defaults.h (DYNAMIC_CHAIN_ADDRESS): New default definition.
+       * builtins.c (expand_builtin_return_addr): Adjust.
+
 2015-10-10  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
        * defaults.h (SETUP_FRAME_ADDRESSES): New default definition.

diff --git a/gcc/builtins.c b/gcc/builtins.c
index bd95acbca9334558c81237293e039cf495ce9e60..750488e7f735eb81b5df52266c876ccfc255dc46 100644 (file)
--- 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 5f1ea7674bb7bc6332cbe7f60030a0bd2087659c..80ad35c67683f0f1add867cf979af5ba47c3e9b6 100644 (file)
--- 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