[SCM] archer-keiths-linespec-rewrite: Merge remote-tracking branch 'gdb/master' into archer-keiths-linespec-rewrite

[kseitz@sourceware.org]

The branch, archer-keiths-linespec-rewrite has been updated
       via  d14a86c4c46eb6f5ddcb2ee83b2cd4f5b50f7267 (commit)
       via  b7522666365970695d1948f80faaa5cff93ee4a9 (commit)
       via  d2b433de6faa61355736bc72318f929fd4ca98f5 (commit)
       via  c7412c9f6c1bdbbb8e4fcc20313994cc243accec (commit)
      from  833a899be8b7e037bdf9f341ef31fc98a04532ee (commit)

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

- Log -----------------------------------------------------------------
commit d14a86c4c46eb6f5ddcb2ee83b2cd4f5b50f7267
Merge: 833a899 b752266
Author: keiths <keiths@redhat.com>
Date:   Tue Mar 13 14:22:20 2012 -0700

    Merge remote-tracking branch 'gdb/master' into archer-keiths-linespec-rewrite

commit b7522666365970695d1948f80faaa5cff93ee4a9
Author: Doug Evans <dje@google.com>
Date:   Tue Mar 13 17:16:18 2012 +0000

    	* dwarf2read.c (load_partial_comp_unit): Defer adding cu to
    	read_in_chain until we have successfully read it in.
    	(load_full_comp_unit): Ditto.
    	(read_signatured_type): Add comment.

commit d2b433de6faa61355736bc72318f929fd4ca98f5
Author: Joel Brobecker <brobecker@gnat.com>
Date:   Tue Mar 13 16:29:15 2012 +0000

    [stabs] The address of Fortran common blocks may be > INT_MAX.
    
    gdb/
    2012-03-08  Chris January  <chris.january@allinea.com>
    
            * stabsread.c (fix_common_block): Change type of valu argument
            to CORE_ADDR.

commit c7412c9f6c1bdbbb8e4fcc20313994cc243accec
Author: Joel Brobecker <brobecker@gnat.com>
Date:   Tue Mar 13 16:15:35 2012 +0000

    [ppc/prologue] Support the "oril r29, r1, 0x0" insn.
    
    gdb/
    2012-03-13  Chris January  <chris.january@allinea.com>
    
    	* rs6000-tdep.c (skip_prologue): Support the oril r29, r1, 0x0
    	instruction.

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

Summary of changes:
 gdb/ChangeLog     |   17 +++++++++++++++++
 gdb/dwarf2read.c  |   17 +++++++++--------
 gdb/rs6000-tdep.c |    9 +++++++++
 gdb/stabsread.c   |    4 ++--
 4 files changed, 37 insertions(+), 10 deletions(-)

First 500 lines of diff:
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8e466c8..0db4a16 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,20 @@
+2012-03-13  Doug Evans  <dje@google.com>
+
+	* dwarf2read.c (load_partial_comp_unit): Defer adding cu to
+	read_in_chain until we have successfully read it in.
+	(load_full_comp_unit): Ditto.
+	(read_signatured_type): Add comment.
+
+2012-03-13  Chris January  <chris.january@allinea.com>
+
+	* stabsread.c (fix_common_block): Change type of valu argument
+	to CORE_ADDR.
+
+2012-03-13  Chris January  <chris.january@allinea.com>
+
+	* rs6000-tdep.c (skip_prologue): Support the oril r29, r1, 0x0
+	instruction.
+
 2012-03-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* common/linux-procfs.c (linux_proc_get_int): New, from
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index ebe855b..807d36d 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -3686,10 +3686,6 @@ load_partial_comp_unit (struct dwarf2_per_cu_data *this_cu)
 	  do_cleanups (free_cu_cleanup);
 	  return;
 	}
-
-      /* Link this CU into read_in_chain.  */
-      this_cu->cu->read_in_chain = dwarf2_per_objfile->read_in_chain;
-      dwarf2_per_objfile->read_in_chain = this_cu;
     }
   else
     {
@@ -3722,6 +3718,10 @@ load_partial_comp_unit (struct dwarf2_per_cu_data *this_cu)
       /* We've successfully allocated this compilation unit.  Let our
 	 caller clean it up when finished with it.  */
       discard_cleanups (free_cu_cleanup);
+
+      /* Link this CU into read_in_chain.  */
+      this_cu->cu->read_in_chain = dwarf2_per_objfile->read_in_chain;
+      dwarf2_per_objfile->read_in_chain = this_cu;
     }
 }
 
@@ -4700,10 +4700,6 @@ load_full_comp_unit (struct dwarf2_per_cu_data *per_cu)
       /* Complete the cu_header.  */
       cu->header.offset = offset;
       cu->header.first_die_offset = info_ptr - beg_of_comp_unit;
-
-      /* Link this CU into read_in_chain.  */
-      per_cu->cu->read_in_chain = dwarf2_per_objfile->read_in_chain;
-      dwarf2_per_objfile->read_in_chain = per_cu;
     }
   else
     {
@@ -4730,6 +4726,10 @@ load_full_comp_unit (struct dwarf2_per_cu_data *per_cu)
       /* We've successfully allocated this compilation unit.  Let our
 	 caller clean it up when finished with it.  */
       discard_cleanups (free_cu_cleanup);
+
+      /* Link this CU into read_in_chain.  */
+      per_cu->cu->read_in_chain = dwarf2_per_objfile->read_in_chain;
+      dwarf2_per_objfile->read_in_chain = per_cu;
     }
 }
 
@@ -14445,6 +14445,7 @@ read_signatured_type (struct signatured_type *type_sig)
      clean it up when finished with it.	 */
   discard_cleanups (free_cu_cleanup);
 
+  /* Link this TU into read_in_chain.  */
   type_sig->per_cu.cu->read_in_chain = dwarf2_per_objfile->read_in_chain;
   dwarf2_per_objfile->read_in_chain = &type_sig->per_cu;
 }
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index a8ff777..2b1a0a5 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -1822,6 +1822,15 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc,
 
 	  /* Set up frame pointer */
 	}
+      else if (op == 0x603d0000)       /* oril r29, r1, 0x0 */
+	{
+	  fdata->frameless = 0;
+	  framep = 1;
+	  fdata->alloca_reg = (tdep->ppc_gp0_regnum + 29);
+	  continue;
+
+	  /* Another way to set up the frame pointer.  */
+	}
       else if (op == 0x603f0000	/* oril r31, r1, 0x0 */
 	       || op == 0x7c3f0b78)
 	{			/* mr r31, r1 */
diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index afcfe06..ac82652 100644
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -98,7 +98,7 @@ static void
 patch_block_stabs (struct pending *, struct pending_stabs *,
 		   struct objfile *);
 
-static void fix_common_block (struct symbol *, int);
+static void fix_common_block (struct symbol *, CORE_ADDR);
 
 static int read_type_number (char **, int *);
 
@@ -4397,7 +4397,7 @@ common_block_end (struct objfile *objfile)
    the common block name).  */
 
 static void
-fix_common_block (struct symbol *sym, int valu)
+fix_common_block (struct symbol *sym, CORE_ADDR valu)
 {
   struct pending *next = (struct pending *) SYMBOL_TYPE (sym);
 


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