diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 51fa32e0d4..77ebfa0123 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-01  Andrew Cagney  <cagney@gnu.org>
+
+	* objfiles.h (struct entry_info): Delete fields main_func_lowpc
+	and main_func_highpc.
+	(INVALID_ENTRY_LOWPC, INVALID_ENTRY_HIGHPC): Delete macros.
+	* objfiles.c (init_entry_point_info, objfile_relocate): Update
+	* nlmread.c (nlm_symfile_read): Update.
+
 2004-09-01  Joel Brobecker  <brobecker@gnat.com>
 
 	* mips-tdep.c (linked_proc_desc_table): Delete, not used.
diff --git a/gdb/nlmread.c b/gdb/nlmread.c
index e75486e241..b2a6a35a2f 100644
--- a/gdb/nlmread.c
+++ b/gdb/nlmread.c
@@ -177,7 +177,6 @@ nlm_symfile_read (struct objfile *objfile, int mainline)
   bfd *abfd = objfile->obfd;
   struct cleanup *back_to;
   CORE_ADDR offset;
-  struct symbol *mainsym;
 
   init_minimal_symbol_collection ();
   back_to = make_cleanup_discard_minimal_symbols ();
@@ -199,16 +198,6 @@ nlm_symfile_read (struct objfile *objfile, int mainline)
 
   stabsect_build_psymtabs (objfile, mainline, ".stab",
 			   ".stabstr", ".text");
-
-  mainsym = lookup_symbol (main_name (), NULL, VAR_DOMAIN, NULL, NULL);
-
-  if (mainsym
-      && SYMBOL_CLASS (mainsym) == LOC_BLOCK)
-    {
-      objfile->ei.main_func_lowpc = BLOCK_START (SYMBOL_BLOCK_VALUE (mainsym));
-      objfile->ei.main_func_highpc = BLOCK_END (SYMBOL_BLOCK_VALUE (mainsym));
-    }
-
   /* FIXME:  We could locate and read the optional native debugging format
      here and add the symbols to the minimal symbol table. */
 }
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index cc6a1e1c71..69f61d4868 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -250,8 +250,6 @@ init_entry_point_info (struct objfile *objfile)
       /* Examination of non-executable.o files.  Short-circuit this stuff.  */
       objfile->ei.entry_point = INVALID_ENTRY_POINT;
     }
-  objfile->ei.main_func_lowpc = INVALID_ENTRY_LOWPC;
-  objfile->ei.main_func_highpc = INVALID_ENTRY_HIGHPC;
 }
 
 /* Get current entry point address.  */
@@ -647,12 +645,6 @@ objfile_relocate (struct objfile *objfile, struct section_offsets *new_offsets)
       }
   }
 
-  if (objfile->ei.main_func_lowpc != INVALID_ENTRY_LOWPC)
-    {
-      objfile->ei.main_func_lowpc += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
-      objfile->ei.main_func_highpc += ANOFFSET (delta, SECT_OFF_TEXT (objfile));
-    }
-
   /* Relocate breakpoints as necessary, after things are relocated. */
   breakpoint_re_set ();
 }
diff --git a/gdb/objfiles.h b/gdb/objfiles.h
index 29be972958..afbe8d26d3 100644
--- a/gdb/objfiles.h
+++ b/gdb/objfiles.h
@@ -110,20 +110,6 @@ struct entry_info
 
 #define INVALID_ENTRY_POINT (~0)	/* ~0 will not be in any file, we hope.  */
 
-    /* Start (inclusive) and end (exclusive) of the user code main() function. */
-
-    CORE_ADDR main_func_lowpc;
-    CORE_ADDR main_func_highpc;
-
-/* Use these values when any of the above ranges is invalid.  */
-
-/* We use these values because it guarantees that there is no number that is
-   both >= LOWPC && < HIGHPC.  It is also highly unlikely that 3 is a valid
-   module or function start address (as opposed to 0).  */
-
-#define INVALID_ENTRY_LOWPC (3)
-#define INVALID_ENTRY_HIGHPC (1)
-
   };
 
 /* Sections in an objfile.