[SCM] archer-jankratochvil-autoload: Merge branch 'gdbinitb-move2-misc-pfx-warn-safepath-debug' into gdbinitb-move2-misc-pfx-warn-safepath-debug-warnlocal

[jkratoch@sourceware.org]

The branch, archer-jankratochvil-autoload has been updated
       via  224bfa32f18eb367009044be4b28e78b72a9456e (commit)
       via  ca448b2f549f88a16e3886e162fe9b3a864e5edb (commit)
       via  7d70ec0c55266ecaec0b97ed629317a9bd590964 (commit)
      from  9cfd060c0f7ac43f636ef2bc4406e0ca9b895b87 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 224bfa32f18eb367009044be4b28e78b72a9456e
Merge: 9cfd060 ca448b2
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Jan 30 00:15:40 2012 +0100

    Merge branch 'gdbinitb-move2-misc-pfx-warn-safepath-debug' into gdbinitb-move2-misc-pfx-warn-safepath-debug-warnlocal

commit ca448b2f549f88a16e3886e162fe9b3a864e5edb
Merge: d2cd206 7d70ec0
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Jan 30 00:15:35 2012 +0100

    Merge branch 'gdbinitb-move2-misc-pfx-warn-safepath' into gdbinitb-move2-misc-pfx-warn-safepath-debug
    
    Conflicts:
    	gdb/linux-thread-db.c

commit 7d70ec0c55266ecaec0b97ed629317a9bd590964
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Jan 30 00:11:38 2012 +0100

    .

-----------------------------------------------------------------------

Summary of changes:
 gdb/linux-thread-db.c |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

First 500 lines of diff:
diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index 8942a89..062a92f 100644
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -799,11 +799,6 @@ try_thread_db_load (const char *library)
     printf_unfiltered (_("Trying host libthread_db library: %s.\n"),
                        library);
 
-  if (!file_is_auto_load_safe (library, _("auto-load: Loading libthread-db "
-					  "library \"%s\".\n"),
-			       library))
-    return 0;
-
   handle = dlopen (library, RTLD_NOW);
   if (handle == NULL)
     {
@@ -863,7 +858,13 @@ try_thread_db_load_from_pdir_1 (struct objfile *obj)
   /* This should at minimum hit the first character.  */
   gdb_assert (cp != NULL);
   strcpy (cp + 1, LIBTHREAD_DB_SO);
-  result = try_thread_db_load (path);
+
+  if (!file_is_auto_load_safe (path, _("auto-load: Loading libthread-db "
+				       "library \"%s\" from $pdir.\n"),
+			       path))
+    result = 0;
+  else
+    result = try_thread_db_load (path);
 
   do_cleanups (cleanup);
   return result;
@@ -929,7 +930,14 @@ try_thread_db_load_from_dir (const char *dir, size_t dir_len)
   memcpy (path, dir, dir_len);
   path[dir_len] = '/';
   strcpy (path + dir_len + 1, LIBTHREAD_DB_SO);
-  result = try_thread_db_load (path);
+
+  if (!file_is_auto_load_safe (path, _("auto-load: Loading libthread-db "
+				       "library \"%s\" from explicit "
+				       "directory.\n"),
+			       path))
+    result = 0;
+  else
+    result = try_thread_db_load (path);
 
   do_cleanups (cleanup);
   return result;


hooks/post-receive
--
Repository for Project Archer.