* configure.in (--with-mmalloc): Add new configure arg to use the

	mmalloc package.  Default is to not use it.
	(START_INFERIOR_TRAPS_EXPECTED): Define to the integer 2, not
	the string "2".
	* acconfig.h (USE_MMALLOC, FORCE_MMCHECK): Add #undef.
	* configure: Regenerated.
	* config.in: Regenerated.
	* Makefile.in (MMALLOC_DIR, MMALLOC_SRC): Remove.
	(MMALLOC): Set using configure.
	(MMALLOC_CFLAGS): Set using configure.
	* config/i386/tm-linux.h (sys_quotactl): Define to 1 rather
	than just defining it.
	* mpw-make.sed: Undefine USE_MMALLOC rather than defining NO_MMALLOC.
	* utils.c (NO_MMALLOC): Use USE_MMALLOC instead.
	* objfiles.c: ditto.
	* defs.h: ditto.
	* config/sparc/sun4os4.mh (MMALLOC_CFLAGS): Remove.
	* config/m68k/sun3os4.mh (MMALLOC_CFLAGS): Remove.
	* config/i386/cygwin32.mh (MMALLOC_CFLAGS): Remove.
	* config/alpha/alpha-osf3.mh (MMALLOC_CFLAGS): Remove.
	* config/alpha/alpha-osf2.mh (MMALLOC_CFLAGS): Remove.
	* gdbserver/Makefile.in (MMALLOC_*): Remove.
	* config/rs6000/rs6000.mh (MMALLOC, MMALLOC_CFLAGS): Remove.
	* config/rs6000/aix4.mh (MMALLOC, MMALLOC_CFLAGS): Remove.
	* config/powerpc/aix4.mh (MMALLOC, MMALLOC_CFLAGS): Remove.
	* config/powerpc/aix.mh (MMALLOC, MMALLOC_CFLAGS): Remove.
	* config/ns32k/ns32km3.mh (MMALLOC, MMALLOC_CFLAGS): Remove.
	* config/mips/mipsm3.mh (MMALLOC, MMALLOC_CFLAGS): Remove.
	* config/mips/decstation.mh (MMALLOC, MMALLOC_CFLAGS): Remove.
	* config/m88k/cxux.mh (MMALLOC, MMALLOC_CFLAGS): Remove.
	* config/i386/xm-windows.h (NO_MMALLOC, NO_MMCHECK): Remove.
	* config/i386/i386mk.mh (MMALLOC, MMALLOC_CFLAGS): Remove.
	* config/i386/i386m3.mh (MMALLOC, MMALLOC_CFLAGS): Remove.
	* config/i386/i386gnu.mh (MMALLOC, MMALLOC_CFLAGS): Remove.
	* config/alpha/alpha-osf1.mh (MMALLOC, MMALLOC_CFLAGS): Remove.
	* config/alpha/alpha-linux.mh (MMALLOC, MMALLOC_CFLAGS): Remove.

12 files changed, 6 insertions, 45 deletions

diff --git a/gdb/config/alpha/alpha-linux.mh b/gdb/config/alpha/alpha-linux.mh
new file mode 100644
index 0000000..5446a82
--- /dev/null
+++ b/gdb/config/alpha/alpha-linux.mh
@@ -0,0 +1,5 @@
+# Host: Little-endian Alpha running Linux
+XDEPFILES= 
+XM_FILE= xm-alphalinux.h
+NAT_FILE= nm-linux.h
+NATDEPFILES= infptrace.o inftarg.o corelow.o alpha-nat.o fork-child.o osfsolib.o
diff --git a/gdb/config/i386/cygwin32.mh b/gdb/config/i386/cygwin32.mh
index fac1bab..f3ac44d 100644
--- a/gdb/config/i386/cygwin32.mh
+++ b/gdb/config/i386/cygwin32.mh
@@ -5,4 +5,4 @@ TERMCAP=
 NATDEPFILES= win32-nat.o
 NAT_FILE=../nm-empty.h
 XM_CLIBS=
-MMALLOC_CFLAGS = -I$(MMALLOC_SRC) -DNO_MMCHECK
+
diff --git a/gdb/config/i386/i386m3.mh b/gdb/config/i386/i386m3.mh
index 3b996df..0a83ebf 100644
--- a/gdb/config/i386/i386m3.mh
+++ b/gdb/config/i386/i386m3.mh
@@ -5,7 +5,3 @@ NATDEPFILES= i386m3-nat.o m3-nat.o fork-child.o
 NAT_CLIBS= -lmachid -lnetname -lmach
 XM_FILE= xm-i386m3.h
 NAT_FILE= nm-m3.h
-
-# Don't use the mmalloc library in Mach 3.
-MMALLOC = 
-MMALLOC_CFLAGS = -DNO_MMALLOC
diff --git a/gdb/config/i386/i386mk.mh b/gdb/config/i386/i386mk.mh
index 3b2d524..849677c 100644
--- a/gdb/config/i386/i386mk.mh
+++ b/gdb/config/i386/i386mk.mh
@@ -2,7 +2,3 @@
 
 XDEPFILES= os-mach3.o i386mach3-xdep.o i387-tdep.o
 XM_FILE= xm-i386osf1mk.h
-
-# Don't use the mmalloc library in Mach 3.
-MMALLOC = 
-MMALLOC_CFLAGS = -DNO_MMALLOC
diff --git a/gdb/config/i386/xm-windows.h b/gdb/config/i386/xm-windows.h
index 91ca4d0..96fd854 100644
--- a/gdb/config/i386/xm-windows.h
+++ b/gdb/config/i386/xm-windows.h
@@ -28,8 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define CANT_FORK
 
 #define MALLOC_INCOMPATIBLE
