Conditionally include solib.h.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 367df17..f7b7753 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-15  Kevin Buettner  <kevinb@redhat.com>
+
+       * config/rs6000/tm-rs6000.h (solib.h): Conditionally include.
+
 2001-12-15  Andrew Cagney  <ac131313@redhat.com>
 
        * gdbarch.c: Re-generate.

diff --git a/gdb/config/rs6000/tm-rs6000.h b/gdb/config/rs6000/tm-rs6000.h
index efd96e5..015a592 100644 (file)
--- a/gdb/config/rs6000/tm-rs6000.h
+++ b/gdb/config/rs6000/tm-rs6000.h
@@ -119,3 +119,10 @@ extern CORE_ADDR (*rs6000_find_toc_address_hook) (CORE_ADDR);
    child process. */
 
 extern void (*rs6000_set_host_arch_hook) (int);
+
+/* We need solib.h for building cross debuggers.  However, we don't want
+   to clobber any special solib support required by native debuggers, so
+   only include solib.h if SOLIB_ADD is not defined.  */
+#ifndef SOLIB_ADD
+#include "solib.h"
+#endif