[SCM] archer-rmoseley-demo-merge: Commit some merge errors Tom found.

[rmoseley@sourceware.org]

The branch, archer-rmoseley-demo-merge has been updated
       via  dc61f59d9432db7b1edcc9f26e893304af909d19 (commit)
      from  59fff21d925af72b65cbf267bbaaeb0c4185e8e7 (commit)

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

- Log -----------------------------------------------------------------
commit dc61f59d9432db7b1edcc9f26e893304af909d19
Author: Rick Moseley <rmoseley@localhost.localdomain>
Date:   Tue Dec 23 07:58:45 2008 -0600

    Commit some merge errors Tom found.

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

Summary of changes:
 gdb/infcall.c  |   10 ----------
 gdb/objfiles.h |    9 ---------
 gdb/symfile.c  |    1 -
 3 files changed, 0 insertions(+), 20 deletions(-)

First 500 lines of diff:
diff --git a/gdb/infcall.c b/gdb/infcall.c
index 30473c0..e6464ee 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -756,16 +756,6 @@ call_function_by_hand (struct value *function, int nargs, struct value **args)
 The program being debugged exited while in a function called from GDB."));
     }
 
-  if (! target_has_execution)
-    {
-      /* If we try to restore the inferior status (via the cleanup),
-	 we'll crash as the inferior is no longer running.  */
-      discard_cleanups (inf_status_cleanup);
-      discard_inferior_status (inf_status);
-      error (_("\
-The program being debugged exited while in a function called from GDB."));
-    }
-
   if (stopped_by_random_signal || !stop_stack_dummy)
     {
       /* Find the name of the function we're about to complain about.  */
diff --git a/gdb/objfiles.h b/gdb/objfiles.h
index 3755d9b..9c2f51b 100644
--- a/gdb/objfiles.h
+++ b/gdb/objfiles.h
@@ -388,15 +388,6 @@ struct objfile
 
 /* Defines for the objfile flag word. */
 
-/* When using mapped/remapped predigested gdb symbol information, we need
-   a flag that indicates that we have previously done an initial symbol
-   table read from this particular objfile.  We can't just look for the
-   absence of any of the three symbol tables (msymbols, psymtab, symtab)
-   because if the file has no symbols for example, none of these will
-   exist. */
-
-#define OBJF_SYMS	(1 << 1)	/* Have tried to read symbols */
-
 /* When an object file has its functions reordered (currently Irix-5.2
    shared libraries exhibit this behaviour), we will need an expensive
    algorithm to locate a partial symtab or symtab via an address.
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 7c1cbae..871e43c 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -2443,7 +2443,6 @@ reread_symbols (void)
 		  wrap_here ("");
 		}
 
-	      objfile->flags |= OBJF_SYMS;
 	      objfile->flags &= ~OBJF_SYMTABS_READ;
 
 	      /* We're done reading the symbol file; finish off complaints.  */


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