Use bfd_get_filename throughout ld

[deliverable/binutils-gdb.git] / ld / emultempl / pe.em

diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index 3dd36de373dbb7c57f6503a0f252645a7cfe5cce..fe65d2b266e5c49ad521a5a49078061e81fef146 100644 (file)
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -1338,7 +1338,7 @@ gld_${EMULATION_NAME}_after_open (void)
       bfd_hash_traverse (&link_info.hash->table, pr_sym, NULL);
 
       for (a = link_info.input_bfds; a; a = a->link.next)
-       printf ("*%s\n",a->filename);
+       printf ("*%s\n", bfd_get_filename (a));
     }
 #endif
 
@@ -1599,7 +1599,7 @@ gld_${EMULATION_NAME}_after_open (void)
                       members, so look for the first element with a .dll
                       extension, and use that for the remainder of the
                       comparisons.  */
-                   pnt = strrchr (is3->the_bfd->filename, '.');
+                   pnt = strrchr (bfd_get_filename (is3->the_bfd), '.');
                    if (pnt != NULL && filename_cmp (pnt, ".dll") == 0)
                      break;
                  }
@@ -1616,12 +1616,12 @@ gld_${EMULATION_NAME}_after_open (void)
                      {
                        /* Skip static members, ie anything with a .obj
                           extension.  */
-                       pnt = strrchr (is2->the_bfd->filename, '.');
+                       pnt = strrchr (bfd_get_filename (is2->the_bfd), '.');
                        if (pnt != NULL && filename_cmp (pnt, ".obj") == 0)
                          continue;
 
-                       if (filename_cmp (is3->the_bfd->filename,
-                                         is2->the_bfd->filename))
+                       if (filename_cmp (bfd_get_filename (is3->the_bfd),
+                                         bfd_get_filename (is2->the_bfd)))
                          {
                            is_ms_arch = 0;
                            break;
@@ -1633,7 +1633,7 @@ gld_${EMULATION_NAME}_after_open (void)
            /* This fragment might have come from an .obj file in a Microsoft
               import, and not an actual import record. If this is the case,
               then leave the filename alone.  */
-           pnt = strrchr (is->the_bfd->filename, '.');
+           pnt = strrchr (bfd_get_filename (is->the_bfd), '.');
 
            if (is_ms_arch && (filename_cmp (pnt, ".dll") == 0))
              {
@@ -1655,11 +1655,10 @@ gld_${EMULATION_NAME}_after_open (void)
                else /* sentinel */
                  seq = 'c';
 
-
                /* PR 25993: It is possible that is->the_bfd-filename == is->filename.
                   In which case calling bfd_set_filename on one will free the memory
                   pointed to by the other.  */
-               if (is->filename == is->the_bfd->filename)
+               if (is->filename == bfd_get_filename (is->the_bfd))
                  {
                    new_name = xmalloc (strlen (is->filename) + 3);
                    sprintf (new_name, "%s.%c", is->filename, seq);
@@ -1668,8 +1667,10 @@ gld_${EMULATION_NAME}_after_open (void)
                  }
                else
                  {
-                   new_name = xmalloc (strlen (is->the_bfd->filename) + 3);
-                   sprintf (new_name, "%s.%c", is->the_bfd->filename, seq);
+                   new_name
+                     = xmalloc (strlen (bfd_get_filename (is->the_bfd)) + 3);
+                   sprintf (new_name, "%s.%c",
+                            bfd_get_filename (is->the_bfd), seq);
                    bfd_set_filename (is->the_bfd, new_name);
 
                    new_name = xmalloc (strlen (is->filename) + 3);