aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cagney <cagney@redhat.com>2002-01-20 04:23:29 +0000
committerAndrew Cagney <cagney@redhat.com>2002-01-20 04:23:29 +0000
commit826000345c004578cedf2e4bcd5cf6f0e84185bf (patch)
treef3e066b518600114190217f4be9ac4b91bf12d77
parent1636f0bbebdb8486aee30722a9f9a2d15aa9716e (diff)
downloadgdb-826000345c004578cedf2e4bcd5cf6f0e84185bf.zip
gdb-826000345c004578cedf2e4bcd5cf6f0e84185bf.tar.gz
gdb-826000345c004578cedf2e4bcd5cf6f0e84185bf.tar.bz2
Eliminate MALLOC_INCOMPATIBLE.
-rw-r--r--gdb/ChangeLog8
-rw-r--r--gdb/config/sparc/nm-sun4os4.h4
-rw-r--r--gdb/config/sparc/sun4os4.mh1
-rw-r--r--gdb/config/sparc/xm-sun4os4.h33
-rw-r--r--gdb/doc/ChangeLog5
-rw-r--r--gdb/doc/gdbint.texinfo4
-rw-r--r--gdb/utils.c2
7 files changed, 17 insertions, 40 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 87e3bda..8f95428 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
2002-01-19 Andrew Cagney <ac131313@redhat.com>
+ * utils.c: Remove #ifndef MALLOC_INCOMPATIBLE.
+ * config/sparc/xm-sun4os4.h (PTRACE_ARG3_TYPE): Move macro ....
+ * config/sparc/nm-sun4os4.h (PTRACE_ARG3_TYPE): ... to here.
+ * config/sparc/xm-sun4os4.h: Delete file.
+ * config/sparc/sun4os4.mh (XM_FILE): Delete makefile variable.
+
+2002-01-19 Andrew Cagney <ac131313@redhat.com>
+
* config/sparc/sparclynx.mh (XM_FILE): Delete.
* config/rs6000/rs6000lynx.mh (XM_FILE): Delete.
* config/m68k/m68klynx.mh (XM_FILE): Delete.
diff --git a/gdb/config/sparc/nm-sun4os4.h b/gdb/config/sparc/nm-sun4os4.h
index 914fb1e..d874d58 100644
--- a/gdb/config/sparc/nm-sun4os4.h
+++ b/gdb/config/sparc/nm-sun4os4.h
@@ -36,3 +36,7 @@
#define KERNEL_U_SIZE kernel_u_size()
extern int kernel_u_size (void);
+
+/* SunOS 4.x uses nonstandard "char *" as type of third argument to ptrace() */
+
+#define PTRACE_ARG3_TYPE char*
diff --git a/gdb/config/sparc/sun4os4.mh b/gdb/config/sparc/sun4os4.mh
index 4deba42..a21ad6b 100644
--- a/gdb/config/sparc/sun4os4.mh
+++ b/gdb/config/sparc/sun4os4.mh
@@ -1,5 +1,4 @@
# Host: Sun 4 or Sparcstation, running SunOS 4
-XM_FILE= xm-sun4os4.h
NAT_FILE= nm-sun4os4.h
NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o sparc-nat.o
HOST_IPC=-DBSD_IPC
diff --git a/gdb/config/sparc/xm-sun4os4.h b/gdb/config/sparc/xm-sun4os4.h
deleted file mode 100644
index 063e150..0000000
--- a/gdb/config/sparc/xm-sun4os4.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Macro definitions for running gdb on a Sun 4 running sunos 4.
- Copyright 1989, 1993, 1994, 1995, 1996
- Free Software Foundation, Inc.
-
- This file is part of GDB.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#define FPU
-
-/* /usr/include/malloc.h is included by vx-share/xdr_ld, and might
- declare these using char * not void *. The following should work with
- acc, gcc, or /bin/cc. */
-
-#define MALLOC_INCOMPATIBLE
-#include <malloc.h>
-
-/* SunOS 4.x uses nonstandard "char *" as type of third argument to ptrace() */
-
-#define PTRACE_ARG3_TYPE char*
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 4bc20b4..71b9ba8 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-19 Andrew Cagney <ac131313@redhat.com>
+
+ * gdbint.texinfo (Host Definition): Remove references to
+ MALLOC_INCOMPATIBLE.
+
2002-01-17 Andrew Cagney <ac131313@redhat.com>
* gdbint.texinfo (Host Definition): Remove references to XDEPFILES
diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo
index d75375d..51e21db 100644
--- a/gdb/doc/gdbint.texinfo
+++ b/gdb/doc/gdbint.texinfo
@@ -2206,10 +2206,6 @@ This macro is used as the argument to @code{lseek} (or, most commonly,
@code{bfd_seek}). FIXME, should be replaced by SEEK_SET instead,
which is the POSIX equivalent.
-@item MALLOC_INCOMPATIBLE
-Define this if the system's prototype for @code{malloc} differs from the
-@sc{ansi} definition.
-
@item MMAP_BASE_ADDRESS
When using HAVE_MMAP, the first mapping should go at this address.
diff --git a/gdb/utils.c b/gdb/utils.c
index e5182af..16c1897 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -62,7 +62,6 @@
#include "mmalloc.h"
#endif
-#ifndef MALLOC_INCOMPATIBLE
#ifdef NEED_DECLARATION_MALLOC
extern PTR malloc ();
#endif
@@ -72,7 +71,6 @@ extern PTR realloc ();
#ifdef NEED_DECLARATION_FREE
extern void free ();
#endif
-#endif
#undef XMALLOC
#define XMALLOC(TYPE) ((TYPE*) xmalloc (sizeof (TYPE)))