From 52b5c2eb6cd9cbc9ceac18d23a6e44b27cf4e37c Mon Sep 17 00:00:00 2001
From: Kevin Buettner <kevinb@redhat.com>
Date: Sat, 3 Mar 2001 00:08:27 +0000
Subject: [PATCH] Move GDB_GREGSET_T, GDB_FPREGSET_T defines from
config/ia64/xm-aix.h to config/ia64/nm-aix.h.
---
gdb/ChangeLog | 8 ++++++++
gdb/config/ia64/nm-aix.h | 7 +++++--
gdb/config/ia64/xm-aix.h | 3 ---
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 70aba463151..7655fcb4195 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2001-03-02 Kevin Buettner <kevinb@redhat.com>
+
+ * config/ia64/xm-aix.h (GDB_GREGSET_T, GDB_FPREGSET_T): Move defines
+ from here...
+ * config/ia64/nm-aix.h (GDB_GREGSET_T, GDB_FPREGSET_T): ...to here.
+ (MONTEREY): Don't define.
+ (AIX5): Define.
+
2001-03-02 Matt Hiller <hiller@redhat.com>
* config/mn10300/tm-mn10300.h (E0_REGNUM): Correct to 15.
diff --git a/gdb/config/ia64/nm-aix.h b/gdb/config/ia64/nm-aix.h
index 4685aeaae37..893fe340341 100644
--- a/gdb/config/ia64/nm-aix.h
+++ b/gdb/config/ia64/nm-aix.h
@@ -23,12 +23,15 @@
#include "nm-sysv4.h"
-#ifndef MONTEREY
-#define MONTEREY 1
+#ifndef AIX5
+#define AIX5 1
#endif
/* Type of the operation code for sending control messages to the
/proc/PID/ctl file */
#define PROC_CTL_WORD_TYPE int
+#define GDB_GREGSET_T prgregset_t
+#define GDB_FPREGSET_T prfpregset_t
+
#endif /* #ifndef NM_AIX_H */
diff --git a/gdb/config/ia64/xm-aix.h b/gdb/config/ia64/xm-aix.h
index dae8e950936..0023bfa13ef 100644
--- a/gdb/config/ia64/xm-aix.h
+++ b/gdb/config/ia64/xm-aix.h
@@ -27,7 +27,4 @@
#include "xm-sysv4.h"
-#define GDB_GREGSET_T prgregset_t
-#define GDB_FPREGSET_T prfpregset_t
-
#endif /* #ifndef XM_AIX_H */