* config/i386/xm-i386v4.h, config/m68k/xm-m68kv4.h,

	config/sparc/xm-sun4sol2.h (NORETURN): Don't define.
	* config/m88k/tm-cxux.h (ARCH_NUM_REGS): Undefine before defining.

5 files changed, 7 insertions, 24 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8f4ef91..ed4a6f6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Thu Aug  4 11:08:03 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* config/i386/xm-i386v4.h, config/m68k/xm-m68kv4.h,
+	config/sparc/xm-sun4sol2.h (NORETURN): Don't define.
+	* config/m88k/tm-cxux.h (ARCH_NUM_REGS): Undefine before defining.
+
 Thu Aug  4 10:26:36 1994  Stu Grossman  (grossman@rtl.cygnus.com)
 
 	* target.c (add_target):  Don't call clean_target on target
diff --git a/gdb/config/i386/xm-i386v4.h b/gdb/config/i386/xm-i386v4.h
index fc3eef8..bb7c112 100644
--- a/gdb/config/i386/xm-i386v4.h
+++ b/gdb/config/i386/xm-i386v4.h
@@ -26,14 +26,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "xm-sysv4.h"
 
-/* The native AT&T compiler for i386/SVR4 complains about using volatile
-   to indicate functions that never return.  So shut it up by simply
-   defining away "NORETURN", which is normally defined to "volatile". */
-
-#ifndef __GNUC__
-# define NORETURN /**/
-#endif
-
 /* If you expect to use the mmalloc package to obtain mapped symbol files,
    for now you have to specify some parameters that determine how gdb places
    the mappings in it's address space.  See the comments in map_to_address()
diff --git a/gdb/config/m68k/xm-m68kv4.h b/gdb/config/m68k/xm-m68kv4.h
index 1a011b6..12a5587 100644
--- a/gdb/config/m68k/xm-m68kv4.h
+++ b/gdb/config/m68k/xm-m68kv4.h
@@ -27,14 +27,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "xm-sysv4.h"
 
-/* The native AT&T compiler for m68k/SVR4 complains about using volatile
-   to indicate functions that never return.  So shut it up by simply
-   defining away "NORETURN", which is normally defined to "volatile". */
-
-#ifndef __GNUC__
-# define NORETURN /**/
-#endif
-
 /* If you expect to use the mmalloc package to obtain mapped symbol files,
    for now you have to specify some parameters that determine how gdb places
    the mappings in it's address space.  See the comments in map_to_address()
diff --git a/gdb/config/m88k/tm-cxux.h b/gdb/config/m88k/tm-cxux.h
index c489408..4f714ce 100644
--- a/gdb/config/m88k/tm-cxux.h
+++ b/gdb/config/m88k/tm-cxux.h
@@ -36,6 +36,7 @@ typedef struct {
 /* Always allocate space for both, but recognize that the m88100 has no
    FP_REGS.  */
 
+#undef ARCH_NUM_REGS
 #define ARCH_NUM_REGS (target_is_m88110 ? (GP_REGS + FP_REGS) : (GP_REGS))
 
 /* Don't need this grotesquerie.  */
diff --git a/gdb/config/sparc/xm-sun4sol2.h b/gdb/config/sparc/xm-sun4sol2.h
index 44d86b0..de7e10f 100644
--- a/gdb/config/sparc/xm-sun4sol2.h
+++ b/gdb/config/sparc/xm-sun4sol2.h
@@ -31,14 +31,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define	gregset_t	prgregset_t
 #define	fpregset_t	prfpregset_t
 
-/* The native Sun compiler complains about using volatile
-   to indicate functions that never return.  So shut it up by simply
-   defining away "NORETURN", which is normally defined to "volatile". */
-
-#ifndef __GNUC__
-# define NORETURN /**/
-#endif
-
 /* If you expect to use the mmalloc package to obtain mapped symbol files,
    for now you have to specify some parameters that determine how gdb places
    the mappings in it's address space.  See the comments in map_to_address()