[SCM] pmuldoon/python-backtrace: Merge remote-tracking branch 'gdb/master' into pmuldoon/python-backtrace

[pmuldoon@sourceware.org]

The branch, pmuldoon/python-backtrace has been updated
       via  7891ff2ad0b3aa0a09c4868fd3002d19be0a1b53 (commit)
       via  f039214ffb9514ec16feb28d1f2471b1e1325a0e (commit)
       via  9f206662f66c7097aff7ef70925f409825a75bdb (commit)
       via  b55209d9a23dfc4e2f563a0b6bdd674f18d908d5 (commit)
       via  c7c855256383b1c3fd1e34704e19e462c603f25b (commit)
       via  271c6e6cca0e1a275fc9300f004cd51dc1b5433d (commit)
       via  d0dde44e0059b3fbfd55efaf87116ee382d775b4 (commit)
       via  f90721b0b87078b4aa45d6df174533643536ee56 (commit)
       via  95615b4a2932c1cbb5e8314afa4f43b1c38a9ee8 (commit)
       via  485edc33433aae5742e8cc4fbefdeea586dd7623 (commit)
       via  6b0f6001d42f7626cccaf964ce7e218efbc02176 (commit)
       via  de8127d5c010f93939533769c6adc6e55cec9630 (commit)
       via  bf21d1963b2a80db660b586ff2bf5fe372b28268 (commit)
       via  808e8fdc1d868072ed6cd214603d690d93597c31 (commit)
       via  69258f21f6ff1184208c2d3e1110ababc781bec3 (commit)
       via  fa23708ed5f8249d38948f8d5269bfbbca088417 (commit)
       via  390e57deb940ca7330a27b33d1e89652362295fb (commit)
      from  82dbca8964f09e43626139953b8894b49a09fd53 (commit)

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

- Log -----------------------------------------------------------------
commit 7891ff2ad0b3aa0a09c4868fd3002d19be0a1b53
Merge: f90721b f039214
Author: Phil Muldoon <pmuldoon@redhat.com>
Date:   Fri May 10 09:43:31 2013 +0100

    Merge remote-tracking branch 'gdb/master' into pmuldoon/python-backtrace

commit f039214ffb9514ec16feb28d1f2471b1e1325a0e
Author: DJ Delorie <dj@delorie.com>
Date:   Fri May 10 03:03:03 2013 +0000

    merge from gcc

commit 9f206662f66c7097aff7ef70925f409825a75bdb
Author: pinskia <pinskia>
Date:   Fri May 10 01:08:48 2013 +0000

    binutils/ChangeLog:
    * doc/binutils.texi: Document -Mvirt disassembler option.
    
    gas/ChangeLog:
    * config/tc-mips.c (struct mips_set_options): New ase_virt field.
    (mips_opts): Update for the new field.
    (file_ase_virt): New variable.
    (ISA_SUPPORTS_VIRT_ASE): New macro.
    (ISA_SUPPORTS_VIRT64_ASE): New macro.
    (MIPS_CPU_ASE_VIRT): New define.
    (is_opcode_valid): Handle ase_virt.
    (macro_build): Handle "+J".
    (validate_mips_insn): Likewise.
    (mips_ip): Likewise.
    (enum options): Add OPTION_VIRT and OPTION_NO_VIRT.
    (md_longopts): Add mvirt and mnovirt
    (md_parse_option): Handle OPTION_VIRT and OPTION_NO_VIRT.
    (mips_after_parse_args): Handle ase_virt field.
    (s_mipsset): Handle "virt" and "novirt".
    (mips_elf_final_processing): Add a comment about virt ASE might need a new flag.
    (md_show_usage): Print out the usage of -mvirt and mno-virt options.
    * doc/c-mips.texi: Document -mvirt and -mno-virt.
    Document ".set virt" and ".set novirt".
    
    gas/testsuite/ChangeLog:
    * gas/mips/mips.exp: Run virt and virt64 testcases.
    * gas/mips/virt.d: New file.
    * gas/mips/virt.s: New file.
    * gas/mips/virt64.d: New file.
    * gas/mips/virt64.s: New file.
    
    include/opcode/ChangeLog:
    * mips.h (OP_MASK_CODE10): Correct definition.
    (OP_SH_CODE10): Likewise.
    Add a comment that "+J" is used now for OP_*CODE10.
    (INSN_ASE_MASK): Update.
    (INSN_VIRT): New macro.
    (INSN_VIRT64): New macro
    
    opcodes/ChangeLog:
    * mips-dis.c (mips_arch_choices): Add INSN_VIRT to mips32r2 .
    Add INSN_VIRT and INSN_VIRT64 to mips64r2.
    (parse_mips_dis_option): Handle the virt option.
    (print_insn_args): Handle "+J".
    (print_mips_disassembler_options): Print out message about virt64.
    * mips-opc.c (IVIRT): New define.
    (IVIRT64): New define.
    (mips_builtin_opcodes): Add dmfgc0, dmtgc0, hypcall, mfgc0, mtgc0,
    tlbgr, tlbgwi, tlbginv, tlbginvf, tlbgwr, tlbgp VIRT instructions.
    Move rfe to the bottom as it conflicts with tlbgp.

