OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix find_charset_names. 

The patch f2aec7f6d1 changed the return type of relocate_gdb_directory to
std::string, but the change is not reflected in find_charset_names function.
(Probably missed because the broken code is behind an #ifdef).

gdb/ChangeLog

	* charset.c (find_charset_names): Reflect API change.
This commit is contained in:
Ali Tamur 2019-10-21 16:34:19 -07:00
parent 92174eeae8
commit 1834d45f0f
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@ -1,3 +1,7 @@
2019-10-25 Ali Tamur <tamur@google.com>
* charset.c (find_charset_names): Reflect API change.
2019-10-25 Christian Biesinger <cbiesinger@google.com> 2019-10-25 Christian Biesinger <cbiesinger@google.com>
* symtab.c (struct demangled_name_entry): Change demangled name * symtab.c (struct demangled_name_entry): Change demangled name

5
gdb/charset.c
View File

@ -816,10 +816,9 @@ find_charset_names (void)
#ifdef ICONV_BIN #ifdef ICONV_BIN
{ {
char *iconv_dir = relocate_gdb_directory (ICONV_BIN, std::string iconv_dir = relocate_gdb_directory (ICONV_BIN,
ICONV_BIN_RELOCATABLE); ICONV_BIN_RELOCATABLE);
iconv_program = concat (iconv_dir, SLASH_STRING, "iconv", NULL); iconv_program = concat (iconv_dir.c_str(), SLASH_STRING, "iconv", NULL);
xfree (iconv_dir);
} }
#else #else
iconv_program = xstrdup ("iconv"); iconv_program = xstrdup ("iconv");