Use new %p format suffixes in gdb

[deliverable/binutils-gdb.git] / gdb / jit.c

diff --git a/gdb/jit.c b/gdb/jit.c
index ce73e3fa5b1c66f154034daa3f25b2439d12177e..af01b4d6c4fe3f1d997b6ab2867fed93e1c0b84c 100644 (file)
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -36,13 +36,13 @@
 #include "symfile.h"
 #include "symtab.h"
 #include "target.h"
-#include "gdb-dlfcn.h"
+#include "gdbsupport/gdb-dlfcn.h"
 #include <sys/stat.h>
 #include "gdb_bfd.h"
 #include "readline/tilde.h"
 #include "completer.h"
 
-static const char *jit_reader_dir = NULL;
+static std::string jit_reader_dir;
 
 static const struct objfile_data *jit_objfile_data;
 
@@ -216,7 +216,7 @@ jit_reader_load_command (const char *args, int from_tty)
     error (_("JIT reader already loaded.  Run jit-reader-unload first."));
 
   if (!IS_ABSOLUTE_PATH (file.get ()))
-    file.reset (xstrprintf ("%s%s%s", jit_reader_dir, SLASH_STRING,
+    file.reset (xstrprintf ("%s%s%s", jit_reader_dir.c_str (), SLASH_STRING,
                            file.get ()));
 
   loaded_jit_reader = jit_reader_load (file.get ());
@@ -700,10 +700,8 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile)
       SYMBOL_TYPE (block_name) = lookup_function_type (block_type);
       SYMBOL_BLOCK_VALUE (block_name) = new_block;
 
-      block_name->ginfo.name
-       = (const char *) obstack_copy0 (&objfile->objfile_obstack,
-                                       gdb_block_iter->name,
-                                       strlen (gdb_block_iter->name));
+      block_name->ginfo.name = obstack_strdup (&objfile->objfile_obstack,
+                                              gdb_block_iter->name);
 
       BLOCK_FUNCTION (new_block) = block_name;
 
@@ -912,12 +910,12 @@ JITed symbol file is not an object file, ignoring it.\n"));
      addresses that we care about.  */
   section_addr_info sai;
   for (sec = nbfd->sections; sec != NULL; sec = sec->next)
-    if ((bfd_get_section_flags (nbfd.get (), sec) & (SEC_ALLOC|SEC_LOAD)) != 0)
+    if ((bfd_section_flags (sec) & (SEC_ALLOC|SEC_LOAD)) != 0)
       {
         /* We assume that these virtual addresses are absolute, and do not
            treat them as offsets.  */
-       sai.emplace_back (bfd_get_section_vma (nbfd.get (), sec),
-                         bfd_get_section_name (nbfd.get (), sec),
+       sai.emplace_back (bfd_section_vma (sec),
+                         bfd_section_name (sec),
                          sec->index);
       }