From: tbsaunde Date: Wed, 22 Apr 2015 00:44:48 +0000 (+0000) Subject: provide default for MASK_RETURN_ADDR X-Git-Tag: upstream/6.1~7848 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f564fb304ea0880acecfc49b0a957c5271808921;p=platform%2Fupstream%2Flinaro-gcc.git provide default for MASK_RETURN_ADDR gcc/ChangeLog: 2015-04-21 Trevor Saunders * defaults.h (MASK_RETURN_ADDR): New definition. * except.c (expand_builtin_extract_return_addr): Remove ifdef MASK_RETURN_ADDR. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222299 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index dc46aa9..acb026b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2015-04-21 Trevor Saunders + * defaults.h (MASK_RETURN_ADDR): New definition. + * except.c (expand_builtin_extract_return_addr): Remove ifdef + MASK_RETURN_ADDR. + +2015-04-21 Trevor Saunders + * defaults.h (RETURN_ADDR_OFFSET): New definition. * except.c (expand_builtin_extract_return_addr): Remove ifdef RETURN_ADDR_OFFSET. diff --git a/gcc/defaults.h b/gcc/defaults.h index 767901a..843d7e2 100644 --- a/gcc/defaults.h +++ b/gcc/defaults.h @@ -388,6 +388,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define RETURN_ADDR_OFFSET 0 #endif +#ifndef MASK_RETURN_ADDR +#define MASK_RETURN_ADDR NULL_RTX +#endif + /* If we have named section and we support weak symbols, then use the .jcr section for recording java classes which need to be registered at program start-up time. */ diff --git a/gcc/except.c b/gcc/except.c index 750deb5..7e6591b 100644 --- a/gcc/except.c +++ b/gcc/except.c @@ -2185,9 +2185,9 @@ expand_builtin_extract_return_addr (tree addr_tree) } /* First mask out any unwanted bits. */ -#ifdef MASK_RETURN_ADDR - expand_and (Pmode, addr, MASK_RETURN_ADDR, addr); -#endif + rtx mask = MASK_RETURN_ADDR; + if (mask) + expand_and (Pmode, addr, mask, addr); /* Then adjust to find the real return address. */ if (RETURN_ADDR_OFFSET)