From: Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
Date: Sun, 28 Feb 2016 22:21:12 +0000 (-0500)
Subject: work around get_symbol_name () in sparc and ia64
X-Git-Tag: users/hjl/linux/release/2.26.51.0.2~1^2~70^2~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e87de5136e9054974b812a362099826fc83e74e9;p=thirdparty%2Fbinutils-gdb.git

work around get_symbol_name () in sparc and ia64

get_symbol_name () returns a char * in a out arg, which means we need to cast
to assign a literal to the variable passed to get_symbol_name ().  It seems
like better APIs than get_symbol_name () could be provided, but that seems like
a fair amount of work so just casting seems to be the betterthing to do for
now.

gas/ChangeLog:

2016-03-31  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>

	* config/tc-ia64.c (md_assemble): Add temporary variable to pass to
	get_symbol_name ().
	* config/tc-sparc.c (s_register): Cast a literal to char * in
	assignment.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9b6d066bb25..4b3127cfd0e 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2016-03-31  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
+
+	* config/tc-ia64.c (md_assemble): Add temporary variable to pass to
+	get_symbol_name ().
+	* config/tc-sparc.c (s_register): Cast a literal to char * in
+	assignment.
+
 2016-03-31  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
 
 	* config/tc-i960.c (parse_expr): Cast to char * when assigning to
diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index 85f609586fd..a50b61e3b7c 100644
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -10667,7 +10667,8 @@ check_dv (struct ia64_opcode *idesc)
 void
 md_assemble (char *str)
 {
-  char *saved_input_line_pointer, *mnemonic;
+  char *saved_input_line_pointer, *temp;
+  const char *mnemonic;
   const struct pseudo_opcode *pdesc;
   struct ia64_opcode *idesc;
   unsigned char qp_regno;
@@ -10679,7 +10680,8 @@ md_assemble (char *str)
 
   /* extract the opcode (mnemonic):  */
 
-  ch = get_symbol_name (&mnemonic);
+  ch = get_symbol_name (&temp);
+  mnemonic = temp;
   pdesc = (struct pseudo_opcode *) hash_find (md.pseudo_hash, mnemonic);
   if (pdesc)
     {
diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index 6f2de4dd128..9f30d3a552f 100644
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -4413,7 +4413,7 @@ s_register (int ignore ATTRIBUTE_UNUSED)
       if (regname[0] == 'i')
 	regname = NULL;
       else
-	regname = "";
+	regname = (char *) "";
     }
   else
     {