* Makefile.in (objfiles_h): Add $(bcache_h).

* objfiles.h: Include "bcache.h".

* Makefile.in (symtab_h): Remove $(bcache_h).
* symtab.h: Do not include "bcache.h".

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 11f1ff8a4fa78ee247a408021f72bd134aef407c..a91540f3440dd737e657fbd0adc500c818200306 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-28  Andrew Cagney  <ac131313@redhat.com>
+
+       * Makefile.in (objfiles_h): Add $(bcache_h).
+       * objfiles.h: Include "bcache.h".
+
+       * Makefile.in (symtab_h): Remove $(bcache_h).
+       * symtab.h: Do not include "bcache.h".
+
 2002-06-28  David O'Brien  <obrien@FreeBSD.org>
 
        Merge from mainline:

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 3b31aed8870d4381564765813199e291500916a5..2df79bdc033608d073954a61b2146caf08c21bf8 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -624,7 +624,7 @@ language_h =        language.h
 linespec_h =   linespec.h
 memattr_h =     memattr.h
 monitor_h =    monitor.h
-objfiles_h =   objfiles.h
+objfiles_h =   objfiles.h $(bcache_h)
 parser_defs_h =        parser-defs.h $(doublest_h)
 regcache_h =   regcache.h
 remote_h =     remote.h
@@ -635,7 +635,7 @@ solist_h =  solist.h
 source_h =     source.h
 stabsread_h =  stabsread.h
 symfile_h =    symfile.h
-symtab_h =     symtab.h $(bcache_h)
+symtab_h =     symtab.h
 target_h =      target.h $(bfd_h) $(symtab_h) $(dcache_h) $(memattr_h)
 terminal_h =   terminal.h
 top_h =                top.h

diff --git a/gdb/objfiles.h b/gdb/objfiles.h
index 992ae71e47f2fdeaa1d17bfca0b75f4b2b68c9bc..d1746a970aca661d259777ac2fec62b3b1717ba0 100644 (file)
--- a/gdb/objfiles.h
+++ b/gdb/objfiles.h
@@ -22,6 +22,8 @@
 #if !defined (OBJFILES_H)
 #define OBJFILES_H
 
+#include "bcache.h"
+
 /* This structure maintains information on a per-objfile basis about the
    "entry point" of the objfile, and the scope within which the entry point
    exists.  It is possible that gdb will see more than one objfile that is

diff --git a/gdb/symtab.h b/gdb/symtab.h
index 75470e60f7550d100acf66e25323e1e1b78642e0..5c11e75cada4a898c528c6ddc190a091b61bc864 100644 (file)
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -28,7 +28,6 @@
 #include "obstack.h"
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free xfree
-#include "bcache.h"
 
 /* Don't do this; it means that if some .o's are compiled with GNU C
    and some are not (easy to do accidentally the way we configure