2000-05-17 Michael Snyder <msnyder@seadog.cygnus.com>

      * config/sparc/tm-sun4sol2.h: Turn on multi-arch.
      sparc-tdep.c (gdb_print_insn_sparc): Remove temporary multi-arch hack.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fd1f89dedee99cfec20c0f41f167fe01871291d5..ad852f7fed376f4861ae783f30193b7c2e514ce8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -53,6 +53,11 @@ Tue May 23 17:44:18 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
        * TODO: Update.
 
+2000-05-17  Michael Snyder  <msnyder@seadog.cygnus.com>
+
+       * config/sparc/tm-sun4sol2.h: Turn on multi-arch.
+       sparc-tdep.c (gdb_print_insn_sparc): Remove temporary multi-arch hack.
+
 2000-05-17  Andrew Cagney  <cagney@sourceware.cygnus.com>
 
        * GDB 5.0 released.
@@ -177,6 +182,7 @@ Mon May 22 11:46:01 2000  Andrew Cagney  <cagney@b1.cygnus.com>
        config/powerpc/tm-nbsd.h, config/powerpc/nm-nbsd.h,
        config/powerpc/xm-nbsd.h: New files.
 
+>>>>>>> 1.399
 2000-05-17  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * gdb/config/djgpp/README: Fine-tune installation instructions

diff --git a/gdb/config/sparc/tm-sun4sol2.h b/gdb/config/sparc/tm-sun4sol2.h
index dc487d42fafc07cd9731748166c2b5150a677546..eb76d1ccef05eeebafadbdb552414f5c6b3edae9 100644 (file)
--- a/gdb/config/sparc/tm-sun4sol2.h
+++ b/gdb/config/sparc/tm-sun4sol2.h
@@ -19,7 +19,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-/*#define GDB_MULTI_ARCH 2*/
+#define GDB_MULTI_ARCH 2
 
 #include "sparc/tm-sparc.h"
 #include "tm-sysv4.h"