commit b55209d9a23dfc4e2f563a0b6bdd674f18d908d5
Author: Alan Modra <amodra@bigpond.net.au>
Date:   Fri May 10 00:00:05 2013 +0000

    daily update

commit c7c855256383b1c3fd1e34704e19e462c603f25b
Author: gdbadmin <gdbadmin@sourceware.org>
Date:   Fri May 10 00:00:02 2013 +0000

    *** empty log message ***

commit 271c6e6cca0e1a275fc9300f004cd51dc1b5433d
Author: Doug Evans <dje@google.com>
Date:   Thu May 9 18:03:27 2013 +0000

    	* symfile.c (syms_from_objfile_1): Delete args offsets, num_offsets.
    	All callers updated.
    	(syms_from_objfile): Ditto.  Make static.
    	(symbol_file_add_with_addrs): Renamed from
    	symbol_file_add_with_addrs_or_offsets.  Delete args offsets,
    	num_offsets.  All callers updated.
    	* symfile.h (syms_from_objfile): Delete.

commit d0dde44e0059b3fbfd55efaf87116ee382d775b4
Author: Doug Evans <dje@google.com>
Date:   Thu May 9 17:24:55 2013 +0000

    	* symfile.c (decrement_reading_symtab): Add assert.
    	(increment_reading_symtab): Ditto.

commit f90721b0b87078b4aa45d6df174533643536ee56
Author: Phil Muldoon <pmuldoon@redhat.com>
Date:   Thu May 9 13:37:51 2013 +0100

    Do not raise an error on tuple mismatch, just print

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

Summary of changes:
 bfd/ChangeLog                               |   24 ++-
 bfd/bfd.c                                   |    4 +-
 bfd/elflink.c                               |   17 +-
 bfd/version.h                               |    2 +-
 gdb/ChangeLog                               |   24 ++
 gdb/psymtab.c                               |   16 +-
 gdb/python/lib/gdb/command/frame_filters.py |   15 +-
 gdb/source.c                                |    8 +-
 gdb/symfile.c                               |   79 ++-----
 gdb/symfile.h                               |    6 +-
 gdb/testsuite/ChangeLog                     |   20 ++
 gdb/testsuite/gdb.base/solib-search.exp     |    4 +-
 gdb/testsuite/gdb.trace/circ.exp            |  363 ++++++++++++++++-----------
 gdb/version.in                              |    2 +-
 include/opcode/ChangeLog                    |    9 +
 include/opcode/mips.h                       |   17 +-
 libiberty/ChangeLog                         |    8 +
 libiberty/hashtab.c                         |   13 +-
 opcodes/ChangeLog                           |   18 ++
 opcodes/mips-dis.c                          |   19 ++-
 opcodes/mips-opc.c                          |   26 ++-
 opcodes/ppc-opc.c                           |    9 +-
 22 files changed, 436 insertions(+), 267 deletions(-)

