diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ac4691ff6e5..ab61ec2e553 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-10  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+	* defaults.h (FRAME_ADDR_RTX): New default definition.
+	* builtins.c (expand_builtin_return_addr): Adjust.
+
 2015-10-10  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
 	* defaults.h (DYNAMIC_CHAIN_ADDRESS): New default definition.
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 750488e7f73..65aa71f659d 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 80ad35c6768..eb16fc85e64 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