Speed up readelf and objdump by not looking for DWO links unless the user has request...

	PR 22802
	* dwarf.c (load_separate_debug_file): Return early if the user is
	not interested in debug links.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 1e7e581bfa420cfe9cfe7fbfcea17e5658c6b1c6..5fe9d97b386bd1b17247e397b2ff02d895616b6e 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-08  Nick Clifton  <nickc@redhat.com>
+
+       PR 22802
+       * dwarf.c (load_separate_debug_file): Return early if the user is
+       not interested in debug links.
+
 2018-02-06  Nick Clifton  <nickc@redhat.com>
 
        PR 22793

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 71fdf3910807b629d37679f449234d17c1bccd50..6aca9b79942b5593b6ab445795d5b50b8f973bed 100644 (file)
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -9876,6 +9876,10 @@ load_dwo_file (const char * main_filename)
 void *
 load_separate_debug_file (void * file, const char * filename)
 {
+  /* Skip this operation if we are not interested in debug links.  */
+  if (! do_follow_links && ! do_debug_links)
+    return NULL;
+
   /* See if there is a dwo link.  */
   if (load_debug_section (str, file)
       && load_debug_section (abbrev, file)
@@ -9910,6 +9914,8 @@ load_separate_debug_file (void * file, const char * filename)
     }
 
   if (! do_follow_links)
+    /* The other debug links will be displayed by display_debug_links()
+       so we do not need to do any further processing here.  */
     return NULL;
 
   /* FIXME: We do not check for the presence of both link sections in the same file.  */