Ongoing multi-arch conversion for HP/UX.

        * config/pa/tm-hppa.h (GDB_MULTI_ARCH): Set to 1. Do not define
        if already defined (allows hppa64 to stay non-multiarched for now).
        * config/pa/tm-hppa64.h (GDB_MULTI_ARCH): Define.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index eec6d3c7325e4f7d7870f102c550b18893890f4f..a93a4edc646b4441265bf9618f86cbada27eb329 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-21  J. Brobecker  <brobecker@gnat.com>
+
+       Ongoing multi-arch conversion for HP/UX.
+       * config/pa/tm-hppa.h (GDB_MULTI_ARCH): Set to 1. Do not define
+       if already defined (allows hppa64 to stay non-multiarched for now).
+       * config/pa/tm-hppa64.h (GDB_MULTI_ARCH): Define.
+
 2003-04-21  Andrew Cagney  <cagney@redhat.com>
 
        * frame.c (frame_id_eq): Fail when the code_addr's do not match.

diff --git a/gdb/config/pa/tm-hppa.h b/gdb/config/pa/tm-hppa.h
index c0b3e2630ea72a7b58a92cf09d3fc4468229e5cc..7d8d111b30bd26d6488ed39f11834936e84ece10 100644 (file)
--- a/gdb/config/pa/tm-hppa.h
+++ b/gdb/config/pa/tm-hppa.h
@@ -27,7 +27,9 @@
 /* Wonder if this is correct?  Should be using push_dummy_call().  */
 #define DEPRECATED_DUMMY_WRITE_SP(SP) generic_target_write_sp (SP)
 
-#define GDB_MULTI_ARCH 0
+#ifndef GDB_MULTI_ARCH
+#define GDB_MULTI_ARCH 1
+#endif
 
 /* NOTE: cagney/2002-11-24: This is a guess.  */
 #define DEPRECATED_USE_GENERIC_DUMMY_FRAMES 0

diff --git a/gdb/config/pa/tm-hppa64.h b/gdb/config/pa/tm-hppa64.h
index 503e42688dfa9244c73f9afcce49db50d1418ac6..b97cc3063dbd2ee0d6ed407b3daadd574bdff393 100644 (file)
--- a/gdb/config/pa/tm-hppa64.h
+++ b/gdb/config/pa/tm-hppa64.h
@@ -28,6 +28,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    gotten working yet.  */
 #define GDB_TARGET_IS_HPPA_20W
 
+/* FIXME: brobecker 2003-04-21: Although 32bit hppa is partially multiarched,
+   the conversion for hppa64 hasn't been completed yet.  */
+#define GDB_MULTI_ARCH 0
+
 #include "pa/tm-hppah.h"
 
 #define HPUX_1100 1