--- binutils-2.28/bfd/opncls.c.orig 2017-03-02 09:23:53.000000000 +0100 +++ binutils-2.28/bfd/opncls.c 2017-06-06 05:31:14.585633912 +0200 @@ -1209,6 +1209,15 @@ return name; } +static char const* +relaxed_filename (char const* filename) +{ + char const* relaxed = strstr (filename, "/usr/lib/debug/"); + if ( relaxed != NULL ) + return relaxed; + return filename; +} + /* FUNCTION bfd_get_alt_debug_link_info @@ -1397,6 +1406,10 @@ if (include_dirs) { + /* PLD: check the possible absolute debuginfo path (e.g. /tmp/.../usr/lib/debug/... */ + if (separate_debug_file_exists (basename, crc32)) + return basename; + for (dirlen = strlen (abfd->filename); dirlen > 0; dirlen--) if (IS_DIR_SEPARATOR (abfd->filename[dirlen - 1])) break; @@ -1629,8 +1642,7 @@ return NULL; } - /* Strip off any path components in filename. */ - filename = lbasename (filename); + filename = relaxed_filename (filename); sect = bfd_get_section_by_name (abfd, GNU_DEBUGLINK); if (sect) @@ -1716,9 +1728,7 @@ crc32 = bfd_calc_gnu_debuglink_crc32 (crc32, buffer, count); fclose (handle); - /* Strip off any path components in filename, - now that we no longer need them. */ - filename = lbasename (filename); + filename = relaxed_filename (filename); filelen = strlen (filename); debuglink_size = filelen + 1;