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 346ba9e39f594da4e0eb78089ec080c53b928a91..ab763fdc8a378929f922da8657ceaa952bc166f5 100644 (file)
--- 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 f18aab690f464d03451140f5d1dde005a2a54d2e..29c43bc28bdbca682a7b98ad968bd9397ca08819 100644 (file)
--- 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);