From: John David Anglin <danglin@gcc.gnu.org>
Date: Sun, 5 Aug 2018 16:16:38 +0000 (-0400)
Subject: Fix unwind offset for call_info->start_symbol.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e521dc888158a6cdbdccef0397e663c437450a80;p=thirdparty%2Fbinutils-gdb.git

Fix unwind offset for call_info->start_symbol.

	Backport from master branch
	2018-07-30  John David Anglin  <danglin@gcc.gnu.org>

	* config/tc-hppa.c: Include "struc-symbol.h".
	(pa_build_unwind_subspace): Use call_info->start_symbol->sy_frag
	instead of frag_now for local symbol replacement.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 346ba9e39f5..ab763fdc8a3 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,12 @@
+2018-08-05  John David Anglin  <danglin@gcc.gnu.org>
+
+	Backport from master branch
+	2018-07-30  John David Anglin  <danglin@gcc.gnu.org>
+
+	* config/tc-hppa.c: Include "struc-symbol.h".
+	(pa_build_unwind_subspace): Use call_info->start_symbol->sy_frag
+	instead of frag_now for local symbol replacement.
+
 2018-06-14  H.J. Lu  <hongjiu.lu@intel.com>
 
 	Backport from master branch
diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index f18aab690f4..29c43bc28bd 100644
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -23,6 +23,7 @@
 
 #include "as.h"
 #include "safe-ctype.h"
+#include "struc-symbol.h"
 #include "subsegs.h"
 #include "dw2gencfi.h"
 
@@ -5989,7 +5990,8 @@ pa_build_unwind_subspace (struct call_info *call_info)
   else
     {
       symbolP = symbol_new (name, now_seg,
-			    S_GET_VALUE (call_info->start_symbol), frag_now);
+			    S_GET_VALUE (call_info->start_symbol),
+			    call_info->start_symbol->sy_frag);
       gas_assert (symbolP);
       S_CLEAR_EXTERNAL (symbolP);
       symbol_table_insert (symbolP);