From f6a9dfd3699430b40febb4d4a894e5a9e6302874 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Fri, 3 Aug 2018 20:53:08 +0000
Subject: [PATCH] sjlj.S: Adjust to use PIC vs normal code to avoid absolute
 relocation in a shared library.

	* config/sh/sjlj.S: Adjust to use PIC vs normal code to avoid
	absolute relocation in a shared library.

From-SVN: r263299
---
 libitm/ChangeLog             |   5 +++++
 libitm/config/sh/.sjlj.S.swp | Bin 0 -> 12288 bytes
 libitm/config/sh/sjlj.S      |   4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 libitm/config/sh/.sjlj.S.swp

diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 729603a9721..940520011bf 100644
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,8 @@
+2018-08-03  Sergei Trofimovich  <slyfox@gentoo.org>
+
+	* config/sh/sjlj.S: Adjust to use PIC vs normal code to avoid
+	absolute relocation in a shared library.
+
 2018-06-12  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR libitm/85988
diff --git a/libitm/config/sh/.sjlj.S.swp b/libitm/config/sh/.sjlj.S.swp
new file mode 100644
index 0000000000000000000000000000000000000000..3b243ee20a3db834d1c5f4aa0005fae847bbf8b0
GIT binary patch
literal 12288
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
AhyVZp

literal 0
HcmV?d00001

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-.)
-- 
2.30.2