diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/defs.h | 2 | ||||
| -rw-r--r-- | gdb/main.c | 3 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.gdb/selftest.exp | 4 | ||||
| -rw-r--r-- | gdb/utils.c | 36 |
6 files changed, 10 insertions, 45 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9043fff..973ca13 100644 --- 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. @@ -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 *); @@ -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 7bb16b8..bc5afb7 100644 --- 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 4196b74..283de51 100644 --- 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 25fca5a..be99780 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -983,42 +983,6 @@ request_quit (int signo) quit (); } -/* 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. */ |