absolute name of the bfd object for finding the debug file in
the global debugfile directory.
+2008-08-23 Andreas Schwab <schwab@suse.de>
+
+ * opncls.c (find_separate_debug_file): Use the canonical
+ absolute name of the bfd object for finding the debug file in
+ the global debugfile directory.
+
2008-08-22 Jakub Jelinek <jakub@redhat.com>
Fix PR ld/3290 regression for cross-files DW_FORM_ref_addr relocations.
2008-08-22 Jakub Jelinek <jakub@redhat.com>
Fix PR ld/3290 regression for cross-files DW_FORM_ref_addr relocations.
/* opncls.c -- open and close a BFD.
Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
/* opncls.c -- open and close a BFD.
Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
- 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
Free Software Foundation, Inc.
Written by Cygnus Support.
Free Software Foundation, Inc.
Written by Cygnus Support.
char *basename;
char *dir;
char *debugfile;
char *basename;
char *dir;
char *debugfile;
BFD_ASSERT (abfd);
if (debug_file_directory == NULL)
BFD_ASSERT (abfd);
if (debug_file_directory == NULL)
memcpy (dir, abfd->filename, dirlen);
dir[dirlen] = '\0';
memcpy (dir, abfd->filename, dirlen);
dir[dirlen] = '\0';
+ /* Compute the canonical name of the bfd object with all symbolic links
+ resolved, for use in the global debugfile directory. */
+ canon_dir = lrealpath (abfd->filename);
+ for (canon_dirlen = strlen (canon_dir); canon_dirlen > 0; canon_dirlen--)
+ if (IS_DIR_SEPARATOR (canon_dir[canon_dirlen - 1]))
+ break;
+ canon_dir[canon_dirlen] = '\0';
+
debugfile = bfd_malloc (strlen (debug_file_directory) + 1
debugfile = bfd_malloc (strlen (debug_file_directory) + 1
+ + (canon_dirlen > dirlen ? canon_dirlen : dirlen)
+ strlen (".debug/")
+ strlen (basename)
+ 1);
+ strlen (".debug/")
+ strlen (basename)
+ 1);
{
free (basename);
free (dir);
{
free (basename);
free (dir);
{
free (basename);
free (dir);
{
free (basename);
free (dir);
{
free (basename);
free (dir);
{
free (basename);
free (dir);
return debugfile;
}
/* Then try in the global debugfile directory. */
strcpy (debugfile, debug_file_directory);
return debugfile;
}
/* Then try in the global debugfile directory. */
strcpy (debugfile, debug_file_directory);
- i = strlen (debug_file_directory) - 1;
- if (i > 0
- && debug_file_directory[i] != '/'
- && dir[0] != '/')
+ dirlen = strlen (debug_file_directory) - 1;
+ if (dirlen > 0
+ && debug_file_directory[dirlen] != '/'
+ && canon_dir[0] != '/')
- strcat (debugfile, dir);
+ strcat (debugfile, canon_dir);
strcat (debugfile, basename);
if (separate_debug_file_exists (debugfile, crc32))
{
free (basename);
free (dir);
strcat (debugfile, basename);
if (separate_debug_file_exists (debugfile, crc32))
{
free (basename);
free (dir);
return debugfile;
}
free (debugfile);
free (basename);
free (dir);
return debugfile;
}
free (debugfile);
free (basename);
free (dir);