Sync libiberty sources with master version in gcc repository. Updated stabs demangling and cxxfilt tests to match.

PR 24044
	* stabs.c (parse_stab_argtypes): Remove call to
	cplus_mangle_opcode.
	* testsuite/binutils-all/cxxfilt.exp: Replace tests of v2 encoding
	with v3 encoding.  Add escape for known failures.

ChangeLog

@@ -1,3 +1,7 @@
+2019-01-07  Nick Clifton  <nickc@redhat.com>
+
+	* libiberty: Merge from gcc.
+
 2019-01-03  Дилян Палаузов  <dilyan.palauzov@aegee.org>
 
 	* configure.ac: Don't configure readline if --with-system-readline is

binutils/ChangeLog

@@ -1,3 +1,11 @@
+2019-01-07  Nick Clifton  <nickc@redhat.com>
+
+	PR 24044
+	* stabs.c (parse_stab_argtypes): Remove call to
+	cplus_mangle_opcode.
+	* testsuite/binutils-all/cxxfilt.exp: Replace tests of v2 encoding
+	with v3 encoding.  Add escape for known failures.
+
 2018-12-25  Yoshinori Sato <ysato@users.sourceforge.jp>
 	* readelf.c (get_machine_flags): Add RXv3 output.
 

binutils/stabs.c

@@ -3037,27 +3037,15 @@ parse_stab_argtypes (void *dhandle, struct stab_handle *info,
 	  && fieldname[1] == 'p'
 	  && (fieldname[2] == '$' || fieldname[2] == '.'))
 	{
-	  const char *opname;
+	  /* Opname selection is no longer supported by libiberty's demangler.  */
-
-	  opname = cplus_mangle_opname (fieldname + 3, 0);
-	  if (opname == NULL)
-	    {
-	      fprintf (stderr, _("No mangling for \"%s\"\n"), fieldname);
 	  return DEBUG_TYPE_NULL;
 	}
-	  mangled_name_len += strlen (opname);
+
-	  physname = (char *) xmalloc (mangled_name_len);
-	  strncpy (physname, fieldname, 3);
-	  strcpy (physname + 3, opname);
-	}
-      else
-	{
       physname = (char *) xmalloc (mangled_name_len);
       if (is_constructor)
 	physname[0] = '\0';
       else
 	strcpy (physname, fieldname);
-	}
 
       physname_len = strlen (physname);
       strcat (physname, buf);

binutils/testsuite/binutils-all/cxxfilt.exp

@@ -14,6 +14,30 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
+# For some reason cxxfilt is not working on the following targets.
+# FIXME: Investigate why.
+if { [istarget "cris*-*-*"] || \
+     [istarget "cr16-*-*"] || \
+     [istarget "crx*-*-*"] || \
+     [istarget "epiphany-*-*"] || \
+     [istarget "ip2k-*-*"] || \
+     [istarget "metag-*-*"] || \
+     [istarget "mn10200-*-*"] || \
+     [istarget "mn10300-*-*"] || \
+     [istarget "ns32k-*-*"] || \
+     [istarget "pdp11-*-*"] || \
+     [istarget "rl78-*-*"] || \
+     [istarget "rx-*-*"] || \
+     [istarget "sh-*-*"] || \
+     [istarget "tic4*-*-*"] || \
+     [istarget "tic54*-*-*"] || \
+     [istarget "v850-*-*"] || \
+     [istarget "z8k-*-*"] || \
+     [istarget "*-*-cygwin"] || \
+     [istarget "*-*-mingw32"] } then {
+    return
+}
+
 proc test_cxxfilt {options mangled_string demangled_string} {
     global CXXFILT
     global CXXFILTFLAGS
@@ -32,12 +56,12 @@ proc test_cxxfilt {options mangled_string demangled_string} {
 
 # Mangled and demangled strings stolen from libiberty/testsuite/demangle-expected.
 test_cxxfilt {} \
-    "AddAlignment__9ivTSolverUiP12ivInteractorP7ivTGlue" \
+    "_Z1fIvJiELb0EEvPDOT1_EFT_DpT0_E" \
-    "ivTSolver::AddAlignment(unsigned int, ivInteractor ., ivTGlue .)*"
+    "void f.void, int, false.(void (.)(int) noexcept(false))*"
 
-test_cxxfilt {--format=lucid} \
+test_cxxfilt {--format=gnu-v3} \
-    "__ct__12strstreambufFPFl_PvPFPv_v" \
+    "_Z14int_if_addableI1YERiP1AIXszpldecvPT_Li0EdecvS4_Li0EEE" \
-    "strstreambuf..(strstreambuf|_ct)(void .(.)(long), void (.)(void .))*"
+    "int& int_if_addable.Y.(A.sizeof ((.((Y.)(0))).(.((Y.)(0))))..)*"
 
 test_cxxfilt {--no-recurse-limit} \
     "Z3fooiPiPS_PS0_PS1_PS2_PS3_PS4_PS5_PS6_PS7_PS8_PS9_PSA_PSB_PSC_" \

libiberty/ChangeLog

@@ -1,3 +1,17 @@
+2019-01-01  Jakub Jelinek  <jakub@redhat.com>
+
+	Update copyright years.
+
+2018-12-22  Jason Merrill  <jason@redhat.com>
+
+	Remove support for demangling GCC 2.x era mangling schemes.
+	* cplus-dem.c: Remove cplus_mangle_opname, cplus_demangle_opname,
+	internal_cplus_demangle, and all subroutines.
+	(libiberty_demanglers): Remove entries for ancient GNU (pre-3.0),
+	Lucid, ARM, HP, and EDG demangling styles.
+	(cplus_demangle): Remove 'work' variable.  Don't call
+	internal_cplus_demangle.
+
 2018-12-07  Nick Clifton  <nickc@redhat.com>
 
 	PR 87681
@@ -63,10 +77,7 @@
 
 	* cplus-dem.c (remember_Btype): Don't call memcpy with LEN==0.
 
-2018-08-01  Richard Earnshaw  <rearnsha@arm.com>
+2018-07-26  Martin Liska  <mliska@suse.cz>
-
-	Copy over from GCC
-	2018-07-26  Martin Liska  <mliska@suse.cz>
 
 	PR lto/86548
 	* make-temp-file.c (TEMP_FILE): Remove leading 'cc'.
@@ -74,17 +85,10 @@
 	first argument set to NULL.
 	(make_temp_file_with_prefix): Support also prefix.
 
-2018-07-18  Eli Zaretskii  <eliz@gnu.org>
+2018-07-19  Eli Zaretskii  <eliz@gnu.org>
 
-	PR gdb/23434
+	* simple-object-elf.c (ENOTSUP): If not defined by errno.h, redirect
-	* libiberty/simple-object-elf.c (ENOTSUP): If not defined by
+	to ENOSYS.
-        errno.h, redirect ENOTSUP to ENOSYS.
-
-2018-06-19  Simon Marchi  <simon.marchi@ericsson.com>
-
-	* configure.ac: Remove AC_PREREQ.
-	* configure: Re-generate.
-	* config.in: Re-generate.
 
 2018-05-30  Jan Hubicka  <hubicka@ucw.cz>