aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorolegendo <olegendo@138bc75d-0d04-0410-961f-82ee72b054a4>2019-09-28 09:11:02 +0000
committerolegendo <olegendo@138bc75d-0d04-0410-961f-82ee72b054a4>2019-09-28 09:11:02 +0000
commit44f7a671969a24734db0968f3cbb2526afb9b0f0 (patch)
tree25b9f75058a32f334f818f2c284c6058a36a71db
parente2bbb8c337e7f0469113b769d65e7620a33dbb33 (diff)
libitm/
2019-09-28 Oleg Endo <olegendo@gcc.gnu.org> Backport from mainline 2018-08-03 Sergei Trofimovich <slyfox@gentoo.org> PR target/86712 * config/sh/sjlj.S: Adjust to use PIC vs normal code to avoid absolute relocation in a shared library. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-8-branch@276246 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libitm/ChangeLog9
-rw-r--r--libitm/config/sh/sjlj.S4
2 files changed, 11 insertions, 2 deletions
diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 78ff2e548e2..2ba270728e6 100644
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,12 @@
+2019-09-28 Oleg Endo <olegendo@gcc.gnu.org>
+
+ Backport from mainline
+ 2018-08-03 Sergei Trofimovich <slyfox@gentoo.org>
+
+ PR target/86712
+ * config/sh/sjlj.S: Adjust to use PIC vs normal code to avoid
+ absolute relocation in a shared library.
+
2019-02-22 Release Manager
* GCC 8.3.0 released.
diff --git a/libitm/config/sh/sjlj.S b/libitm/config/sh/sjlj.S
index 043f36749be..f265ab8f898 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-.)