From 2fee7708947e6e719179e5da5b5fb6e337b22cc8 Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Sat, 29 Aug 2015 18:03:37 -0400 Subject: [PATCH] Revert "Use gdbarch obstack to allocate the TYPE_NAME string in arch_type" This patch manually modified the autogenerated files gdbarch.[ch] instead of going through gdbarch.sh. This reverts commit aa78b3b28aeff4bb9977a313f5a8002d920b34c5. --- gdb/ChangeLog | 6 ------ gdb/gdbarch.c | 10 ---------- gdb/gdbarch.h | 5 ----- gdb/gdbtypes.c | 2 +- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4b476c2..e727bfb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,11 +1,5 @@ 2015-08-29 Patrick Palka - * gdbarch.h (gdbarch_obstack_strdup): Declare. - * gdbarch.c (gdbarch_obstack_strdup): Define. - * gdbtypes.c (arch_type): Use it. - -2015-08-29 Patrick Palka - * gdbtypes.c (alloc_type_arch): Allocate the type on the given gdbarch obstack instead of on the heap. Update commentary accordingly. diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 37ce22a..0d4142b 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -449,16 +449,6 @@ gdbarch_obstack_zalloc (struct gdbarch *arch, long size) return data; } -/* See gdbarch.h. */ - -char * -gdbarch_obstack_strdup (struct gdbarch *gdbarch, const char *string) -{ - char *obstring = gdbarch_obstack_zalloc (gdbarch, strlen (string) + 1); - strcpy (obstring, string); - return obstring; -} - /* Free a gdbarch struct. This should never happen in normal operation --- once you've created a gdbarch, you keep it around. diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 7550379..7df37c9 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -1618,11 +1618,6 @@ extern void *gdbarch_obstack_zalloc (struct gdbarch *gdbarch, long size); #define GDBARCH_OBSTACK_CALLOC(GDBARCH, NR, TYPE) ((TYPE *) gdbarch_obstack_zalloc ((GDBARCH), (NR) * sizeof (TYPE))) #define GDBARCH_OBSTACK_ZALLOC(GDBARCH, TYPE) ((TYPE *) gdbarch_obstack_zalloc ((GDBARCH), sizeof (TYPE))) -/* Duplicate STRING, returning an equivalent string that's allocated on the - obstack associated with GDBARCH. The string is freed when the corresponding - architecture is also freed. */ - -extern char *gdbarch_obstack_strdup (struct gdbarch *gdbarch, const char *string); /* Helper function. Force an update of the current architecture. diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index a81258d..8204d39 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -4549,7 +4549,7 @@ arch_type (struct gdbarch *gdbarch, TYPE_LENGTH (type) = length; if (name) - TYPE_NAME (type) = gdbarch_obstack_strdup (gdbarch, name); + TYPE_NAME (type) = xstrdup (name); return type; } -- 2.7.4