Index: symfile.h
===================================================================
RCS file: /cvs/src/src/gdb/symfile.h,v
retrieving revision 1.40
diff -u -p -r1.40 symfile.h
--- symfile.h	23 Aug 2007 18:08:42 -0000	1.40
+++ symfile.h	20 Sep 2007 21:07:30 -0000
@@ -157,6 +157,11 @@ struct sym_fns
 
   struct symfile_segment_data *(*sym_segments) (bfd *abfd);
 
+  /* This function should read the linetable from the objfile when
+     the line table cannot be read while processing the debugging
+     information.  */
+  void (*sym_read_linetable) (void);
+
   /* Finds the next struct sym_fns.  They are allocated and
      initialized in whatever module implements the functions pointed
      to; an initializer calls add_symtab_fns to add them to the global
Index: coffread.c
===================================================================
RCS file: /cvs/src/src/gdb/coffread.c,v
retrieving revision 1.74
diff -u -p -r1.74 coffread.c
--- coffread.c	23 Aug 2007 18:08:27 -0000	1.74
+++ coffread.c	20 Sep 2007 20:22:11 -0000
@@ -2100,6 +2100,7 @@ static struct sym_fns coff_sym_fns =
   default_symfile_offsets,	/* sym_offsets:  xlate external to internal form */
   default_symfile_segments,	/* sym_segments: Get segment information from
 				   a file.  */
+  NULL,                         /* sym_read_linetable  */
   NULL				/* next: pointer to next struct sym_fns */
 };
 
Index: dbxread.c
===================================================================
RCS file: /cvs/src/src/gdb/dbxread.c,v
retrieving revision 1.86
diff -u -p -r1.86 dbxread.c
--- dbxread.c	23 Aug 2007 18:08:28 -0000	1.86
+++ dbxread.c	20 Sep 2007 20:22:26 -0000
@@ -3513,6 +3513,7 @@ static struct sym_fns aout_sym_fns =
   default_symfile_offsets,	/* sym_offsets: parse user's offsets to internal form */
   default_symfile_segments,	/* sym_segments: Get segment information from
 				   a file.  */
+  NULL,                         /* sym_read_linetable */
   NULL				/* next: pointer to next struct sym_fns */
 };
 
Index: elfread.c
===================================================================
RCS file: /cvs/src/src/gdb/elfread.c,v
retrieving revision 1.62
diff -u -p -r1.62 elfread.c
--- elfread.c	23 Aug 2007 18:08:28 -0000	1.62
+++ elfread.c	20 Sep 2007 20:22:33 -0000
@@ -813,6 +813,7 @@ static struct sym_fns elf_sym_fns =
   default_symfile_offsets,	/* sym_offsets:  Translate ext. to int. relocation */
   elf_symfile_segments,		/* sym_segments: Get segment information from
 				   a file.  */
+  NULL,                         /* sym_read_linetable */
   NULL				/* next: pointer to next struct sym_fns */
 };
 
Index: mipsread.c
===================================================================
RCS file: /cvs/src/src/gdb/mipsread.c,v
retrieving revision 1.24
diff -u -p -r1.24 mipsread.c
--- mipsread.c	23 Aug 2007 18:08:36 -0000	1.24
+++ mipsread.c	20 Sep 2007 20:23:19 -0000
@@ -394,6 +394,7 @@ static struct sym_fns ecoff_sym_fns =
   default_symfile_offsets,	/* sym_offsets: dummy FIXME til implem sym reloc */
   default_symfile_segments,	/* sym_segments: Get segment information from
 				   a file.  */
+  NULL,                         /* sym_read_linetable */
   NULL				/* next: pointer to next struct sym_fns */
 };
 
Index: somread.c
===================================================================
RCS file: /cvs/src/src/gdb/somread.c,v
retrieving revision 1.37
diff -u -p -r1.37 somread.c
--- somread.c	23 Aug 2007 18:08:38 -0000	1.37
+++ somread.c	20 Sep 2007 20:23:42 -0000
@@ -438,6 +438,7 @@ static struct sym_fns som_sym_fns =
   som_symfile_offsets,		/* sym_offsets:  Translate ext. to int. relocation */
   default_symfile_segments,	/* sym_segments: Get segment information from
 				   a file.  */
+  NULL,                         /* sym_read_linetable */
   NULL				/* next: pointer to next struct sym_fns */
 };
 
Index: xcoffread.c
===================================================================
RCS file: /cvs/src/src/gdb/xcoffread.c,v
retrieving revision 1.54
diff -u -p -r1.54 xcoffread.c
--- xcoffread.c	23 Aug 2007 18:08:47 -0000	1.54
+++ xcoffread.c	20 Sep 2007 20:24:11 -0000
@@ -727,7 +727,7 @@ return_after_cleanup:
   memset (&main_subfile, '\0', sizeof (struct subfile));
 }
 
-void
+static void
 aix_process_linenos (void)
 {
   /* process line numbers and enter them into line vector */
@@ -3012,6 +3012,7 @@ static struct sym_fns xcoff_sym_fns =
   xcoff_symfile_offsets,	/* sym_offsets: xlate offsets ext->int form */
   default_symfile_segments,	/* sym_segments: Get segment information from
 				   a file.  */
+  aix_process_linenos,          /* sym_read_linetable */
   NULL				/* next: pointer to next struct sym_fns */
 };
 
Index: buildsym.c
===================================================================
RCS file: /cvs/src/src/gdb/buildsym.c,v
retrieving revision 1.50
diff -u -p -r1.50 buildsym.c
--- buildsym.c	23 Aug 2007 18:08:26 -0000	1.50
+++ buildsym.c	20 Sep 2007 20:22:08 -0000
@@ -933,10 +933,9 @@ end_symtab (CORE_ADDR end_addr, struct o
 			     &objfile->objfile_obstack);
     }
 
-#ifndef PROCESS_LINENUMBER_HOOK
-#define PROCESS_LINENUMBER_HOOK()
-#endif
-  PROCESS_LINENUMBER_HOOK ();	/* Needed for xcoff. */
+  /* Read the line table if it has to be read separately.  */
+  if (objfile->sf->sym_read_linetable != NULL)
+    objfile->sf->sym_read_linetable ();
 
   /* Now create the symtab objects proper, one for each subfile.  */
   /* (The main file is the last one on the chain.)  */
Index: config/powerpc/aix.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/powerpc/aix.mt,v
retrieving revision 1.9
diff -u -p -r1.9 aix.mt
--- config/powerpc/aix.mt	10 Feb 2006 20:56:15 -0000	1.9
+++ config/powerpc/aix.mt	20 Sep 2007 20:24:17 -0000
@@ -1,4 +1,3 @@
 # Target: PowerPC running AIX
 TDEPFILES= rs6000-tdep.o rs6000-aix-tdep.o \
            xcoffread.o ppc-sysv-tdep.o solib.o solib-svr4.o
-DEPRECATED_TM_FILE= config/rs6000/tm-rs6000.h