Do not do XCOFF hoooks for ELF systems

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 330853b01f29e080f16bc7c7e4f32b4a4c512b4a..85ff4237504b9123ecc56c2e25aaabd940d67c14 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Mon May  6 07:52:48 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+       * rs6000-tdep.c (_initialize_rs6000_tdep): Don't do XCOFF specific
+       hooks under ELF.
+
+       * config/powerpc/tm-ppc-eabi.h: Define ELF_OBJECT_FORMAT.
+
 start-sanitize-gdbtk
 Thu May  2 19:17:49 1996  Stan Shebs  <shebs@andros.cygnus.com>
 

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index f2acdf6bc4954344fb8d04c00178d7469e249b95..85b01e34d126b63c996f9166cd2b59691173016d 100644 (file)
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -1,5 +1,5 @@
 /* Target-dependent code for GDB, the GNU debugger.
-   Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995
+   Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1996
    Free Software Foundation, Inc.
 
 This file is part of GDB.
@@ -1268,20 +1268,21 @@ gdb_print_insn_powerpc (memaddr, info)
 void
 _initialize_rs6000_tdep ()
 {
-  /* Initialize hook in xcoffread for recording the toc offset value
-     of a symbol table into the ldinfo structure, for native rs6000
-     config. */
+#ifndef ELF_OBJECT_FORMAT
   {
     extern void (*xcoff_add_toc_to_loadinfo_hook) PARAMS ((unsigned long));
+    extern void (*xcoff_init_loadinfo_hook) PARAMS ((void));
+
+    /* Initialize hook in xcoffread for recording the toc offset value
+       of a symbol table into the ldinfo structure, for native rs6000
+       config. */
     xcoff_add_toc_to_loadinfo_hook = &xcoff_add_toc_to_loadinfo;
-  }
 
-  /* Initialize hook in xcoffread for calling xcoff_init_loadinfo in
-     a native rs6000 config. */
-  {
-    extern void (*xcoff_init_loadinfo_hook) PARAMS ((void));
+    /* Initialize hook in xcoffread for calling xcoff_init_loadinfo in
+       a native rs6000 config. */
     xcoff_init_loadinfo_hook = &xcoff_init_loadinfo;
   }
+#endif /* ELF_OBJECT_FORMAT */
 
   /* FIXME, this should not be decided via ifdef. */
 #ifdef GDB_TARGET_POWERPC