2004-08-10 Andrew Cagney <cagney@gnu.org>

	* main.c (captured_main): Delete call to init_malloc.
	* defs.h (init_malloc): Delete declaration.
	* utils.c (mmalloc, mrealloc, mcalloc, mfree)
	(init_malloc): Delete functions.

Index: testsuite/ChangeLog
2004-08-10  Andrew Cagney  <cagney@gnu.org>

	* gdb.gdb/selftest.exp (do_steps_and_nexts): Remove code to skip
	init_malloc call.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9043fffb8c5204c8d4f23114a18bbba44fd0ccf7..973ca13089c5fa0a0e7a7ae3bd212db421448a64 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2004-08-10  Andrew Cagney  <cagney@gnu.org>
 
+       * main.c (captured_main): Delete call to init_malloc.
+       * defs.h (init_malloc): Delete declaration.
+       * utils.c (mmalloc, mrealloc, mcalloc, mfree)
+       (init_malloc): Delete functions.
+
        * defs.h (xmfree): Delete.
        * utils.c (xmfree): Delete function.
        (xfree): Inline calls to xmfree and mfree.

diff --git a/gdb/defs.h b/gdb/defs.h
index 3f6e7207a1678ada32ee2e35747440590ab2505a..8e2ba64d39ea73e28534e19314abc999f04c077a 100644 (file)
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -358,8 +358,6 @@ extern int subset_compare (char *, char *);
 
 extern char *safe_strerror (int);
 
-extern void init_malloc (void *);
-
 extern void request_quit (int);
 
 extern void do_cleanups (struct cleanup *);

diff --git a/gdb/main.c b/gdb/main.c
index 0042962c5dcf33fa85d7f752d4767df92c33f3d7..d331bc546ca521c874a1954d80061bc4eaa72b0e 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -157,9 +157,6 @@ captured_main (void *data)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  /* This needs to happen before the first use of malloc.  */
-  init_malloc (NULL);
-
 #ifdef HAVE_SBRK
   lim_at_start = (char *) sbrk (0);
 #endif

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 7bb16b8e18fe931007dc4c33fcd4cde8acac32f4..bc5afb76cb5ccff928eadef8e7350160e6ca9e18 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-10  Andrew Cagney  <cagney@gnu.org>
+
+       * gdb.gdb/selftest.exp (do_steps_and_nexts): Remove code to skip
+       init_malloc call.
+
 2004-08-10  Michael Chastain  <mec.gnu@mindspring.com>
 
        * ChangeLog: Add copyright notice.  The notice is copied

diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
index 4196b74e7860e28c352cf29bf529b07b4a111515..283de5100d9fe9beaf0035eac3d32df1a8439b75 100644 (file)
--- a/gdb/testsuite/gdb.gdb/selftest.exp
+++ b/gdb/testsuite/gdb.gdb/selftest.exp
@@ -105,10 +105,6 @@ proc do_steps_and_nexts {} {
                set description "next over mac_init and everything it calls"
                set command "next"
            }
-           -re ".*init_malloc.*$gdb_prompt $" {
-               set description "next over init_malloc and everything it calls"
-               set command "next"
-           }
            -re ".*lim_at_start.*$gdb_prompt $" {
                set description "next over lim_at_start initialization"
                set command "next"

diff --git a/gdb/utils.c b/gdb/utils.c
index 25fca5ae604b1f38f208d80de2a844cbe25526a5..be99780cf69ca0d0424594ea697f2d458925038e 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -983,42 +983,6 @@ request_quit (int signo)
     quit ();
 }
 \f
-/* Memory management stuff (malloc friends).  */
-
-static void *
-mmalloc (void *md, size_t size)
-{
-  return malloc (size);                /* NOTE: GDB's only call to malloc() */
-}
-
-static void *
-mrealloc (void *md, void *ptr, size_t size)
-{
-  if (ptr == 0)                        /* Guard against old realloc's */
-    return mmalloc (md, size);
-  else
-    return realloc (ptr, size);        /* NOTE: GDB's only call to ralloc() */
-}
-
-static void *
-mcalloc (void *md, size_t number, size_t size)
-{
-  return calloc (number, size);        /* NOTE: GDB's only call to calloc() */
-}
-
-static void
-mfree (void *md, void *ptr)
-{
-  free (ptr);                  /* NOTE: GDB's only call to free() */
-}
-
-/* This used to do something interesting with USE_MMALLOC.
- * It can be retired any time.  -- chastain 2004-01-19.  */
-void
-init_malloc (void *md)
-{
-}
-
 /* Called when a memory allocation fails, with the number of bytes of
    memory requested in SIZE. */