From: Oleg Endo Date: Sat, 28 Sep 2019 09:12:34 +0000 (+0000) Subject: backport: re PR libitm/86712 (libitm produces libitm.so with TEXTREL on SuperH (sh4... X-Git-Tag: releases/gcc-7.5.0~91 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6214e02be5d4716f033245941f82271b989e347;p=thirdparty%2Fgcc.git backport: re PR libitm/86712 (libitm produces libitm.so with TEXTREL on SuperH (sh4) in _ITM_beginTransaction) libitm/ 2019-09-28 Oleg Endo Backport from mainline 2018-08-03 Sergei Trofimovich PR target/86712 * config/sh/sjlj.S: Adjust to use PIC vs normal code to avoid absolute relocation in a shared library. From-SVN: r276247 --- diff --git a/libitm/ChangeLog b/libitm/ChangeLog index 38d259671db1..4f0b10510753 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,12 @@ +2019-09-28 Oleg Endo + + Backport from mainline + 2018-08-03 Sergei Trofimovich + + PR target/86712 + * config/sh/sjlj.S: Adjust to use PIC vs normal code to avoid + absolute relocation in a shared library. + 2018-12-13 Peter Bergner Backport from mainline diff --git a/libitm/config/sh/sjlj.S b/libitm/config/sh/sjlj.S index 0159fed2b473..6ed2b8b25b8f 100644 --- a/libitm/config/sh/sjlj.S +++ b/libitm/config/sh/sjlj.S @@ -53,7 +53,7 @@ _ITM_beginTransaction: #else cfi_def_cfa_offset (4*10) #endif -#if defined HAVE_ATTRIBUTE_VISIBILITY || !defined __PIC__ +#if !defined __PIC__ mov.l .Lbegin, r1 jsr @r1 mov r15, r5 @@ -78,7 +78,7 @@ _ITM_beginTransaction: .align 2 .Lbegin: -#if defined HAVE_ATTRIBUTE_VISIBILITY || !defined __PIC__ +#if !defined __PIC__ .long GTM_begin_transaction #else .long GTM_begin_transaction@PCREL-(.Lbegin0-.)