-#define NO_MMALLOC
-#define NO_MMCHECK
 
 #include <malloc.h>
 
diff --git a/gdb/config/m68k/sun3os4.mh b/gdb/config/m68k/sun3os4.mh
index 3f63541..5d1bf52 100644
--- a/gdb/config/m68k/sun3os4.mh
+++ b/gdb/config/m68k/sun3os4.mh
@@ -4,9 +4,3 @@ XM_FILE= xm-sun3os4.h
 NAT_FILE= nm-sun3.h
 NATDEPFILES= fork-child.o inftarg.o infptrace.o corelow.o sun3-nat.o
 GDBSERVER_DEPFILES= low-sun3.o
-
-# SunOS 4.x has memory allocation calls in the C runtime.  However
-# since free() is never called with these objects, it is safe to
-# define MMCHECK_FORCE to 1 and thus force installation of the mmalloc
-# corruption checks.
-MMALLOC_CFLAGS = -I$(MMALLOC_SRC) -DMMCHECK_FORCE=1
diff --git a/gdb/config/m88k/cxux.mh b/gdb/config/m88k/cxux.mh
index cc3cfc2..cb02225 100644
--- a/gdb/config/m88k/cxux.mh
+++ b/gdb/config/m88k/cxux.mh
@@ -5,6 +5,3 @@ XDEPFILES=
 
 NAT_FILE= nm-cxux.h
 NATDEPFILES= infptrace.o inftarg.o fork-child.o cxux-nat.o corelow.o core-aout.o
-
-MMALLOC=
-MMALLOC_CFLAGS= -DNO_MMALLOC
diff --git a/gdb/config/mips/decstation.mh b/gdb/config/mips/decstation.mh
index d7baecf..da417b2 100644
--- a/gdb/config/mips/decstation.mh
+++ b/gdb/config/mips/decstation.mh
@@ -3,9 +3,3 @@ XDEPFILES=
 XM_FILE= xm-mips.h
 NAT_FILE= nm-mips.h
 NATDEPFILES= infptrace.o inftarg.o corelow.o mips-nat.o fork-child.o
-
-# We can't use MMALLOC because the DECstation RPC library can't cope
-# with a malloc(0) that returns 0.  Besides, it's useless on a machine
-# without a real mmap().
-MMALLOC = 
-MMALLOC_CFLAGS = -DNO_MMALLOC
diff --git a/gdb/config/mips/mipsm3.mh b/gdb/config/mips/mipsm3.mh
index 3be486f..e049d68 100644
--- a/gdb/config/mips/mipsm3.mh
+++ b/gdb/config/mips/mipsm3.mh
@@ -5,7 +5,3 @@ XDEPFILES= core-aout.o
 NATDEPFILES= mipsm3-nat.o m3-nat.o
 XM_FILE= xm-mipsm3.h
 NAT_FILE= ../nm-m3.h
-
-# Don't use the mmalloc library in Mach 3.
-MMALLOC = 
-MMALLOC_CFLAGS = -DNO_MMALLOC
diff --git a/gdb/config/ns32k/ns32km3.mh b/gdb/config/ns32k/ns32km3.mh
index 363b04d..7f0992a 100644
--- a/gdb/config/ns32k/ns32km3.mh
+++ b/gdb/config/ns32k/ns32km3.mh
@@ -5,7 +5,3 @@ NATDEPFILES= m3-nat.o ns32km3-nat.o fork-child.o corelow.o core-aout.o
 NAT_CLIBS= -L/usr/mach/lib -lnetname -lmachid -lmach
 XM_FILE= xm-ns32km3.h
 NAT_FILE= nm-m3.h
-
-# Don't use the mmalloc library in Mach 3.
-MMALLOC = 
-MMALLOC_CFLAGS = -DNO_MMALLOC
diff --git a/gdb/config/powerpc/aix4.mh b/gdb/config/powerpc/aix4.mh
index c49e639..2407231 100644
--- a/gdb/config/powerpc/aix4.mh
+++ b/gdb/config/powerpc/aix4.mh
@@ -10,11 +10,6 @@ NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o rs6000-nat.o xcoffread
 # We have no idea who our current compiler is though, so we skip it.
 # MH_CFLAGS = -bnodelcsect
 
-# Because of shared libraries, we risk ending up with *two*
-# incompatible versions of malloc if we use GNU malloc ...
-MMALLOC = 
-MMALLOC_CFLAGS = -DNO_MMALLOC
-
 # Rumor has it that libtermcap is "not really functional", and that
 # -lcurses is better.
 TERMCAP= -lcurses
diff --git a/gdb/config/sparc/sun4os4.mh b/gdb/config/sparc/sun4os4.mh
index 7b3709a..4047c5c 100644
--- a/gdb/config/sparc/sun4os4.mh
+++ b/gdb/config/sparc/sun4os4.mh
@@ -9,9 +9,3 @@ GDBSERVER_DEPFILES= low-sparc.o
 # anyone who wants to use NIS, which includes at least one Cygnus customer
 # (PR 3593).  So leave it this way until/unless we find a resolver which can
 # get names from either DNS or NIS from the same GDB binary.
-
-# SunOS 4.x has memory allocation calls in the C runtime.  However
-# since free() is never called with these objects, it is safe to
-# define MMCHECK_FORCE to 1 and thus force installation of the mmalloc
-# corruption checks.
-MMALLOC_CFLAGS = -I$(MMALLOC_SRC) -DMMCHECK_FORCE=1