First 500 lines of diff:
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a670a24..e680c3a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,13 @@
+2013-05-09  Joel Brobecker  <brobecker@adacore.com>
+
+	* bfd.c (_bfd_default_error_handler): Replace use of putc
+	by fputc.  Add comment explaining why.
+
+2013-05-09  Alan Modra  <amodra@gmail.com>
+
+	* elflink.c (elf_link_add_object_symbols): Don't omit reading
+	of symbols when hashes already exist.
+
 2013-05-07  Will Newton  <will.newton@linaro.org>
 
 	* elf-ifunc.c (_bfd_elf_allocate_ifunc_dyn_relocs): Add a
@@ -10,18 +20,18 @@
 
 2013-05-07  Will Newton  <will.newton@linaro.org>
 
-        * elf-ifunc.c (_bfd_elf_create_ifunc_dyn_reloc): Remove unused
+	* elf-ifunc.c (_bfd_elf_create_ifunc_dyn_reloc): Remove unused
 	function.
 	* elf-bfd.h: Likewise.
 
 2013-05-06  Paul Brook  <paul@codesourcery.com>
 
-        * elf64-mips.c (elf_mips_gnu_pcrel32): New.
-        (bfd_elf64_bfd_reloc_type_lookup, bfd_elf64_bfd_reloc_name_lookup,
-        mips_elf64_rtype_to_howto): Handle R_MIPS_PC32.
-        * elfn32-mips.c (elf_mips_gnu_pcrel32): New.
-        (bfd_elfn32_bfd_reloc_type_lookup, bfd_elfn32_bfd_reloc_name_lookup,
-        mips_elfn32_rtype_to_howto): Handle R_MIPS_PC32.
+	* elf64-mips.c (elf_mips_gnu_pcrel32): New.
+	(bfd_elf64_bfd_reloc_type_lookup, bfd_elf64_bfd_reloc_name_lookup,
+	mips_elf64_rtype_to_howto): Handle R_MIPS_PC32.
+	* elfn32-mips.c (elf_mips_gnu_pcrel32): New.
+	(bfd_elfn32_bfd_reloc_type_lookup, bfd_elfn32_bfd_reloc_name_lookup,
+	mips_elfn32_rtype_to_howto): Handle R_MIPS_PC32.
 
 2013-05-06  Alan Modra  <amodra@gmail.com>
 
diff --git a/bfd/bfd.c b/bfd/bfd.c
index 10bc319..8d0580c 100644
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -733,7 +733,9 @@ _bfd_default_error_handler (const char *fmt, ...)
   vfprintf (stderr, new_fmt, ap);
   va_end (ap);
 
-  putc ('\n', stderr);
+  /* On AIX, putc is implemented as a macro that triggers a -Wunused-value
+     warning, so use the fputc function to avoid it.  */
+  fputc ('\n', stderr);
   fflush (stderr);
 }
 
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 43c54fc..34bbcd5 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -3699,20 +3699,23 @@ error_free_dyn:
     }
 
   sym_hash = elf_sym_hashes (abfd);
-  if (sym_hash == NULL && extsymcount != 0)
+  if (extsymcount != 0)
     {
       isymbuf = bfd_elf_get_elf_syms (abfd, hdr, extsymcount, extsymoff,
 				      NULL, NULL, NULL);
       if (isymbuf == NULL)
 	goto error_return;
 
-      /* We store a pointer to the hash table entry for each external
-	 symbol.  */
-      amt = extsymcount * sizeof (struct elf_link_hash_entry *);
-      sym_hash = (struct elf_link_hash_entry **) bfd_zalloc (abfd, amt);
       if (sym_hash == NULL)
-	goto error_free_sym;
-      elf_sym_hashes (abfd) = sym_hash;
+	{
+	  /* We store a pointer to the hash table entry for each
+	     external symbol.  */
+	  amt = extsymcount * sizeof (struct elf_link_hash_entry *);
+	  sym_hash = (struct elf_link_hash_entry **) bfd_zalloc (abfd, amt);
+	  if (sym_hash == NULL)
+	    goto error_free_sym;
+	  elf_sym_hashes (abfd) = sym_hash;
+	}
     }
 
   if (dynamic)
