[SCM] jankratochvil/gdbserverbuildid2: buildidwarn

[jkratoch@sourceware.org]

The branch, jankratochvil/gdbserverbuildid2 has been updated
  discards  45d37a2219f903f60c90320bd2413c21c3fe869d (commit)
  discards  1f03224f89445002273becf43bc2fe64936f4671 (commit)
  discards  9798e192499c9161e7061fce9cde90dd89b3da18 (commit)
  discards  32254f93ab5c6271456b689dcd16fdad0cc2129d (commit)
  discards  cf02f297ca1c72089dc6cbcd6557d0a68757127d (commit)
  discards  9673d0d64e72e2dbc7455d3700bf3793c8bf104c (commit)
  discards  0d4cc1d76b5a4c7f472a998a71f50f87f8371955 (commit)
  discards  62757e6e09df9aaa5a6b5c5681e71ce1ebd67a91 (commit)
       via  d91ac3ceb0adddb1ba5aaab06699fd2af3b45ca8 (commit)
       via  168149db3b7cde9b94d5f22766fad29fd042cfd6 (commit)
       via  4e408474626b408a8704039e634043a2678f86fa (commit)
       via  6bcded095e565a9ab4e3a3e63b13303e7f14782a (commit)
       via  fe1b7ec8c97bf675e57165603468335cd14c4e4c (commit)
       via  f637f94da2f0e92a68c04ef40688409bfa1d0246 (commit)
       via  8251d735d186180ceb82b1bb98c65158a4e7c749 (commit)
       via  bc787422c4a3e3b05d6b17cc804176822550559f (commit)
       via  fffe8a3466e5b18eefc70a35e881a26510cac2d5 (commit)
      from  45d37a2219f903f60c90320bd2413c21c3fe869d (commit)

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

- Log -----------------------------------------------------------------
commit d91ac3ceb0adddb1ba5aaab06699fd2af3b45ca8
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Jul 30 20:49:10 2015 +0200

    buildidwarn

commit 168149db3b7cde9b94d5f22766fad29fd042cfd6
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Jul 30 20:48:50 2015 +0200

    locatetest

commit 4e408474626b408a8704039e634043a2678f86fa
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Jul 30 20:48:14 2015 +0200

    mainbuildid

commit 6bcded095e565a9ab4e3a3e63b13303e7f14782a
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Jul 30 20:31:46 2015 +0200

    hexallocate

commit fe1b7ec8c97bf675e57165603468335cd14c4e4c
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Jul 28 22:13:31 2015 +0200

    buildid

commit f637f94da2f0e92a68c04ef40688409bfa1d0246
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Jul 28 22:12:52 2015 +0200

    buildidproto

commit 8251d735d186180ceb82b1bb98c65158a4e7c749
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Wed Jul 29 21:38:45 2015 +0200

    buildidtobfd

commit bc787422c4a3e3b05d6b17cc804176822550559f
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Wed Jul 29 19:52:47 2015 +0200

    buildidforcemove

commit fffe8a3466e5b18eefc70a35e881a26510cac2d5
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Jul 30 23:07:10 2015 +0200

    buildidfreefix

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

Summary of changes:
 gdb/build-id.c |    6 ++++--
 gdb/source.c   |    4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

First 500 lines of diff:
diff --git a/gdb/build-id.c b/gdb/build-id.c
index f3948bf..95ddcc6 100644
--- a/gdb/build-id.c
+++ b/gdb/build-id.c
@@ -66,6 +66,7 @@ build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check)
 {
   const struct bfd_build_id *found = build_id_bfd_get (abfd);
   char *message, *check_hex = alloca (check_len * 2 + 1);
+  struct cleanup *back_to;
 
   bin2hex (check, check_hex, check_len);
 
@@ -85,19 +86,20 @@ build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check)
     }
   else
     return 1;
+  back_to = make_cleanup (xfree, message);
 
   if (validate_build_id)
     {
       warning (_("Symbol file \"%s\" could not be validated (%s) and "
 		 "will be ignored; or use 'set build-id-force'."),
 	       bfd_get_filename (abfd), message);
-      xfree (message);
+      do_cleanups (back_to);
       return 0;
     }
   warning (_("Symbol file \"%s\" could not be validated (%s) "
 	     "but it is being loaded due to 'set build-id-force'."),
 	   bfd_get_filename (abfd), message);
-  xfree (message);
+  do_cleanups (back_to);
   return 1;
 }
 
diff --git a/gdb/source.c b/gdb/source.c
index 297c2f3..3894bd6 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -829,7 +829,7 @@ file_location_from_filename (const char *filename, int is_bfd, size_t build_idsz
 	}
     }
 
-  if ((build_idsz == 0 || !validate_build_id) && !is_bfd)
+  if (build_idsz == 0 && !is_bfd)
     {
       discard_cleanups (back_to);
       return result;
@@ -876,7 +876,7 @@ file_location_from_filename (const char *filename, int is_bfd, size_t build_idsz
       return result;
     }
 
-  if (build_idsz == 0 || !validate_build_id)
+  if (build_idsz == 0)
     {
       gdb_assert (is_bfd);
       gdb_assert (fd_dup == -1);


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