diff --git a/bfd/version.h b/bfd/version.h
index 2634437..fe85ccd 100644
--- a/bfd/version.h
+++ b/bfd/version.h
@@ -1,4 +1,4 @@
-#define BFD_VERSION_DATE 20130508
+#define BFD_VERSION_DATE 20130510
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 62cc127..c3399ba 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,27 @@
+2013-05-09  Doug Evans  <dje@google.com>
+
+	* symfile.c (syms_from_objfile_1): Delete args offsets, num_offsets.
+	All callers updated.
+	(syms_from_objfile): Ditto.  Make static.
+	(symbol_file_add_with_addrs): Renamed from
+	symbol_file_add_with_addrs_or_offsets.  Delete args offsets,
+	num_offsets.  All callers updated.
+	* symfile.h (syms_from_objfile): Delete.
+
+	* symfile.c (decrement_reading_symtab): Add assert.
+	(increment_reading_symtab): Ditto.
+
+2013-05-09  Joel Brobecker  <brobecker@adacore.com>
+
+	* source.c (forward_search_command): Replace call to getc
+	by call to fgetc.
+	(reverse_search_command): Likewise.
+
+2013-05-08  Doug Evans  <dje@google.com>
+
+	* psymtab.c (expand_symtabs_matching_via_partial): Fix file name
+	matching test.
+
 2013-05-08  Joel Brobecker  <brobecker@adacore.com>
 
 	* sol-thread.c (info_cb): Factorize the code a little.
diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index 878bd82..3a1b993 100644
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -1400,15 +1400,21 @@ expand_symtabs_matching_via_partial
 
       if (file_matcher)
 	{
+	  int match;
+
 	  if (ps->anonymous)
 	    continue;
 
-	  /* Before we invoke realpath, which can get expensive when many
-	     files are involved, do a quick comparison of the basenames.  */
-	  if (!(*file_matcher) (ps->filename, data, 0)
-	      && (basenames_may_differ
+	  match = (*file_matcher) (ps->filename, data, 0);
+	  if (!match)
+	    {
+	      /* Before we invoke realpath, which can get expensive when many
+		 files are involved, do a quick comparison of the basenames.  */
+	      if (basenames_may_differ
 		  || (*file_matcher) (lbasename (ps->filename), data, 1))
-	      && !(*file_matcher) (psymtab_to_fullname (ps), data, 0))
+		match = (*file_matcher) (psymtab_to_fullname (ps), data, 0);
+	    }
+	  if (!match)
 	    continue;
 	}
 
diff --git a/gdb/python/lib/gdb/command/frame_filters.py b/gdb/python/lib/gdb/command/frame_filters.py
index e1800f6..1b73059 100644
--- a/gdb/python/lib/gdb/command/frame_filters.py
+++ b/gdb/python/lib/gdb/command/frame_filters.py
@@ -317,8 +317,9 @@ class SetFrameFilterPriority(gdb.Command):
         argv = gdb.string_to_argv(arg);
         argc = len(argv)
         if argc != 3:
-            raise gdb.GdbError("set frame-filter priority " \
-                               "takes exactly three arguments.")
+            print("set frame-filter priority " \
+                  "takes exactly three arguments.")
+            return None
 
         return argv
 
@@ -357,7 +358,8 @@ class SetFrameFilterPriority(gdb.Command):
 
     def invoke(self, arg, from_tty):
         command_tuple = self._parse_pri_arg(arg)
-        self._set_filter_priority(command_tuple)
+        if command_tuple != None:
+            self._set_filter_priority(command_tuple)
 
 class ShowFrameFilterPriority(gdb.Command):
     """GDB command to show the priority of the specified frame-filter.
@@ -395,8 +397,9 @@ class ShowFrameFilterPriority(gdb.Command):
         argv = gdb.string_to_argv(arg);
         argc = len(argv)
         if argc != 2:
-            raise gdb.GdbError("show frame-filter priority " \
-                               "takes exactly two arguments.")
+            print("show frame-filter priority " \
+                  "takes exactly two arguments.")
+            return None
 
         return argv
 
@@ -436,6 +439,8 @@ class ShowFrameFilterPriority(gdb.Command):
 
     def invoke(self, arg, from_tty):
         command_tuple = self._parse_pri_arg(arg)
+        if command_tuple == None:
+            return
         filter_name = command_tuple[1]
         list_name = command_tuple[0]
         try:
diff --git a/gdb/source.c b/gdb/source.c
index d816c9e..710b90c 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1613,7 +1613,7 @@ forward_search_command (char *regex, int from_tty)
       buf = xmalloc (cursize);
       p = buf;
 
-      c = getc (stream);
+      c = fgetc (stream);
       if (c == EOF)
 	break;
       do
@@ -1627,7 +1627,7 @@ forward_search_command (char *regex, int from_tty)
 	      cursize = newsize;
 	    }
 	}
-      while (c != '\n' && (c = getc (stream)) >= 0);
+      while (c != '\n' && (c = fgetc (stream)) >= 0);
 
       /* Remove the \r, if any, at the end of the line, otherwise
          regular expressions that end with $ or \n won't work.  */
@@ -1698,14 +1698,14 @@ reverse_search_command (char *regex, int from_tty)
       char buf[4096];		/* Should be reasonable???  */
       char *p = buf;
 
-      c = getc (stream);
+      c = fgetc (stream);
       if (c == EOF)
 	break;
       do
 	{
 	  *p++ = c;
 	}
-      while (c != '\n' && (c = getc (stream)) >= 0);
+      while (c != '\n' && (c = fgetc (stream)) >= 0);
 
       /* Remove the \r, if any, at the end of the line, otherwise
          regular expressions that end with $ or \n won't work.  */
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 32d6ad0..e9609b2 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -160,6 +160,7 @@ static void
 decrement_reading_symtab (void *dummy)
 {
   currently_reading_symtab--;
+  gdb_assert (currently_reading_symtab >= 0);
 }
 
 /* Increment currently_reading_symtab and return a cleanup that can be
@@ -169,6 +170,7 @@ struct cleanup *
 increment_reading_symtab (void)
 {
   ++currently_reading_symtab;
+  gdb_assert (currently_reading_symtab > 0);
   return make_cleanup (decrement_reading_symtab, NULL);
 }
 
@@ -913,17 +915,6 @@ init_entry_point_info (struct objfile *objfile)
    into an offset from the section VMA's as it appears in the object
    file, and then call the file's sym_offsets function to convert this
    into a format-specific offset table --- a `struct section_offsets'.
-   If ADDRS is non-zero, OFFSETS must be zero.
-
-   OFFSETS is a table of section offsets already in the right
-   format-specific representation.  NUM_OFFSETS is the number of
-   elements present in OFFSETS->offsets.  If OFFSETS is non-zero, we
-   assume this is the proper table the call to sym_offsets described
-   above would produce.  Instead of calling sym_offsets, we just dump
-   it right into objfile->section_offsets.  (When we're re-reading
-   symbols from an objfile, we don't have the original load address
-   list any more; all we have is the section offset table.)  If
-   OFFSETS is non-zero, ADDRS must be zero.
 
    ADD_FLAGS encodes verbosity level, whether this is main symbol or
    an extra symbol file such as dynamically loaded code, and wether
@@ -932,16 +923,12 @@ init_entry_point_info (struct objfile *objfile)
 static void
 syms_from_objfile_1 (struct objfile *objfile,
 		     struct section_addr_info *addrs,
-		     const struct section_offsets *offsets,
-		     int num_offsets,
 		     int add_flags)
 {
   struct section_addr_info *local_addr = NULL;
   struct cleanup *old_chain;
   const int mainline = add_flags & SYMFILE_MAINLINE;
 
-  gdb_assert (! (addrs && offsets));
-
   objfile->sf = find_sym_fns (objfile->obfd);
 
   if (objfile->sf == NULL)
@@ -962,18 +949,16 @@ syms_from_objfile_1 (struct objfile *objfile,
      if an error occurs during symbol reading.  */
   old_chain = make_cleanup_free_objfile (objfile);
 
-  /* If ADDRS and OFFSETS are both NULL, put together a dummy address
-     list.  We now establish the convention that an addr of zero means
+  /* If ADDRS is NULL, put together a dummy address list.
+     We now establish the convention that an addr of zero means
      no load address was specified.  */
-  if (! addrs && ! offsets)
+  if (! addrs)
     {
       local_addr = alloc_section_addr_info (1);
       make_cleanup (xfree, local_addr);
       addrs = local_addr;
     }
 
-  /* Now either addrs or offsets is non-zero.  */
-
   if (mainline)
     {
       /* We will modify the main symbol table, make sure that all its users
@@ -1002,7 +987,7 @@ syms_from_objfile_1 (struct objfile *objfile,
 
      We no longer warn if the lowest section is not a text segment (as
      happens for the PA64 port.  */
-  if (addrs && addrs->num_sections > 0)
+  if (addrs->num_sections > 0)
     addr_info_make_relative (addrs, objfile->obfd);
 
   /* Initialize symbol reading routines for this objfile, allow complaints to
@@ -1012,21 +997,7 @@ syms_from_objfile_1 (struct objfile *objfile,
   (*objfile->sf->sym_init) (objfile);
   clear_complaints (&symfile_complaints, 1, add_flags & SYMFILE_VERBOSE);
 
-  if (addrs)
-    (*objfile->sf->sym_offsets) (objfile, addrs);
-  else
-    {
-      size_t size = SIZEOF_N_SECTION_OFFSETS (num_offsets);
-
-      /* Just copy in the offset table directly as given to us.  */
-      objfile->num_sections = num_offsets;
-      objfile->section_offsets
-        = ((struct section_offsets *)
-           obstack_alloc (&objfile->objfile_obstack, size));
-      memcpy (objfile->section_offsets, offsets, size);
-
-      init_objfile_sect_indices (objfile);
-    }
+  (*objfile->sf->sym_offsets) (objfile, addrs);
 
   read_symbols (objfile, add_flags);
 
@@ -1039,14 +1010,12 @@ syms_from_objfile_1 (struct objfile *objfile,
 /* Same as syms_from_objfile_1, but also initializes the objfile
    entry-point info.  */
 
-void
+static void
 syms_from_objfile (struct objfile *objfile,
 		   struct section_addr_info *addrs,
-		   const struct section_offsets *offsets,
-		   int num_offsets,
 		   int add_flags)
 {
-  syms_from_objfile_1 (objfile, addrs, offsets, num_offsets, add_flags);
+  syms_from_objfile_1 (objfile, addrs, add_flags);
   init_entry_point_info (objfile);
 }
 
@@ -1085,8 +1054,7 @@ new_symfile_objfile (struct objfile *objfile, int add_flags)
    ADD_FLAGS encodes verbosity, whether this is main symbol file or
    extra, such as dynamically loaded code, and what to do with breakpoins.
 
-   ADDRS, OFFSETS, and NUM_OFFSETS are as described for
-   syms_from_objfile, above.
+   ADDRS is as described for syms_from_objfile_1, above.
    ADDRS is ignored when SYMFILE_MAINLINE bit is set in ADD_FLAGS.
 
    PARENT is the original objfile if ABFD is a separate debug info file.
@@ -1096,12 +1064,9 @@ new_symfile_objfile (struct objfile *objfile, int add_flags)
    Upon failure, jumps back to command level (never returns).  */
 
 static struct objfile *
-symbol_file_add_with_addrs_or_offsets (bfd *abfd,
-                                       int add_flags,
-                                       struct section_addr_info *addrs,
-                                       const struct section_offsets *offsets,
-                                       int num_offsets,
-                                       int flags, struct objfile *parent)
+symbol_file_add_with_addrs (bfd *abfd, int add_flags,
+			    struct section_addr_info *addrs,
+			    int flags, struct objfile *parent)
 {
   struct objfile *objfile;
   const char *name = bfd_get_filename (abfd);
@@ -1145,8 +1110,7 @@ symbol_file_add_with_addrs_or_offsets (bfd *abfd,
 	  gdb_flush (gdb_stdout);
 	}
     }
-  syms_from_objfile (objfile, addrs, offsets, num_offsets,
-		     add_flags);
+  syms_from_objfile (objfile, addrs, add_flags);
 
   /* We now have at least a partial symbol table.  Check to see if the
      user requested that all symbols be read on initial access via either
@@ -1215,9 +1179,8 @@ symbol_file_add_separate (bfd *bfd, int symfile_flags, struct objfile *objfile)
   sap = build_section_addr_info_from_objfile (objfile);
   my_cleanup = make_cleanup_free_section_addr_info (sap);
 
-  new_objfile = symbol_file_add_with_addrs_or_offsets
-    (bfd, symfile_flags,
-     sap, NULL, 0,
+  new_objfile = symbol_file_add_with_addrs
+    (bfd, symfile_flags, sap,
      objfile->flags & (OBJF_REORDERED | OBJF_SHARED | OBJF_READNOW
 		       | OBJF_USERLOADED),
      objfile);
@@ -1227,22 +1190,18 @@ symbol_file_add_separate (bfd *bfd, int symfile_flags, struct objfile *objfile)
 
 /* Process the symbol file ABFD, as either the main file or as a
    dynamically loaded file.
-
-   See symbol_file_add_with_addrs_or_offsets's comments for
-   details.  */
+   See symbol_file_add_with_addrs's comments for details.  */
 
 struct objfile *
 symbol_file_add_from_bfd (bfd *abfd, int add_flags,
                           struct section_addr_info *addrs,
                           int flags, struct objfile *parent)
 {
-  return symbol_file_add_with_addrs_or_offsets (abfd, add_flags, addrs, 0, 0,
-                                                flags, parent);
+  return symbol_file_add_with_addrs (abfd, add_flags, addrs, flags, parent);
 }
 
 /* Process a symbol file, as either the main file or as a dynamically
-   loaded file.  See symbol_file_add_with_addrs_or_offsets's comments
-   for details.  */
+   loaded file.  See symbol_file_add_with_addrs's comments for details.  */
 
 struct objfile *
 symbol_file_add (char *name, int add_flags, struct section_addr_info *addrs,
diff --git a/gdb/symfile.h b/gdb/symfile.h
index 85535f1..c0e367d 100644
--- a/gdb/symfile.h
+++ b/gdb/symfile.h
@@ -453,7 +453,7 @@ extern struct symtab *allocate_symtab (const char *, struct objfile *)
 extern void add_symtab_fns (const struct sym_fns *);
 
 /* This enum encodes bit-flags passed as ADD_FLAGS parameter to
-   syms_from_objfile, symbol_file_add, etc.  */
+   symbol_file_add, etc.  */
 
 enum symfile_add_flags
   {
@@ -472,10 +472,6 @@ enum symfile_add_flags
     SYMFILE_NO_READ = 1 << 4
   };
 
-extern void syms_from_objfile (struct objfile *,
-			       struct section_addr_info *,
-			       const struct section_offsets *, int, int);
-
 extern void new_symfile_objfile (struct objfile *, int);
 
 extern struct objfile *symbol_file_add (char *, int,
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5ca6bff..d01aa9e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,23 @@
+2013-05-08  Tom Tromey  <tromey@redhat.com>
+
+	* gdb.base/solib-search.exp: Set test name for "set
+	solib-search-path" test.
+
+2013-05-08  Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+	* gdb.trace/circ.exp: Remove unnecessary 'if then' checks.
+	(set_a_tracepoint): Set tracepoint before prologue.
+	(run_trace_experiment): Test setup_tracepoints and 'break end'
+	in it.
+	(trace_buffer_normal): Remove.
+	(gdb_trace_circular_tests): Remove.  Move tests to...
+	(top level): ...here.  Call 'runto_main' before checking for
+	trace support.  Use commands to check the support for circular
+	trace buffer and changing of trace buffer size.  Add test
+	to calculate size of single frame.  Use this size to
+	calculate the size of trace buffer.  Use 'tfind pc func9'


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