gdb: add target_debug_printf and target_debug_printf_nofunc

Add the `target_debug_printf` and `target_debug_printf_nofunc` macros
and use them when outputting debug messages depending on `targetdebug`.
I opted for `target_debug_printf_nofunc` to follow the current style
where the function name is already printed, along with the arguments.

Modify the debug printfs in the `debug_target` methods (generated by
`make-target-delegates.py`) to use `target_debug_printf_nofunc` as well.

This makes the "target" debug prints integrate nicely with the other
debug prints that use the "new" debug print system:

    [infrun] proceed: enter
      [infrun] follow_fork: enter
        [target] -> multi-thread->record_will_replay (...)
        [target] <- multi-thread->record_will_replay (-1, 0) = false
        [target] -> multi-thread->supports_multi_process (...)
        [target] <- multi-thread->supports_multi_process () = true
      [infrun] follow_fork: exit
      ...

Change-Id: Ide3c8c1b8a30e6d4c353a29cba911c7192de29ac
Approved-By: Tom Tromey <tom@tromey.com>

3 files changed, 390 insertions, 590 deletions

diff --git a/gdb/make-target-delegates.py b/gdb/make-target-delegates.py
index f6f2bf0..bfcf7fa 100755
--- a/gdb/make-target-delegates.py
+++ b/gdb/make-target-delegates.py
@@ -274,9 +274,7 @@ def write_debugmethod(
     debugname = "debug_target::" + name
     names = write_function_header(f, False, debugname, return_type, argtypes)
     print(
-        '  gdb_printf (gdb_stdlog, "-> %s->'
-        + name
-        + ' (...)\\n", this->beneath ()->shortname ());',
+        f'  target_debug_printf_nofunc ("-> %s->{name} (...)", this->beneath ()->shortname ());',
         file=f,
     )
 
@@ -311,11 +309,8 @@ def write_debugmethod(
         ret = ""
 
     print(
-        (
-            "  gdb_printf (gdb_stdlog,\n"
-            '\t      "<- %s->{name} ({args_fmt}){ret_fmt}\\n",\n'
-            "\t      this->beneath ()->shortname (){args}{ret});"
-        ).format(name=name, args_fmt=args_fmt, args=args, ret_fmt=ret_fmt, ret=ret),
+        f'  target_debug_printf_nofunc ("<- %s->{name} ({args_fmt}){ret_fmt}",\n'
+        f"\t      this->beneath ()->shortname (){args}{ret});",
         file=f,
     )
 
diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index b45b445..af6be08 100644
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -392,10 +392,9 @@ dummy_target::post_attach (int arg0)
 void
 debug_target::post_attach (int arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->post_attach (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->post_attach (...)", this->beneath ()->shortname ());
   this->beneath ()->post_attach (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->post_attach (%s)\n",
+  target_debug_printf_nofunc ("<- %s->post_attach (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (arg0).c_str ());
 }
@@ -414,10 +413,9 @@ dummy_target::detach (inferior *arg0, int arg1)
 void
 debug_target::detach (inferior *arg0, int arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->detach (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->detach (...)", this->beneath ()->shortname ());
   this->beneath ()->detach (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->detach (%s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->detach (%s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_inferior_p (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str ());
@@ -438,10 +436,9 @@ dummy_target::disconnect (const char *arg0, int arg1)
 void
 debug_target::disconnect (const char *arg0, int arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->disconnect (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->disconnect (...)", this->beneath ()->shortname ());
   this->beneath ()->disconnect (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->disconnect (%s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->disconnect (%s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_char_p (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str ());
@@ -462,10 +459,9 @@ dummy_target::resume (ptid_t arg0, int arg1, enum gdb_signal arg2)
 void
 debug_target::resume (ptid_t arg0, int arg1, enum gdb_signal arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->resume (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->resume (...)", this->beneath ()->shortname ());
   this->beneath ()->resume (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->resume (%s, %s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->resume (%s, %s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ptid_t (arg0).c_str (),
 	      target_debug_print_step (arg1).c_str (),
@@ -486,10 +482,9 @@ dummy_target::commit_resumed ()
 void
 debug_target::commit_resumed ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->commit_resumed (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->commit_resumed (...)", this->beneath ()->shortname ());
   this->beneath ()->commit_resumed ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->commit_resumed ()\n",
+  target_debug_printf_nofunc ("<- %s->commit_resumed ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -508,11 +503,10 @@ dummy_target::wait (ptid_t arg0, struct target_waitstatus *arg1, target_wait_fla
 ptid_t
 debug_target::wait (ptid_t arg0, struct target_waitstatus *arg1, target_wait_flags arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->wait (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->wait (...)", this->beneath ()->shortname ());
   ptid_t result
     = this->beneath ()->wait (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->wait (%s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->wait (%s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ptid_t (arg0).c_str (),
 	      target_debug_print_target_waitstatus_p (arg1).c_str (),
@@ -535,10 +529,9 @@ dummy_target::fetch_registers (struct regcache *arg0, int arg1)
 void
 debug_target::fetch_registers (struct regcache *arg0, int arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->fetch_registers (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->fetch_registers (...)", this->beneath ()->shortname ());
   this->beneath ()->fetch_registers (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->fetch_registers (%s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->fetch_registers (%s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_regcache_p (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str ());
@@ -559,10 +552,9 @@ dummy_target::store_registers (struct regcache *arg0, int arg1)
 void
 debug_target::store_registers (struct regcache *arg0, int arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->store_registers (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->store_registers (...)", this->beneath ()->shortname ());
   this->beneath ()->store_registers (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->store_registers (%s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->store_registers (%s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_regcache_p (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str ());
@@ -583,10 +575,9 @@ dummy_target::prepare_to_store (struct regcache *arg0)
 void
 debug_target::prepare_to_store (struct regcache *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->prepare_to_store (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->prepare_to_store (...)", this->beneath ()->shortname ());
   this->beneath ()->prepare_to_store (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->prepare_to_store (%s)\n",
+  target_debug_printf_nofunc ("<- %s->prepare_to_store (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_regcache_p (arg0).c_str ());
 }
@@ -605,10 +596,9 @@ dummy_target::files_info ()
 void
 debug_target::files_info ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->files_info (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->files_info (...)", this->beneath ()->shortname ());
   this->beneath ()->files_info ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->files_info ()\n",
+  target_debug_printf_nofunc ("<- %s->files_info ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -627,11 +617,10 @@ dummy_target::insert_breakpoint (struct gdbarch *arg0, struct bp_target_info *ar
 int
 debug_target::insert_breakpoint (struct gdbarch *arg0, struct bp_target_info *arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->insert_breakpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->insert_breakpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->insert_breakpoint (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->insert_breakpoint (%s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->insert_breakpoint (%s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_gdbarch_p (arg0).c_str (),
 	      target_debug_print_bp_target_info_p (arg1).c_str (),
@@ -654,11 +643,10 @@ dummy_target::remove_breakpoint (struct gdbarch *arg0, struct bp_target_info *ar
 int
 debug_target::remove_breakpoint (struct gdbarch *arg0, struct bp_target_info *arg1, enum remove_bp_reason arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->remove_breakpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->remove_breakpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->remove_breakpoint (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->remove_breakpoint (%s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->remove_breakpoint (%s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_gdbarch_p (arg0).c_str (),
 	      target_debug_print_bp_target_info_p (arg1).c_str (),
@@ -682,11 +670,10 @@ dummy_target::stopped_by_sw_breakpoint ()
 bool
 debug_target::stopped_by_sw_breakpoint ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->stopped_by_sw_breakpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->stopped_by_sw_breakpoint (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->stopped_by_sw_breakpoint ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->stopped_by_sw_breakpoint () = %s\n",
+  target_debug_printf_nofunc ("<- %s->stopped_by_sw_breakpoint () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -707,11 +694,10 @@ dummy_target::supports_stopped_by_sw_breakpoint ()
 bool
 debug_target::supports_stopped_by_sw_breakpoint ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->supports_stopped_by_sw_breakpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->supports_stopped_by_sw_breakpoint (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->supports_stopped_by_sw_breakpoint ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->supports_stopped_by_sw_breakpoint () = %s\n",
+  target_debug_printf_nofunc ("<- %s->supports_stopped_by_sw_breakpoint () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -732,11 +718,10 @@ dummy_target::stopped_by_hw_breakpoint ()
 bool
 debug_target::stopped_by_hw_breakpoint ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->stopped_by_hw_breakpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->stopped_by_hw_breakpoint (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->stopped_by_hw_breakpoint ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->stopped_by_hw_breakpoint () = %s\n",
+  target_debug_printf_nofunc ("<- %s->stopped_by_hw_breakpoint () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -757,11 +742,10 @@ dummy_target::supports_stopped_by_hw_breakpoint ()
 bool
 debug_target::supports_stopped_by_hw_breakpoint ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->supports_stopped_by_hw_breakpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->supports_stopped_by_hw_breakpoint (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->supports_stopped_by_hw_breakpoint ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->supports_stopped_by_hw_breakpoint () = %s\n",
+  target_debug_printf_nofunc ("<- %s->supports_stopped_by_hw_breakpoint () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -782,11 +766,10 @@ dummy_target::can_use_hw_breakpoint (enum bptype arg0, int arg1, int arg2)
 int
 debug_target::can_use_hw_breakpoint (enum bptype arg0, int arg1, int arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->can_use_hw_breakpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->can_use_hw_breakpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->can_use_hw_breakpoint (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->can_use_hw_breakpoint (%s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->can_use_hw_breakpoint (%s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bptype (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str (),
@@ -810,11 +793,10 @@ dummy_target::ranged_break_num_registers ()
 int
 debug_target::ranged_break_num_registers ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->ranged_break_num_registers (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->ranged_break_num_registers (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->ranged_break_num_registers ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->ranged_break_num_registers () = %s\n",
+  target_debug_printf_nofunc ("<- %s->ranged_break_num_registers () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (result).c_str ());
   return result;
@@ -835,11 +817,10 @@ dummy_target::insert_hw_breakpoint (struct gdbarch *arg0, struct bp_target_info
 int
 debug_target::insert_hw_breakpoint (struct gdbarch *arg0, struct bp_target_info *arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->insert_hw_breakpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->insert_hw_breakpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->insert_hw_breakpoint (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->insert_hw_breakpoint (%s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->insert_hw_breakpoint (%s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_gdbarch_p (arg0).c_str (),
 	      target_debug_print_bp_target_info_p (arg1).c_str (),
@@ -862,11 +843,10 @@ dummy_target::remove_hw_breakpoint (struct gdbarch *arg0, struct bp_target_info
 int
 debug_target::remove_hw_breakpoint (struct gdbarch *arg0, struct bp_target_info *arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->remove_hw_breakpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->remove_hw_breakpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->remove_hw_breakpoint (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->remove_hw_breakpoint (%s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->remove_hw_breakpoint (%s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_gdbarch_p (arg0).c_str (),
 	      target_debug_print_bp_target_info_p (arg1).c_str (),
@@ -889,11 +869,10 @@ dummy_target::remove_watchpoint (CORE_ADDR arg0, int arg1, enum target_hw_bp_typ
 int
 debug_target::remove_watchpoint (CORE_ADDR arg0, int arg1, enum target_hw_bp_type arg2, struct expression *arg3)
 {
-  gdb_printf (gdb_stdlog, "-> %s->remove_watchpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->remove_watchpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->remove_watchpoint (arg0, arg1, arg2, arg3);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->remove_watchpoint (%s, %s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->remove_watchpoint (%s, %s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_CORE_ADDR (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str (),
@@ -918,11 +897,10 @@ dummy_target::insert_watchpoint (CORE_ADDR arg0, int arg1, enum target_hw_bp_typ
 int
 debug_target::insert_watchpoint (CORE_ADDR arg0, int arg1, enum target_hw_bp_type arg2, struct expression *arg3)
 {
-  gdb_printf (gdb_stdlog, "-> %s->insert_watchpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->insert_watchpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->insert_watchpoint (arg0, arg1, arg2, arg3);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->insert_watchpoint (%s, %s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->insert_watchpoint (%s, %s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_CORE_ADDR (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str (),
@@ -947,11 +925,10 @@ dummy_target::insert_mask_watchpoint (CORE_ADDR arg0, CORE_ADDR arg1, enum targe
 int
 debug_target::insert_mask_watchpoint (CORE_ADDR arg0, CORE_ADDR arg1, enum target_hw_bp_type arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->insert_mask_watchpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->insert_mask_watchpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->insert_mask_watchpoint (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->insert_mask_watchpoint (%s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->insert_mask_watchpoint (%s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_CORE_ADDR (arg0).c_str (),
 	      target_debug_print_CORE_ADDR (arg1).c_str (),
@@ -975,11 +952,10 @@ dummy_target::remove_mask_watchpoint (CORE_ADDR arg0, CORE_ADDR arg1, enum targe
 int
 debug_target::remove_mask_watchpoint (CORE_ADDR arg0, CORE_ADDR arg1, enum target_hw_bp_type arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->remove_mask_watchpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->remove_mask_watchpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->remove_mask_watchpoint (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->remove_mask_watchpoint (%s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->remove_mask_watchpoint (%s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_CORE_ADDR (arg0).c_str (),
 	      target_debug_print_CORE_ADDR (arg1).c_str (),
@@ -1003,11 +979,10 @@ dummy_target::stopped_by_watchpoint ()
 bool
 debug_target::stopped_by_watchpoint ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->stopped_by_watchpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->stopped_by_watchpoint (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->stopped_by_watchpoint ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->stopped_by_watchpoint () = %s\n",
+  target_debug_printf_nofunc ("<- %s->stopped_by_watchpoint () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -1028,11 +1003,10 @@ dummy_target::have_steppable_watchpoint ()
 bool
 debug_target::have_steppable_watchpoint ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->have_steppable_watchpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->have_steppable_watchpoint (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->have_steppable_watchpoint ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->have_steppable_watchpoint () = %s\n",
+  target_debug_printf_nofunc ("<- %s->have_steppable_watchpoint () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -1053,11 +1027,10 @@ dummy_target::stopped_data_address (CORE_ADDR *arg0)
 bool
 debug_target::stopped_data_address (CORE_ADDR *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->stopped_data_address (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->stopped_data_address (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->stopped_data_address (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->stopped_data_address (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->stopped_data_address (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_CORE_ADDR_p (arg0).c_str (),
 	      target_debug_print_bool (result).c_str ());
@@ -1079,11 +1052,10 @@ dummy_target::watchpoint_addr_within_range (CORE_ADDR arg0, CORE_ADDR arg1, int
 bool
 debug_target::watchpoint_addr_within_range (CORE_ADDR arg0, CORE_ADDR arg1, int arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->watchpoint_addr_within_range (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->watchpoint_addr_within_range (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->watchpoint_addr_within_range (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->watchpoint_addr_within_range (%s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->watchpoint_addr_within_range (%s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_CORE_ADDR (arg0).c_str (),
 	      target_debug_print_CORE_ADDR (arg1).c_str (),
@@ -1107,11 +1079,10 @@ dummy_target::region_ok_for_hw_watchpoint (CORE_ADDR arg0, int arg1)
 int
 debug_target::region_ok_for_hw_watchpoint (CORE_ADDR arg0, int arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->region_ok_for_hw_watchpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->region_ok_for_hw_watchpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->region_ok_for_hw_watchpoint (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->region_ok_for_hw_watchpoint (%s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->region_ok_for_hw_watchpoint (%s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_CORE_ADDR (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str (),
@@ -1134,11 +1105,10 @@ dummy_target::can_accel_watchpoint_condition (CORE_ADDR arg0, int arg1, int arg2
 bool
 debug_target::can_accel_watchpoint_condition (CORE_ADDR arg0, int arg1, int arg2, struct expression *arg3)
 {
-  gdb_printf (gdb_stdlog, "-> %s->can_accel_watchpoint_condition (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->can_accel_watchpoint_condition (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->can_accel_watchpoint_condition (arg0, arg1, arg2, arg3);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->can_accel_watchpoint_condition (%s, %s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->can_accel_watchpoint_condition (%s, %s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_CORE_ADDR (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str (),
@@ -1163,11 +1133,10 @@ dummy_target::masked_watch_num_registers (CORE_ADDR arg0, CORE_ADDR arg1)
 int
 debug_target::masked_watch_num_registers (CORE_ADDR arg0, CORE_ADDR arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->masked_watch_num_registers (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->masked_watch_num_registers (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->masked_watch_num_registers (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->masked_watch_num_registers (%s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->masked_watch_num_registers (%s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_CORE_ADDR (arg0).c_str (),
 	      target_debug_print_CORE_ADDR (arg1).c_str (),
@@ -1190,11 +1159,10 @@ dummy_target::can_do_single_step ()
 int
 debug_target::can_do_single_step ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->can_do_single_step (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->can_do_single_step (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->can_do_single_step ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->can_do_single_step () = %s\n",
+  target_debug_printf_nofunc ("<- %s->can_do_single_step () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (result).c_str ());
   return result;
@@ -1215,11 +1183,10 @@ dummy_target::supports_terminal_ours ()
 bool
 debug_target::supports_terminal_ours ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->supports_terminal_ours (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->supports_terminal_ours (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->supports_terminal_ours ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->supports_terminal_ours () = %s\n",
+  target_debug_printf_nofunc ("<- %s->supports_terminal_ours () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -1239,10 +1206,9 @@ dummy_target::terminal_init ()
 void
 debug_target::terminal_init ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->terminal_init (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->terminal_init (...)", this->beneath ()->shortname ());
   this->beneath ()->terminal_init ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->terminal_init ()\n",
+  target_debug_printf_nofunc ("<- %s->terminal_init ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -1260,10 +1226,9 @@ dummy_target::terminal_inferior ()
 void
 debug_target::terminal_inferior ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->terminal_inferior (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->terminal_inferior (...)", this->beneath ()->shortname ());
   this->beneath ()->terminal_inferior ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->terminal_inferior ()\n",
+  target_debug_printf_nofunc ("<- %s->terminal_inferior ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -1281,10 +1246,9 @@ dummy_target::terminal_save_inferior ()
 void
 debug_target::terminal_save_inferior ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->terminal_save_inferior (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->terminal_save_inferior (...)", this->beneath ()->shortname ());
   this->beneath ()->terminal_save_inferior ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->terminal_save_inferior ()\n",
+  target_debug_printf_nofunc ("<- %s->terminal_save_inferior ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -1302,10 +1266,9 @@ dummy_target::terminal_ours_for_output ()
 void
 debug_target::terminal_ours_for_output ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->terminal_ours_for_output (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->terminal_ours_for_output (...)", this->beneath ()->shortname ());
   this->beneath ()->terminal_ours_for_output ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->terminal_ours_for_output ()\n",
+  target_debug_printf_nofunc ("<- %s->terminal_ours_for_output ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -1323,10 +1286,9 @@ dummy_target::terminal_ours ()
 void
 debug_target::terminal_ours ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->terminal_ours (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->terminal_ours (...)", this->beneath ()->shortname ());
   this->beneath ()->terminal_ours ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->terminal_ours ()\n",
+  target_debug_printf_nofunc ("<- %s->terminal_ours ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -1345,10 +1307,9 @@ dummy_target::terminal_info (const char *arg0, int arg1)
 void
 debug_target::terminal_info (const char *arg0, int arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->terminal_info (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->terminal_info (...)", this->beneath ()->shortname ());
   this->beneath ()->terminal_info (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->terminal_info (%s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->terminal_info (%s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_char_p (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str ());
@@ -1369,10 +1330,9 @@ dummy_target::kill ()
 void
 debug_target::kill ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->kill (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->kill (...)", this->beneath ()->shortname ());
   this->beneath ()->kill ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->kill ()\n",
+  target_debug_printf_nofunc ("<- %s->kill ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -1391,10 +1351,9 @@ dummy_target::load (const char *arg0, int arg1)
 void
 debug_target::load (const char *arg0, int arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->load (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->load (...)", this->beneath ()->shortname ());
   this->beneath ()->load (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->load (%s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->load (%s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_char_p (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str ());
@@ -1415,11 +1374,10 @@ dummy_target::insert_fork_catchpoint (int arg0)
 int
 debug_target::insert_fork_catchpoint (int arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->insert_fork_catchpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->insert_fork_catchpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->insert_fork_catchpoint (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->insert_fork_catchpoint (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->insert_fork_catchpoint (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (arg0).c_str (),
 	      target_debug_print_int (result).c_str ());
@@ -1441,11 +1399,10 @@ dummy_target::remove_fork_catchpoint (int arg0)
 int
 debug_target::remove_fork_catchpoint (int arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->remove_fork_catchpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->remove_fork_catchpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->remove_fork_catchpoint (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->remove_fork_catchpoint (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->remove_fork_catchpoint (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (arg0).c_str (),
 	      target_debug_print_int (result).c_str ());
@@ -1467,11 +1424,10 @@ dummy_target::insert_vfork_catchpoint (int arg0)
 int
 debug_target::insert_vfork_catchpoint (int arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->insert_vfork_catchpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->insert_vfork_catchpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->insert_vfork_catchpoint (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->insert_vfork_catchpoint (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->insert_vfork_catchpoint (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (arg0).c_str (),
 	      target_debug_print_int (result).c_str ());
@@ -1493,11 +1449,10 @@ dummy_target::remove_vfork_catchpoint (int arg0)
 int
 debug_target::remove_vfork_catchpoint (int arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->remove_vfork_catchpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->remove_vfork_catchpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->remove_vfork_catchpoint (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->remove_vfork_catchpoint (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->remove_vfork_catchpoint (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (arg0).c_str (),
 	      target_debug_print_int (result).c_str ());
@@ -1519,10 +1474,9 @@ dummy_target::follow_fork (inferior *arg0, ptid_t arg1, target_waitkind arg2, bo
 void
 debug_target::follow_fork (inferior *arg0, ptid_t arg1, target_waitkind arg2, bool arg3, bool arg4)
 {
-  gdb_printf (gdb_stdlog, "-> %s->follow_fork (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->follow_fork (...)", this->beneath ()->shortname ());
   this->beneath ()->follow_fork (arg0, arg1, arg2, arg3, arg4);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->follow_fork (%s, %s, %s, %s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->follow_fork (%s, %s, %s, %s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_inferior_p (arg0).c_str (),
 	      target_debug_print_ptid_t (arg1).c_str (),
@@ -1546,10 +1500,9 @@ dummy_target::follow_clone (ptid_t arg0)
 void
 debug_target::follow_clone (ptid_t arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->follow_clone (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->follow_clone (...)", this->beneath ()->shortname ());
   this->beneath ()->follow_clone (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->follow_clone (%s)\n",
+  target_debug_printf_nofunc ("<- %s->follow_clone (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ptid_t (arg0).c_str ());
 }
@@ -1569,11 +1522,10 @@ dummy_target::insert_exec_catchpoint (int arg0)
 int
 debug_target::insert_exec_catchpoint (int arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->insert_exec_catchpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->insert_exec_catchpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->insert_exec_catchpoint (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->insert_exec_catchpoint (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->insert_exec_catchpoint (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (arg0).c_str (),
 	      target_debug_print_int (result).c_str ());
@@ -1595,11 +1547,10 @@ dummy_target::remove_exec_catchpoint (int arg0)
 int
 debug_target::remove_exec_catchpoint (int arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->remove_exec_catchpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->remove_exec_catchpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->remove_exec_catchpoint (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->remove_exec_catchpoint (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->remove_exec_catchpoint (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (arg0).c_str (),
 	      target_debug_print_int (result).c_str ());
@@ -1620,10 +1571,9 @@ dummy_target::follow_exec (inferior *arg0, ptid_t arg1, const char *arg2)
 void
 debug_target::follow_exec (inferior *arg0, ptid_t arg1, const char *arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->follow_exec (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->follow_exec (...)", this->beneath ()->shortname ());
   this->beneath ()->follow_exec (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->follow_exec (%s, %s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->follow_exec (%s, %s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_inferior_p (arg0).c_str (),
 	      target_debug_print_ptid_t (arg1).c_str (),
@@ -1645,11 +1595,10 @@ dummy_target::set_syscall_catchpoint (int arg0, bool arg1, int arg2, gdb::array_
 int
 debug_target::set_syscall_catchpoint (int arg0, bool arg1, int arg2, gdb::array_view<const int> arg3)
 {
-  gdb_printf (gdb_stdlog, "-> %s->set_syscall_catchpoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->set_syscall_catchpoint (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->set_syscall_catchpoint (arg0, arg1, arg2, arg3);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->set_syscall_catchpoint (%s, %s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->set_syscall_catchpoint (%s, %s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (arg0).c_str (),
 	      target_debug_print_bool (arg1).c_str (),
@@ -1674,10 +1623,9 @@ dummy_target::mourn_inferior ()
 void
 debug_target::mourn_inferior ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->mourn_inferior (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->mourn_inferior (...)", this->beneath ()->shortname ());
   this->beneath ()->mourn_inferior ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->mourn_inferior ()\n",
+  target_debug_printf_nofunc ("<- %s->mourn_inferior ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -1695,10 +1643,9 @@ dummy_target::pass_signals (gdb::array_view<const unsigned char> arg0)
 void
 debug_target::pass_signals (gdb::array_view<const unsigned char> arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->pass_signals (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->pass_signals (...)", this->beneath ()->shortname ());
   this->beneath ()->pass_signals (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->pass_signals (%s)\n",
+  target_debug_printf_nofunc ("<- %s->pass_signals (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_signals (arg0).c_str ());
 }
@@ -1717,10 +1664,9 @@ dummy_target::program_signals (gdb::array_view<const unsigned char> arg0)
 void
 debug_target::program_signals (gdb::array_view<const unsigned char> arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->program_signals (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->program_signals (...)", this->beneath ()->shortname ());
   this->beneath ()->program_signals (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->program_signals (%s)\n",
+  target_debug_printf_nofunc ("<- %s->program_signals (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_signals (arg0).c_str ());
 }
@@ -1740,11 +1686,10 @@ dummy_target::thread_alive (ptid_t arg0)
 bool
 debug_target::thread_alive (ptid_t arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->thread_alive (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->thread_alive (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->thread_alive (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->thread_alive (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->thread_alive (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ptid_t (arg0).c_str (),
 	      target_debug_print_bool (result).c_str ());
@@ -1765,10 +1710,9 @@ dummy_target::update_thread_list ()
 void
 debug_target::update_thread_list ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->update_thread_list (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->update_thread_list (...)", this->beneath ()->shortname ());
   this->beneath ()->update_thread_list ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->update_thread_list ()\n",
+  target_debug_printf_nofunc ("<- %s->update_thread_list ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -1787,11 +1731,10 @@ dummy_target::pid_to_str (ptid_t arg0)
 std::string
 debug_target::pid_to_str (ptid_t arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->pid_to_str (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->pid_to_str (...)", this->beneath ()->shortname ());
   std::string result
     = this->beneath ()->pid_to_str (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->pid_to_str (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->pid_to_str (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ptid_t (arg0).c_str (),
 	      target_debug_print_std_string (result).c_str ());
@@ -1813,11 +1756,10 @@ dummy_target::extra_thread_info (thread_info *arg0)
 const char *
 debug_target::extra_thread_info (thread_info *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->extra_thread_info (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->extra_thread_info (...)", this->beneath ()->shortname ());
   const char * result
     = this->beneath ()->extra_thread_info (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->extra_thread_info (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->extra_thread_info (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_thread_info_p (arg0).c_str (),
 	      target_debug_print_const_char_p (result).c_str ());
@@ -1839,11 +1781,10 @@ dummy_target::thread_name (thread_info *arg0)
 const char *
 debug_target::thread_name (thread_info *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->thread_name (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->thread_name (...)", this->beneath ()->shortname ());
   const char * result
     = this->beneath ()->thread_name (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->thread_name (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->thread_name (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_thread_info_p (arg0).c_str (),
 	      target_debug_print_const_char_p (result).c_str ());
@@ -1865,11 +1806,10 @@ dummy_target::thread_handle_to_thread_info (const gdb_byte *arg0, int arg1, infe
 thread_info *
 debug_target::thread_handle_to_thread_info (const gdb_byte *arg0, int arg1, inferior *arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->thread_handle_to_thread_info (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->thread_handle_to_thread_info (...)", this->beneath ()->shortname ());
   thread_info * result
     = this->beneath ()->thread_handle_to_thread_info (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->thread_handle_to_thread_info (%s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->thread_handle_to_thread_info (%s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_gdb_byte_p (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str (),
@@ -1893,11 +1833,10 @@ dummy_target::thread_info_to_thread_handle (struct thread_info *arg0)
 gdb::array_view<const_gdb_byte>
 debug_target::thread_info_to_thread_handle (struct thread_info *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->thread_info_to_thread_handle (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->thread_info_to_thread_handle (...)", this->beneath ()->shortname ());
   gdb::array_view<const_gdb_byte> result
     = this->beneath ()->thread_info_to_thread_handle (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->thread_info_to_thread_handle (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->thread_info_to_thread_handle (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_thread_info_p (arg0).c_str (),
 	      target_debug_print_gdb_array_view_const_gdb_byte (result).c_str ());
@@ -1918,10 +1857,9 @@ dummy_target::stop (ptid_t arg0)
 void
 debug_target::stop (ptid_t arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->stop (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->stop (...)", this->beneath ()->shortname ());
   this->beneath ()->stop (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->stop (%s)\n",
+  target_debug_printf_nofunc ("<- %s->stop (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ptid_t (arg0).c_str ());
 }
@@ -1940,10 +1878,9 @@ dummy_target::interrupt ()
 void
 debug_target::interrupt ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->interrupt (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->interrupt (...)", this->beneath ()->shortname ());
   this->beneath ()->interrupt ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->interrupt ()\n",
+  target_debug_printf_nofunc ("<- %s->interrupt ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -1962,10 +1899,9 @@ dummy_target::pass_ctrlc ()
 void
 debug_target::pass_ctrlc ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->pass_ctrlc (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->pass_ctrlc (...)", this->beneath ()->shortname ());
   this->beneath ()->pass_ctrlc ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->pass_ctrlc ()\n",
+  target_debug_printf_nofunc ("<- %s->pass_ctrlc ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -1984,10 +1920,9 @@ dummy_target::rcmd (const char *arg0, struct ui_file *arg1)
 void
 debug_target::rcmd (const char *arg0, struct ui_file *arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->rcmd (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->rcmd (...)", this->beneath ()->shortname ());
   this->beneath ()->rcmd (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->rcmd (%s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->rcmd (%s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_char_p (arg0).c_str (),
 	      target_debug_print_ui_file_p (arg1).c_str ());
@@ -2008,11 +1943,10 @@ dummy_target::pid_to_exec_file (int arg0)
 const char *
 debug_target::pid_to_exec_file (int arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->pid_to_exec_file (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->pid_to_exec_file (...)", this->beneath ()->shortname ());
   const char * result
     = this->beneath ()->pid_to_exec_file (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->pid_to_exec_file (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->pid_to_exec_file (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (arg0).c_str (),
 	      target_debug_print_const_char_p (result).c_str ());
@@ -2033,10 +1967,9 @@ dummy_target::log_command (const char *arg0)
 void
 debug_target::log_command (const char *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->log_command (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->log_command (...)", this->beneath ()->shortname ());
   this->beneath ()->log_command (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->log_command (%s)\n",
+  target_debug_printf_nofunc ("<- %s->log_command (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_char_p (arg0).c_str ());
 }
@@ -2056,11 +1989,10 @@ dummy_target::get_section_table ()
 const std::vector<target_section> *
 debug_target::get_section_table ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->get_section_table (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->get_section_table (...)", this->beneath ()->shortname ());
   const std::vector<target_section> * result
     = this->beneath ()->get_section_table ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->get_section_table () = %s\n",
+  target_debug_printf_nofunc ("<- %s->get_section_table () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_std_vector_target_section_p (result).c_str ());
   return result;
@@ -2081,11 +2013,10 @@ dummy_target::get_thread_control_capabilities ()
 thread_control_capabilities
 debug_target::get_thread_control_capabilities ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->get_thread_control_capabilities (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->get_thread_control_capabilities (...)", this->beneath ()->shortname ());
   thread_control_capabilities result
     = this->beneath ()->get_thread_control_capabilities ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->get_thread_control_capabilities () = %s\n",
+  target_debug_printf_nofunc ("<- %s->get_thread_control_capabilities () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_thread_control_capabilities (result).c_str ());
   return result;
@@ -2106,11 +2037,10 @@ dummy_target::attach_no_wait ()
 bool
 debug_target::attach_no_wait ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->attach_no_wait (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->attach_no_wait (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->attach_no_wait ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->attach_no_wait () = %s\n",
+  target_debug_printf_nofunc ("<- %s->attach_no_wait () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -2131,11 +2061,10 @@ dummy_target::can_async_p ()
 bool
 debug_target::can_async_p ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->can_async_p (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->can_async_p (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->can_async_p ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->can_async_p () = %s\n",
+  target_debug_printf_nofunc ("<- %s->can_async_p () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -2156,11 +2085,10 @@ dummy_target::is_async_p ()
 bool
 debug_target::is_async_p ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->is_async_p (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->is_async_p (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->is_async_p ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->is_async_p () = %s\n",
+  target_debug_printf_nofunc ("<- %s->is_async_p () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -2181,10 +2109,9 @@ dummy_target::async (bool arg0)
 void
 debug_target::async (bool arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->async (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->async (...)", this->beneath ()->shortname ());
   this->beneath ()->async (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->async (%s)\n",
+  target_debug_printf_nofunc ("<- %s->async (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (arg0).c_str ());
 }
@@ -2204,11 +2131,10 @@ dummy_target::async_wait_fd ()
 int
 debug_target::async_wait_fd ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->async_wait_fd (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->async_wait_fd (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->async_wait_fd ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->async_wait_fd () = %s\n",
+  target_debug_printf_nofunc ("<- %s->async_wait_fd () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (result).c_str ());
   return result;
@@ -2229,11 +2155,10 @@ dummy_target::has_pending_events ()
 bool
 debug_target::has_pending_events ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->has_pending_events (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->has_pending_events (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->has_pending_events ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->has_pending_events () = %s\n",
+  target_debug_printf_nofunc ("<- %s->has_pending_events () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -2253,10 +2178,9 @@ dummy_target::thread_events (int arg0)
 void
 debug_target::thread_events (int arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->thread_events (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->thread_events (...)", this->beneath ()->shortname ());
   this->beneath ()->thread_events (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->thread_events (%s)\n",
+  target_debug_printf_nofunc ("<- %s->thread_events (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (arg0).c_str ());
 }
@@ -2276,11 +2200,10 @@ dummy_target::supports_set_thread_options (gdb_thread_options arg0)
 bool
 debug_target::supports_set_thread_options (gdb_thread_options arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->supports_set_thread_options (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->supports_set_thread_options (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->supports_set_thread_options (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->supports_set_thread_options (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->supports_set_thread_options (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_gdb_thread_options (arg0).c_str (),
 	      target_debug_print_bool (result).c_str ());
@@ -2302,11 +2225,10 @@ dummy_target::supports_non_stop ()
 bool
 debug_target::supports_non_stop ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->supports_non_stop (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->supports_non_stop (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->supports_non_stop ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->supports_non_stop () = %s\n",
+  target_debug_printf_nofunc ("<- %s->supports_non_stop () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -2327,11 +2249,10 @@ dummy_target::always_non_stop_p ()
 bool
 debug_target::always_non_stop_p ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->always_non_stop_p (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->always_non_stop_p (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->always_non_stop_p ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->always_non_stop_p () = %s\n",
+  target_debug_printf_nofunc ("<- %s->always_non_stop_p () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -2352,11 +2273,10 @@ dummy_target::find_memory_regions (find_memory_region_ftype arg0, void *arg1)
 int
 debug_target::find_memory_regions (find_memory_region_ftype arg0, void *arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->find_memory_regions (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->find_memory_regions (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->find_memory_regions (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->find_memory_regions (%s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->find_memory_regions (%s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_find_memory_region_ftype (arg0).c_str (),
 	      target_debug_print_void_p (arg1).c_str (),
@@ -2379,11 +2299,10 @@ dummy_target::make_corefile_notes (bfd *arg0, int *arg1)
 gdb::unique_xmalloc_ptr<char>
 debug_target::make_corefile_notes (bfd *arg0, int *arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->make_corefile_notes (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->make_corefile_notes (...)", this->beneath ()->shortname ());
   gdb::unique_xmalloc_ptr<char> result
     = this->beneath ()->make_corefile_notes (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->make_corefile_notes (%s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->make_corefile_notes (%s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bfd_p (arg0).c_str (),
 	      target_debug_print_int_p (arg1).c_str (),
@@ -2406,11 +2325,10 @@ dummy_target::get_bookmark (const char *arg0, int arg1)
 gdb_byte *
 debug_target::get_bookmark (const char *arg0, int arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->get_bookmark (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->get_bookmark (...)", this->beneath ()->shortname ());
   gdb_byte * result
     = this->beneath ()->get_bookmark (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->get_bookmark (%s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->get_bookmark (%s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_char_p (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str (),
@@ -2433,10 +2351,9 @@ dummy_target::goto_bookmark (const gdb_byte *arg0, int arg1)
 void
 debug_target::goto_bookmark (const gdb_byte *arg0, int arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->goto_bookmark (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->goto_bookmark (...)", this->beneath ()->shortname ());
   this->beneath ()->goto_bookmark (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->goto_bookmark (%s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->goto_bookmark (%s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_gdb_byte_p (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str ());
@@ -2457,11 +2374,10 @@ dummy_target::get_thread_local_address (ptid_t arg0, CORE_ADDR arg1, CORE_ADDR a
 CORE_ADDR
 debug_target::get_thread_local_address (ptid_t arg0, CORE_ADDR arg1, CORE_ADDR arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->get_thread_local_address (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->get_thread_local_address (...)", this->beneath ()->shortname ());
   CORE_ADDR result
     = this->beneath ()->get_thread_local_address (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->get_thread_local_address (%s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->get_thread_local_address (%s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ptid_t (arg0).c_str (),
 	      target_debug_print_CORE_ADDR (arg1).c_str (),
@@ -2485,11 +2401,10 @@ dummy_target::xfer_partial (enum target_object arg0, const char *arg1, gdb_byte
 enum target_xfer_status
 debug_target::xfer_partial (enum target_object arg0, const char *arg1, gdb_byte *arg2, const gdb_byte *arg3, ULONGEST arg4, ULONGEST arg5, ULONGEST *arg6)
 {
-  gdb_printf (gdb_stdlog, "-> %s->xfer_partial (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->xfer_partial (...)", this->beneath ()->shortname ());
   enum target_xfer_status result
     = this->beneath ()->xfer_partial (arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->xfer_partial (%s, %s, %s, %s, %s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->xfer_partial (%s, %s, %s, %s, %s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_target_object (arg0).c_str (),
 	      target_debug_print_const_char_p (arg1).c_str (),
@@ -2517,11 +2432,10 @@ dummy_target::get_memory_xfer_limit ()
 ULONGEST
 debug_target::get_memory_xfer_limit ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->get_memory_xfer_limit (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->get_memory_xfer_limit (...)", this->beneath ()->shortname ());
   ULONGEST result
     = this->beneath ()->get_memory_xfer_limit ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->get_memory_xfer_limit () = %s\n",
+  target_debug_printf_nofunc ("<- %s->get_memory_xfer_limit () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ULONGEST (result).c_str ());
   return result;
@@ -2542,11 +2456,10 @@ dummy_target::memory_map ()
 std::vector<mem_region>
 debug_target::memory_map ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->memory_map (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->memory_map (...)", this->beneath ()->shortname ());
   std::vector<mem_region> result
     = this->beneath ()->memory_map ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->memory_map () = %s\n",
+  target_debug_printf_nofunc ("<- %s->memory_map () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_std_vector_mem_region (result).c_str ());
   return result;
@@ -2567,10 +2480,9 @@ dummy_target::flash_erase (ULONGEST arg0, LONGEST arg1)
 void
 debug_target::flash_erase (ULONGEST arg0, LONGEST arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->flash_erase (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->flash_erase (...)", this->beneath ()->shortname ());
   this->beneath ()->flash_erase (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->flash_erase (%s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->flash_erase (%s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ULONGEST (arg0).c_str (),
 	      target_debug_print_LONGEST (arg1).c_str ());
@@ -2591,10 +2503,9 @@ dummy_target::flash_done ()
 void
 debug_target::flash_done ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->flash_done (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->flash_done (...)", this->beneath ()->shortname ());
   this->beneath ()->flash_done ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->flash_done ()\n",
+  target_debug_printf_nofunc ("<- %s->flash_done ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -2613,11 +2524,10 @@ dummy_target::read_description ()
 const struct target_desc *
 debug_target::read_description ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->read_description (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->read_description (...)", this->beneath ()->shortname ());
   const struct target_desc * result
     = this->beneath ()->read_description ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->read_description () = %s\n",
+  target_debug_printf_nofunc ("<- %s->read_description () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_target_desc_p (result).c_str ());
   return result;
@@ -2638,11 +2548,10 @@ dummy_target::get_ada_task_ptid (long arg0, ULONGEST arg1)
 ptid_t
 debug_target::get_ada_task_ptid (long arg0, ULONGEST arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->get_ada_task_ptid (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->get_ada_task_ptid (...)", this->beneath ()->shortname ());
   ptid_t result
     = this->beneath ()->get_ada_task_ptid (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->get_ada_task_ptid (%s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->get_ada_task_ptid (%s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_long (arg0).c_str (),
 	      target_debug_print_ULONGEST (arg1).c_str (),
@@ -2665,11 +2574,10 @@ dummy_target::auxv_parse (const gdb_byte **arg0, const gdb_byte *arg1, CORE_ADDR
 int
 debug_target::auxv_parse (const gdb_byte **arg0, const gdb_byte *arg1, CORE_ADDR *arg2, CORE_ADDR *arg3)
 {
-  gdb_printf (gdb_stdlog, "-> %s->auxv_parse (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->auxv_parse (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->auxv_parse (arg0, arg1, arg2, arg3);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->auxv_parse (%s, %s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->auxv_parse (%s, %s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_gdb_byte_pp (arg0).c_str (),
 	      target_debug_print_const_gdb_byte_p (arg1).c_str (),
@@ -2694,11 +2602,10 @@ dummy_target::search_memory (CORE_ADDR arg0, ULONGEST arg1, const gdb_byte *arg2
 int
 debug_target::search_memory (CORE_ADDR arg0, ULONGEST arg1, const gdb_byte *arg2, ULONGEST arg3, CORE_ADDR *arg4)
 {
-  gdb_printf (gdb_stdlog, "-> %s->search_memory (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->search_memory (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->search_memory (arg0, arg1, arg2, arg3, arg4);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->search_memory (%s, %s, %s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->search_memory (%s, %s, %s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_CORE_ADDR (arg0).c_str (),
 	      target_debug_print_ULONGEST (arg1).c_str (),
@@ -2724,11 +2631,10 @@ dummy_target::can_execute_reverse ()
 bool
 debug_target::can_execute_reverse ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->can_execute_reverse (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->can_execute_reverse (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->can_execute_reverse ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->can_execute_reverse () = %s\n",
+  target_debug_printf_nofunc ("<- %s->can_execute_reverse () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -2749,11 +2655,10 @@ dummy_target::execution_direction ()
 enum exec_direction_kind
 debug_target::execution_direction ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->execution_direction (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->execution_direction (...)", this->beneath ()->shortname ());
   enum exec_direction_kind result
     = this->beneath ()->execution_direction ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->execution_direction () = %s\n",
+  target_debug_printf_nofunc ("<- %s->execution_direction () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_exec_direction_kind (result).c_str ());
   return result;
@@ -2774,11 +2679,10 @@ dummy_target::supports_multi_process ()
 bool
 debug_target::supports_multi_process ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->supports_multi_process (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->supports_multi_process (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->supports_multi_process ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->supports_multi_process () = %s\n",
+  target_debug_printf_nofunc ("<- %s->supports_multi_process () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -2799,11 +2703,10 @@ dummy_target::supports_enable_disable_tracepoint ()
 bool
 debug_target::supports_enable_disable_tracepoint ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->supports_enable_disable_tracepoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->supports_enable_disable_tracepoint (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->supports_enable_disable_tracepoint ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->supports_enable_disable_tracepoint () = %s\n",
+  target_debug_printf_nofunc ("<- %s->supports_enable_disable_tracepoint () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -2824,11 +2727,10 @@ dummy_target::supports_disable_randomization ()
 bool
 debug_target::supports_disable_randomization ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->supports_disable_randomization (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->supports_disable_randomization (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->supports_disable_randomization ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->supports_disable_randomization () = %s\n",
+  target_debug_printf_nofunc ("<- %s->supports_disable_randomization () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -2849,11 +2751,10 @@ dummy_target::supports_string_tracing ()
 bool
 debug_target::supports_string_tracing ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->supports_string_tracing (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->supports_string_tracing (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->supports_string_tracing ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->supports_string_tracing () = %s\n",
+  target_debug_printf_nofunc ("<- %s->supports_string_tracing () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -2874,11 +2775,10 @@ dummy_target::supports_evaluation_of_breakpoint_conditions ()
 bool
 debug_target::supports_evaluation_of_breakpoint_conditions ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->supports_evaluation_of_breakpoint_conditions (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->supports_evaluation_of_breakpoint_conditions (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->supports_evaluation_of_breakpoint_conditions ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->supports_evaluation_of_breakpoint_conditions () = %s\n",
+  target_debug_printf_nofunc ("<- %s->supports_evaluation_of_breakpoint_conditions () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -2899,11 +2799,10 @@ dummy_target::supports_dumpcore ()
 bool
 debug_target::supports_dumpcore ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->supports_dumpcore (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->supports_dumpcore (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->supports_dumpcore ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->supports_dumpcore () = %s\n",
+  target_debug_printf_nofunc ("<- %s->supports_dumpcore () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -2923,10 +2822,9 @@ dummy_target::dumpcore (const char *arg0)
 void
 debug_target::dumpcore (const char *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->dumpcore (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->dumpcore (...)", this->beneath ()->shortname ());
   this->beneath ()->dumpcore (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->dumpcore (%s)\n",
+  target_debug_printf_nofunc ("<- %s->dumpcore (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_char_p (arg0).c_str ());
 }
@@ -2946,11 +2844,10 @@ dummy_target::can_run_breakpoint_commands ()
 bool
 debug_target::can_run_breakpoint_commands ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->can_run_breakpoint_commands (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->can_run_breakpoint_commands (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->can_run_breakpoint_commands ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->can_run_breakpoint_commands () = %s\n",
+  target_debug_printf_nofunc ("<- %s->can_run_breakpoint_commands () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -2971,11 +2868,10 @@ dummy_target::thread_architecture (ptid_t arg0)
 struct gdbarch *
 debug_target::thread_architecture (ptid_t arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->thread_architecture (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->thread_architecture (...)", this->beneath ()->shortname ());
   struct gdbarch * result
     = this->beneath ()->thread_architecture (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->thread_architecture (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->thread_architecture (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ptid_t (arg0).c_str (),
 	      target_debug_print_gdbarch_p (result).c_str ());
@@ -2997,11 +2893,10 @@ dummy_target::filesystem_is_local ()
 bool
 debug_target::filesystem_is_local ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->filesystem_is_local (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->filesystem_is_local (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->filesystem_is_local ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->filesystem_is_local () = %s\n",
+  target_debug_printf_nofunc ("<- %s->filesystem_is_local () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -3022,10 +2917,9 @@ dummy_target::trace_init ()
 void
 debug_target::trace_init ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->trace_init (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->trace_init (...)", this->beneath ()->shortname ());
   this->beneath ()->trace_init ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->trace_init ()\n",
+  target_debug_printf_nofunc ("<- %s->trace_init ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -3044,10 +2938,9 @@ dummy_target::download_tracepoint (struct bp_location *arg0)
 void
 debug_target::download_tracepoint (struct bp_location *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->download_tracepoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->download_tracepoint (...)", this->beneath ()->shortname ());
   this->beneath ()->download_tracepoint (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->download_tracepoint (%s)\n",
+  target_debug_printf_nofunc ("<- %s->download_tracepoint (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bp_location_p (arg0).c_str ());
 }
@@ -3067,11 +2960,10 @@ dummy_target::can_download_tracepoint ()
 bool
 debug_target::can_download_tracepoint ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->can_download_tracepoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->can_download_tracepoint (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->can_download_tracepoint ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->can_download_tracepoint () = %s\n",
+  target_debug_printf_nofunc ("<- %s->can_download_tracepoint () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -3092,10 +2984,9 @@ dummy_target::download_trace_state_variable (const trace_state_variable &arg0)
 void
 debug_target::download_trace_state_variable (const trace_state_variable &arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->download_trace_state_variable (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->download_trace_state_variable (...)", this->beneath ()->shortname ());
   this->beneath ()->download_trace_state_variable (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->download_trace_state_variable (%s)\n",
+  target_debug_printf_nofunc ("<- %s->download_trace_state_variable (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_trace_state_variable_r (arg0).c_str ());
 }
@@ -3115,10 +3006,9 @@ dummy_target::enable_tracepoint (struct bp_location *arg0)
 void
 debug_target::enable_tracepoint (struct bp_location *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->enable_tracepoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->enable_tracepoint (...)", this->beneath ()->shortname ());
   this->beneath ()->enable_tracepoint (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->enable_tracepoint (%s)\n",
+  target_debug_printf_nofunc ("<- %s->enable_tracepoint (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bp_location_p (arg0).c_str ());
 }
@@ -3138,10 +3028,9 @@ dummy_target::disable_tracepoint (struct bp_location *arg0)
 void
 debug_target::disable_tracepoint (struct bp_location *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->disable_tracepoint (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->disable_tracepoint (...)", this->beneath ()->shortname ());
   this->beneath ()->disable_tracepoint (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->disable_tracepoint (%s)\n",
+  target_debug_printf_nofunc ("<- %s->disable_tracepoint (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bp_location_p (arg0).c_str ());
 }
@@ -3161,10 +3050,9 @@ dummy_target::trace_set_readonly_regions ()
 void
 debug_target::trace_set_readonly_regions ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->trace_set_readonly_regions (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->trace_set_readonly_regions (...)", this->beneath ()->shortname ());
   this->beneath ()->trace_set_readonly_regions ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->trace_set_readonly_regions ()\n",
+  target_debug_printf_nofunc ("<- %s->trace_set_readonly_regions ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -3183,10 +3071,9 @@ dummy_target::trace_start ()
 void
 debug_target::trace_start ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->trace_start (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->trace_start (...)", this->beneath ()->shortname ());
   this->beneath ()->trace_start ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->trace_start ()\n",
+  target_debug_printf_nofunc ("<- %s->trace_start ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -3205,11 +3092,10 @@ dummy_target::get_trace_status (struct trace_status *arg0)
 int
 debug_target::get_trace_status (struct trace_status *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->get_trace_status (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->get_trace_status (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->get_trace_status (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->get_trace_status (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->get_trace_status (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_trace_status_p (arg0).c_str (),
 	      target_debug_print_int (result).c_str ());
@@ -3231,10 +3117,9 @@ dummy_target::get_tracepoint_status (tracepoint *arg0, struct uploaded_tp *arg1)
 void
 debug_target::get_tracepoint_status (tracepoint *arg0, struct uploaded_tp *arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->get_tracepoint_status (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->get_tracepoint_status (...)", this->beneath ()->shortname ());
   this->beneath ()->get_tracepoint_status (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->get_tracepoint_status (%s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->get_tracepoint_status (%s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_tracepoint_p (arg0).c_str (),
 	      target_debug_print_uploaded_tp_p (arg1).c_str ());
@@ -3255,10 +3140,9 @@ dummy_target::trace_stop ()
 void
 debug_target::trace_stop ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->trace_stop (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->trace_stop (...)", this->beneath ()->shortname ());
   this->beneath ()->trace_stop ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->trace_stop ()\n",
+  target_debug_printf_nofunc ("<- %s->trace_stop ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -3277,11 +3161,10 @@ dummy_target::trace_find (enum trace_find_type arg0, int arg1, CORE_ADDR arg2, C
 int
 debug_target::trace_find (enum trace_find_type arg0, int arg1, CORE_ADDR arg2, CORE_ADDR arg3, int *arg4)
 {
-  gdb_printf (gdb_stdlog, "-> %s->trace_find (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->trace_find (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->trace_find (arg0, arg1, arg2, arg3, arg4);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->trace_find (%s, %s, %s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->trace_find (%s, %s, %s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_trace_find_type (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str (),
@@ -3307,11 +3190,10 @@ dummy_target::get_trace_state_variable_value (int arg0, LONGEST *arg1)
 bool
 debug_target::get_trace_state_variable_value (int arg0, LONGEST *arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->get_trace_state_variable_value (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->get_trace_state_variable_value (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->get_trace_state_variable_value (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->get_trace_state_variable_value (%s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->get_trace_state_variable_value (%s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (arg0).c_str (),
 	      target_debug_print_LONGEST_p (arg1).c_str (),
@@ -3334,11 +3216,10 @@ dummy_target::save_trace_data (const char *arg0)
 int
 debug_target::save_trace_data (const char *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->save_trace_data (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->save_trace_data (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->save_trace_data (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->save_trace_data (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->save_trace_data (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_char_p (arg0).c_str (),
 	      target_debug_print_int (result).c_str ());
@@ -3360,11 +3241,10 @@ dummy_target::upload_tracepoints (struct uploaded_tp **arg0)
 int
 debug_target::upload_tracepoints (struct uploaded_tp **arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->upload_tracepoints (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->upload_tracepoints (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->upload_tracepoints (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->upload_tracepoints (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->upload_tracepoints (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_uploaded_tp_pp (arg0).c_str (),
 	      target_debug_print_int (result).c_str ());
@@ -3386,11 +3266,10 @@ dummy_target::upload_trace_state_variables (struct uploaded_tsv **arg0)
 int
 debug_target::upload_trace_state_variables (struct uploaded_tsv **arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->upload_trace_state_variables (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->upload_trace_state_variables (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->upload_trace_state_variables (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->upload_trace_state_variables (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->upload_trace_state_variables (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_uploaded_tsv_pp (arg0).c_str (),
 	      target_debug_print_int (result).c_str ());
@@ -3412,11 +3291,10 @@ dummy_target::get_raw_trace_data (gdb_byte *arg0, ULONGEST arg1, LONGEST arg2)
 LONGEST
 debug_target::get_raw_trace_data (gdb_byte *arg0, ULONGEST arg1, LONGEST arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->get_raw_trace_data (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->get_raw_trace_data (...)", this->beneath ()->shortname ());
   LONGEST result
     = this->beneath ()->get_raw_trace_data (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->get_raw_trace_data (%s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->get_raw_trace_data (%s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_gdb_byte_p (arg0).c_str (),
 	      target_debug_print_ULONGEST (arg1).c_str (),
@@ -3440,11 +3318,10 @@ dummy_target::get_min_fast_tracepoint_insn_len ()
 int
 debug_target::get_min_fast_tracepoint_insn_len ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->get_min_fast_tracepoint_insn_len (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->get_min_fast_tracepoint_insn_len (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->get_min_fast_tracepoint_insn_len ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->get_min_fast_tracepoint_insn_len () = %s\n",
+  target_debug_printf_nofunc ("<- %s->get_min_fast_tracepoint_insn_len () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (result).c_str ());
   return result;
@@ -3464,10 +3341,9 @@ dummy_target::set_disconnected_tracing (int arg0)
 void
 debug_target::set_disconnected_tracing (int arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->set_disconnected_tracing (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->set_disconnected_tracing (...)", this->beneath ()->shortname ());
   this->beneath ()->set_disconnected_tracing (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->set_disconnected_tracing (%s)\n",
+  target_debug_printf_nofunc ("<- %s->set_disconnected_tracing (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (arg0).c_str ());
 }
@@ -3486,10 +3362,9 @@ dummy_target::set_circular_trace_buffer (int arg0)
 void
 debug_target::set_circular_trace_buffer (int arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->set_circular_trace_buffer (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->set_circular_trace_buffer (...)", this->beneath ()->shortname ());
   this->beneath ()->set_circular_trace_buffer (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->set_circular_trace_buffer (%s)\n",
+  target_debug_printf_nofunc ("<- %s->set_circular_trace_buffer (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (arg0).c_str ());
 }
@@ -3508,10 +3383,9 @@ dummy_target::set_trace_buffer_size (LONGEST arg0)
 void
 debug_target::set_trace_buffer_size (LONGEST arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->set_trace_buffer_size (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->set_trace_buffer_size (...)", this->beneath ()->shortname ());
   this->beneath ()->set_trace_buffer_size (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->set_trace_buffer_size (%s)\n",
+  target_debug_printf_nofunc ("<- %s->set_trace_buffer_size (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_LONGEST (arg0).c_str ());
 }
@@ -3531,11 +3405,10 @@ dummy_target::set_trace_notes (const char *arg0, const char *arg1, const char *a
 bool
 debug_target::set_trace_notes (const char *arg0, const char *arg1, const char *arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->set_trace_notes (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->set_trace_notes (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->set_trace_notes (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->set_trace_notes (%s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->set_trace_notes (%s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_char_p (arg0).c_str (),
 	      target_debug_print_const_char_p (arg1).c_str (),
@@ -3559,11 +3432,10 @@ dummy_target::core_of_thread (ptid_t arg0)
 int
 debug_target::core_of_thread (ptid_t arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->core_of_thread (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->core_of_thread (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->core_of_thread (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->core_of_thread (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->core_of_thread (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ptid_t (arg0).c_str (),
 	      target_debug_print_int (result).c_str ());
@@ -3585,11 +3457,10 @@ dummy_target::verify_memory (const gdb_byte *arg0, CORE_ADDR arg1, ULONGEST arg2
 int
 debug_target::verify_memory (const gdb_byte *arg0, CORE_ADDR arg1, ULONGEST arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->verify_memory (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->verify_memory (...)", this->beneath ()->shortname ());
   int result
     = this->beneath ()->verify_memory (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->verify_memory (%s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->verify_memory (%s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_gdb_byte_p (arg0).c_str (),
 	      target_debug_print_CORE_ADDR (arg1).c_str (),
@@ -3613,11 +3484,10 @@ dummy_target::get_tib_address (ptid_t arg0, CORE_ADDR *arg1)
 bool
 debug_target::get_tib_address (ptid_t arg0, CORE_ADDR *arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->get_tib_address (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->get_tib_address (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->get_tib_address (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->get_tib_address (%s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->get_tib_address (%s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ptid_t (arg0).c_str (),
 	      target_debug_print_CORE_ADDR_p (arg1).c_str (),
@@ -3639,10 +3509,9 @@ dummy_target::set_permissions ()
 void
 debug_target::set_permissions ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->set_permissions (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->set_permissions (...)", this->beneath ()->shortname ());
   this->beneath ()->set_permissions ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->set_permissions ()\n",
+  target_debug_printf_nofunc ("<- %s->set_permissions ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -3661,11 +3530,10 @@ dummy_target::static_tracepoint_marker_at (CORE_ADDR arg0, static_tracepoint_mar
 bool
 debug_target::static_tracepoint_marker_at (CORE_ADDR arg0, static_tracepoint_marker *arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->static_tracepoint_marker_at (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->static_tracepoint_marker_at (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->static_tracepoint_marker_at (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->static_tracepoint_marker_at (%s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->static_tracepoint_marker_at (%s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_CORE_ADDR (arg0).c_str (),
 	      target_debug_print_static_tracepoint_marker_p (arg1).c_str (),
@@ -3688,11 +3556,10 @@ dummy_target::static_tracepoint_markers_by_strid (const char *arg0)
 std::vector<static_tracepoint_marker>
 debug_target::static_tracepoint_markers_by_strid (const char *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->static_tracepoint_markers_by_strid (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->static_tracepoint_markers_by_strid (...)", this->beneath ()->shortname ());
   std::vector<static_tracepoint_marker> result
     = this->beneath ()->static_tracepoint_markers_by_strid (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->static_tracepoint_markers_by_strid (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->static_tracepoint_markers_by_strid (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_char_p (arg0).c_str (),
 	      target_debug_print_std_vector_static_tracepoint_marker (result).c_str ());
@@ -3714,11 +3581,10 @@ dummy_target::traceframe_info ()
 traceframe_info_up
 debug_target::traceframe_info ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->traceframe_info (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->traceframe_info (...)", this->beneath ()->shortname ());
   traceframe_info_up result
     = this->beneath ()->traceframe_info ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->traceframe_info () = %s\n",
+  target_debug_printf_nofunc ("<- %s->traceframe_info () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_traceframe_info_up (result).c_str ());
   return result;
@@ -3739,11 +3605,10 @@ dummy_target::use_agent (bool arg0)
 bool
 debug_target::use_agent (bool arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->use_agent (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->use_agent (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->use_agent (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->use_agent (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->use_agent (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (arg0).c_str (),
 	      target_debug_print_bool (result).c_str ());
@@ -3765,11 +3630,10 @@ dummy_target::can_use_agent ()
 bool
 debug_target::can_use_agent ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->can_use_agent (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->can_use_agent (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->can_use_agent ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->can_use_agent () = %s\n",
+  target_debug_printf_nofunc ("<- %s->can_use_agent () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -3790,11 +3654,10 @@ dummy_target::enable_btrace (thread_info *arg0, const struct btrace_config *arg1
 struct btrace_target_info *
 debug_target::enable_btrace (thread_info *arg0, const struct btrace_config *arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->enable_btrace (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->enable_btrace (...)", this->beneath ()->shortname ());
   struct btrace_target_info * result
     = this->beneath ()->enable_btrace (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->enable_btrace (%s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->enable_btrace (%s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_thread_info_p (arg0).c_str (),
 	      target_debug_print_const_btrace_config_p (arg1).c_str (),
@@ -3817,10 +3680,9 @@ dummy_target::disable_btrace (struct btrace_target_info *arg0)
 void
 debug_target::disable_btrace (struct btrace_target_info *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->disable_btrace (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->disable_btrace (...)", this->beneath ()->shortname ());
   this->beneath ()->disable_btrace (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->disable_btrace (%s)\n",
+  target_debug_printf_nofunc ("<- %s->disable_btrace (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_btrace_target_info_p (arg0).c_str ());
 }
@@ -3840,10 +3702,9 @@ dummy_target::teardown_btrace (struct btrace_target_info *arg0)
 void
 debug_target::teardown_btrace (struct btrace_target_info *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->teardown_btrace (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->teardown_btrace (...)", this->beneath ()->shortname ());
   this->beneath ()->teardown_btrace (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->teardown_btrace (%s)\n",
+  target_debug_printf_nofunc ("<- %s->teardown_btrace (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_btrace_target_info_p (arg0).c_str ());
 }
@@ -3863,11 +3724,10 @@ dummy_target::read_btrace (struct btrace_data *arg0, struct btrace_target_info *
 enum btrace_error
 debug_target::read_btrace (struct btrace_data *arg0, struct btrace_target_info *arg1, enum btrace_read_type arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->read_btrace (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->read_btrace (...)", this->beneath ()->shortname ());
   enum btrace_error result
     = this->beneath ()->read_btrace (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->read_btrace (%s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->read_btrace (%s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_btrace_data_p (arg0).c_str (),
 	      target_debug_print_btrace_target_info_p (arg1).c_str (),
@@ -3891,11 +3751,10 @@ dummy_target::btrace_conf (const struct btrace_target_info *arg0)
 const struct btrace_config *
 debug_target::btrace_conf (const struct btrace_target_info *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->btrace_conf (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->btrace_conf (...)", this->beneath ()->shortname ());
   const struct btrace_config * result
     = this->beneath ()->btrace_conf (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->btrace_conf (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->btrace_conf (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_btrace_target_info_p (arg0).c_str (),
 	      target_debug_print_const_btrace_config_p (result).c_str ());
@@ -3917,11 +3776,10 @@ dummy_target::record_method (ptid_t arg0)
 enum record_method
 debug_target::record_method (ptid_t arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->record_method (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->record_method (...)", this->beneath ()->shortname ());
   enum record_method result
     = this->beneath ()->record_method (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->record_method (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->record_method (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ptid_t (arg0).c_str (),
 	      target_debug_print_record_method (result).c_str ());
@@ -3942,10 +3800,9 @@ dummy_target::stop_recording ()
 void
 debug_target::stop_recording ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->stop_recording (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->stop_recording (...)", this->beneath ()->shortname ());
   this->beneath ()->stop_recording ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->stop_recording ()\n",
+  target_debug_printf_nofunc ("<- %s->stop_recording ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -3963,10 +3820,9 @@ dummy_target::info_record ()
 void
 debug_target::info_record ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->info_record (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->info_record (...)", this->beneath ()->shortname ());
   this->beneath ()->info_record ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->info_record ()\n",
+  target_debug_printf_nofunc ("<- %s->info_record ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -3985,10 +3841,9 @@ dummy_target::save_record (const char *arg0)
 void
 debug_target::save_record (const char *arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->save_record (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->save_record (...)", this->beneath ()->shortname ());
   this->beneath ()->save_record (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->save_record (%s)\n",
+  target_debug_printf_nofunc ("<- %s->save_record (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_char_p (arg0).c_str ());
 }
@@ -4008,11 +3863,10 @@ dummy_target::supports_delete_record ()
 bool
 debug_target::supports_delete_record ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->supports_delete_record (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->supports_delete_record (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->supports_delete_record ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->supports_delete_record () = %s\n",
+  target_debug_printf_nofunc ("<- %s->supports_delete_record () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -4033,10 +3887,9 @@ dummy_target::delete_record ()
 void
 debug_target::delete_record ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->delete_record (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->delete_record (...)", this->beneath ()->shortname ());
   this->beneath ()->delete_record ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->delete_record ()\n",
+  target_debug_printf_nofunc ("<- %s->delete_record ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -4055,11 +3908,10 @@ dummy_target::record_is_replaying (ptid_t arg0)
 bool
 debug_target::record_is_replaying (ptid_t arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->record_is_replaying (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->record_is_replaying (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->record_is_replaying (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->record_is_replaying (%s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->record_is_replaying (%s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ptid_t (arg0).c_str (),
 	      target_debug_print_bool (result).c_str ());
@@ -4081,11 +3933,10 @@ dummy_target::record_will_replay (ptid_t arg0, int arg1)
 bool
 debug_target::record_will_replay (ptid_t arg0, int arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->record_will_replay (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->record_will_replay (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->record_will_replay (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->record_will_replay (%s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->record_will_replay (%s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ptid_t (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str (),
@@ -4107,10 +3958,9 @@ dummy_target::record_stop_replaying ()
 void
 debug_target::record_stop_replaying ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->record_stop_replaying (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->record_stop_replaying (...)", this->beneath ()->shortname ());
   this->beneath ()->record_stop_replaying ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->record_stop_replaying ()\n",
+  target_debug_printf_nofunc ("<- %s->record_stop_replaying ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -4129,10 +3979,9 @@ dummy_target::goto_record_begin ()
 void
 debug_target::goto_record_begin ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->goto_record_begin (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->goto_record_begin (...)", this->beneath ()->shortname ());
   this->beneath ()->goto_record_begin ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->goto_record_begin ()\n",
+  target_debug_printf_nofunc ("<- %s->goto_record_begin ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -4151,10 +4000,9 @@ dummy_target::goto_record_end ()
 void
 debug_target::goto_record_end ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->goto_record_end (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->goto_record_end (...)", this->beneath ()->shortname ());
   this->beneath ()->goto_record_end ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->goto_record_end ()\n",
+  target_debug_printf_nofunc ("<- %s->goto_record_end ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -4173,10 +4021,9 @@ dummy_target::goto_record (ULONGEST arg0)
 void
 debug_target::goto_record (ULONGEST arg0)
 {
-  gdb_printf (gdb_stdlog, "-> %s->goto_record (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->goto_record (...)", this->beneath ()->shortname ());
   this->beneath ()->goto_record (arg0);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->goto_record (%s)\n",
+  target_debug_printf_nofunc ("<- %s->goto_record (%s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ULONGEST (arg0).c_str ());
 }
@@ -4196,10 +4043,9 @@ dummy_target::insn_history (int arg0, gdb_disassembly_flags arg1)
 void
 debug_target::insn_history (int arg0, gdb_disassembly_flags arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->insn_history (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->insn_history (...)", this->beneath ()->shortname ());
   this->beneath ()->insn_history (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->insn_history (%s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->insn_history (%s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (arg0).c_str (),
 	      target_debug_print_gdb_disassembly_flags (arg1).c_str ());
@@ -4220,10 +4066,9 @@ dummy_target::insn_history_from (ULONGEST arg0, int arg1, gdb_disassembly_flags
 void
 debug_target::insn_history_from (ULONGEST arg0, int arg1, gdb_disassembly_flags arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->insn_history_from (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->insn_history_from (...)", this->beneath ()->shortname ());
   this->beneath ()->insn_history_from (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->insn_history_from (%s, %s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->insn_history_from (%s, %s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ULONGEST (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str (),
@@ -4245,10 +4090,9 @@ dummy_target::insn_history_range (ULONGEST arg0, ULONGEST arg1, gdb_disassembly_
 void
 debug_target::insn_history_range (ULONGEST arg0, ULONGEST arg1, gdb_disassembly_flags arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->insn_history_range (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->insn_history_range (...)", this->beneath ()->shortname ());
   this->beneath ()->insn_history_range (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->insn_history_range (%s, %s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->insn_history_range (%s, %s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ULONGEST (arg0).c_str (),
 	      target_debug_print_ULONGEST (arg1).c_str (),
@@ -4270,10 +4114,9 @@ dummy_target::call_history (int arg0, record_print_flags arg1)
 void
 debug_target::call_history (int arg0, record_print_flags arg1)
 {
-  gdb_printf (gdb_stdlog, "-> %s->call_history (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->call_history (...)", this->beneath ()->shortname ());
   this->beneath ()->call_history (arg0, arg1);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->call_history (%s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->call_history (%s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_int (arg0).c_str (),
 	      target_debug_print_record_print_flags (arg1).c_str ());
@@ -4294,10 +4137,9 @@ dummy_target::call_history_from (ULONGEST arg0, int arg1, record_print_flags arg
 void
 debug_target::call_history_from (ULONGEST arg0, int arg1, record_print_flags arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->call_history_from (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->call_history_from (...)", this->beneath ()->shortname ());
   this->beneath ()->call_history_from (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->call_history_from (%s, %s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->call_history_from (%s, %s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ULONGEST (arg0).c_str (),
 	      target_debug_print_int (arg1).c_str (),
@@ -4319,10 +4161,9 @@ dummy_target::call_history_range (ULONGEST arg0, ULONGEST arg1, record_print_fla
 void
 debug_target::call_history_range (ULONGEST arg0, ULONGEST arg1, record_print_flags arg2)
 {
-  gdb_printf (gdb_stdlog, "-> %s->call_history_range (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->call_history_range (...)", this->beneath ()->shortname ());
   this->beneath ()->call_history_range (arg0, arg1, arg2);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->call_history_range (%s, %s, %s)\n",
+  target_debug_printf_nofunc ("<- %s->call_history_range (%s, %s, %s)",
 	      this->beneath ()->shortname (),
 	      target_debug_print_ULONGEST (arg0).c_str (),
 	      target_debug_print_ULONGEST (arg1).c_str (),
@@ -4344,11 +4185,10 @@ dummy_target::augmented_libraries_svr4_read ()
 bool
 debug_target::augmented_libraries_svr4_read ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->augmented_libraries_svr4_read (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->augmented_libraries_svr4_read (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->augmented_libraries_svr4_read ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->augmented_libraries_svr4_read () = %s\n",
+  target_debug_printf_nofunc ("<- %s->augmented_libraries_svr4_read () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -4369,11 +4209,10 @@ dummy_target::get_unwinder ()
 const struct frame_unwind *
 debug_target::get_unwinder ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->get_unwinder (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->get_unwinder (...)", this->beneath ()->shortname ());
   const struct frame_unwind * result
     = this->beneath ()->get_unwinder ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->get_unwinder () = %s\n",
+  target_debug_printf_nofunc ("<- %s->get_unwinder () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_frame_unwind_p (result).c_str ());
   return result;
@@ -4394,11 +4233,10 @@ dummy_target::get_tailcall_unwinder ()
 const struct frame_unwind *
 debug_target::get_tailcall_unwinder ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->get_tailcall_unwinder (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->get_tailcall_unwinder (...)", this->beneath ()->shortname ());
   const struct frame_unwind * result
     = this->beneath ()->get_tailcall_unwinder ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->get_tailcall_unwinder () = %s\n",
+  target_debug_printf_nofunc ("<- %s->get_tailcall_unwinder () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_const_frame_unwind_p (result).c_str ());
   return result;
@@ -4418,10 +4256,9 @@ dummy_target::prepare_to_generate_core ()
 void
 debug_target::prepare_to_generate_core ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->prepare_to_generate_core (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->prepare_to_generate_core (...)", this->beneath ()->shortname ());
   this->beneath ()->prepare_to_generate_core ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->prepare_to_generate_core ()\n",
+  target_debug_printf_nofunc ("<- %s->prepare_to_generate_core ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -4439,10 +4276,9 @@ dummy_target::done_generating_core ()
 void
 debug_target::done_generating_core ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->done_generating_core (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->done_generating_core (...)", this->beneath ()->shortname ());
   this->beneath ()->done_generating_core ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->done_generating_core ()\n",
+  target_debug_printf_nofunc ("<- %s->done_generating_core ()",
 	      this->beneath ()->shortname ());
 }
 
@@ -4461,11 +4297,10 @@ dummy_target::supports_memory_tagging ()
 bool
 debug_target::supports_memory_tagging ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->supports_memory_tagging (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->supports_memory_tagging (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->supports_memory_tagging ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->supports_memory_tagging () = %s\n",
+  target_debug_printf_nofunc ("<- %s->supports_memory_tagging () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_bool (result).c_str ());
   return result;
@@ -4486,11 +4321,10 @@ dummy_target::fetch_memtags (CORE_ADDR arg0, size_t arg1, gdb::byte_vector &arg2
 bool
 debug_target::fetch_memtags (CORE_ADDR arg0, size_t arg1, gdb::byte_vector &arg2, int arg3)
 {
-  gdb_printf (gdb_stdlog, "-> %s->fetch_memtags (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->fetch_memtags (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->fetch_memtags (arg0, arg1, arg2, arg3);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->fetch_memtags (%s, %s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->fetch_memtags (%s, %s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_CORE_ADDR (arg0).c_str (),
 	      target_debug_print_size_t (arg1).c_str (),
@@ -4515,11 +4349,10 @@ dummy_target::store_memtags (CORE_ADDR arg0, size_t arg1, const gdb::byte_vector
 bool
 debug_target::store_memtags (CORE_ADDR arg0, size_t arg1, const gdb::byte_vector &arg2, int arg3)
 {
-  gdb_printf (gdb_stdlog, "-> %s->store_memtags (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->store_memtags (...)", this->beneath ()->shortname ());
   bool result
     = this->beneath ()->store_memtags (arg0, arg1, arg2, arg3);
-  gdb_printf (gdb_stdlog,
-	      "<- %s->store_memtags (%s, %s, %s, %s) = %s\n",
+  target_debug_printf_nofunc ("<- %s->store_memtags (%s, %s, %s, %s) = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_CORE_ADDR (arg0).c_str (),
 	      target_debug_print_size_t (arg1).c_str (),
@@ -4572,11 +4405,10 @@ dummy_target::fetch_x86_xsave_layout ()
 x86_xsave_layout
 debug_target::fetch_x86_xsave_layout ()
 {
-  gdb_printf (gdb_stdlog, "-> %s->fetch_x86_xsave_layout (...)\n", this->beneath ()->shortname ());
+  target_debug_printf_nofunc ("-> %s->fetch_x86_xsave_layout (...)", this->beneath ()->shortname ());
   x86_xsave_layout result
     = this->beneath ()->fetch_x86_xsave_layout ();
-  gdb_printf (gdb_stdlog,
-	      "<- %s->fetch_x86_xsave_layout () = %s\n",
+  target_debug_printf_nofunc ("<- %s->fetch_x86_xsave_layout () = %s",
 	      this->beneath ()->shortname (),
 	      target_debug_print_x86_xsave_layout (result).c_str ());
   return result;
diff --git a/gdb/target.c b/gdb/target.c
index 0a836d1..d9ff7d6 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -110,6 +110,16 @@ bool may_stop = true;
 
 static unsigned int targetdebug = 0;
 
+/* Print a "target" debug statement with the function name prefix.  */
+
+#define target_debug_printf(fmt, ...) \
+  debug_prefixed_printf_cond (targetdebug > 0, "target", fmt, ##__VA_ARGS__)
+
+/* Print a "target" debug statement without the function name prefix.  */
+
+#define target_debug_printf_nofunc(fmt, ...) \
+  debug_prefixed_printf_cond_nofunc (targetdebug > 0, "target", fmt, ##__VA_ARGS__)
+
 static void
 set_targetdebug  (const char *args, int from_tty, struct cmd_list_element *c)
 {
@@ -822,15 +832,9 @@ open_target (const char *args, int from_tty, struct cmd_list_element *command)
   auto *ti = static_cast<target_info *> (command->context ());
   target_open_ftype *func = target_factories[ti];
 
-  if (targetdebug)
-    gdb_printf (gdb_stdlog, "-> %s->open (...)\n",
-		ti->shortname);
-
+  target_debug_printf_nofunc ("-> %s->open (...)", ti->shortname);
   func (args, from_tty);
-
-  if (targetdebug)
-    gdb_printf (gdb_stdlog, "<- %s->open (%s, %d)\n",
-		ti->shortname, args, from_tty);
+  target_debug_printf_nofunc ("<- %s->open (%s, %d)", ti->shortname, args, from_tty);
 }
 
 /* See target.h.  */
@@ -1157,8 +1161,7 @@ target_ops_ref_policy::decref (target_ops *t)
 
       t->close ();
 
-      if (targetdebug)
-	gdb_printf (gdb_stdlog, "closing target\n");
+      target_debug_printf_nofunc ("closing target");
     }
 }
 
@@ -1693,18 +1696,15 @@ target_xfer_partial (struct target_ops *ops,
   if (targetdebug)
     {
       const unsigned char *myaddr = NULL;
-
-      gdb_printf (gdb_stdlog,
-		  "%s:target_xfer_partial "
-		  "(%d, %s, %s, %s, %s, %s) = %d, %s",
-		  ops->shortname (),
-		  (int) object,
-		  (annex ? annex : "(null)"),
-		  host_address_to_string (readbuf),
-		  host_address_to_string (writebuf),
-		  core_addr_to_string_nz (offset),
-		  pulongest (len), retval,
-		  pulongest (*xfered_len));
+      std::string s
+	= string_printf ("%s:target_xfer_partial "
+			 "(%d, %s, %s, %s, %s, %s) = %d, %s",
+			 ops->shortname (), (int) object,
+			 (annex ? annex : "(null)"),
+			 host_address_to_string (readbuf),
+			 host_address_to_string (writebuf),
+			 core_addr_to_string_nz (offset), pulongest (len),
+			 retval, pulongest (*xfered_len));
 
       if (readbuf)
 	myaddr = readbuf;
@@ -1714,24 +1714,26 @@ target_xfer_partial (struct target_ops *ops,
 	{
 	  int i;
 
-	  gdb_puts (", bytes =", gdb_stdlog);
+	  string_appendf (s, ", bytes =");
 	  for (i = 0; i < *xfered_len; i++)
 	    {
 	      if ((((intptr_t) &(myaddr[i])) & 0xf) == 0)
 		{
 		  if (targetdebug < 2 && i > 0)
 		    {
-		      gdb_printf (gdb_stdlog, " ...");
+		      string_appendf (s, " ...");
 		      break;
 		    }
-		  gdb_printf (gdb_stdlog, "\n");
+
+		  target_debug_printf_nofunc ("%s", s.c_str ());
+		  s.clear();
 		}
 
-	      gdb_printf (gdb_stdlog, " %02x", myaddr[i] & 0xff);
+	      string_appendf (s, " %02x", myaddr[i] & 0xff);
 	    }
 	}
 
-      gdb_putc ('\n', gdb_stdlog);
+      target_debug_printf_nofunc ("%s", s.c_str ());
     }
 
   /* Check implementations of to_xfer_partial update *XFERED_LEN
@@ -2944,10 +2946,7 @@ target_info_proc (const char *args, enum info_proc_what what)
     {
       if (t->info_proc (args, what))
 	{
-	  if (targetdebug)
-	    gdb_printf (gdb_stdlog,
-			"target_info_proc (\"%s\", %d)\n", args, what);
-
+	  target_debug_printf_nofunc ("target_info_proc (\"%s\", %d)", args, what);
 	  return 1;
 	}
     }
@@ -3238,14 +3237,9 @@ target_fileio_open (struct inferior *inf, const char *filename,
       else
 	fd = acquire_fileio_fd (t, fd);
 
-      if (targetdebug)
-	gdb_printf (gdb_stdlog,
-		    "target_fileio_open (%d,%s,0x%x,0%o,%d)"
-		    " = %d (%d)\n",
-		    inf == NULL ? 0 : inf->num,
-		    filename, flags, mode,
-		    warn_if_slow, fd,
-		    fd != -1 ? 0 : *target_errno);
+      target_debug_printf_nofunc ("target_fileio_open (%d,%s,0x%x,0%o,%d) = %d (%d)",
+			   inf == NULL ? 0 : inf->num, filename, flags, mode,
+			   warn_if_slow, fd, fd != -1 ? 0 : *target_errno);
       return fd;
     }
 
@@ -3270,12 +3264,9 @@ target_fileio_pwrite (int fd, const gdb_byte *write_buf, int len,
     ret = fh->target->fileio_pwrite (fh->target_fd, write_buf,
 				     len, offset, target_errno);
 
-  if (targetdebug)
-    gdb_printf (gdb_stdlog,
-		"target_fileio_pwrite (%d,...,%d,%s) "
-		"= %d (%d)\n",
-		fd, len, pulongest (offset),
-		ret, ret != -1 ? 0 : *target_errno);
+  target_debug_printf_nofunc ("target_fileio_pwrite (%d,...,%d,%s) = %d (%d)", fd,
+		       len, pulongest (offset), ret,
+		       ret != -1 ? 0 : *target_errno);
   return ret;
 }
 
@@ -3296,12 +3287,8 @@ target_fileio_pread (int fd, gdb_byte *read_buf, int len,
     ret = fh->target->fileio_pread (fh->target_fd, read_buf,
 				    len, offset, target_errno);
 
-  if (targetdebug)
-    gdb_printf (gdb_stdlog,
-		"target_fileio_pread (%d,...,%d,%s) "
-		"= %d (%d)\n",
-		fd, len, pulongest (offset),
-		ret, ret != -1 ? 0 : *target_errno);
+  target_debug_printf_nofunc ("target_fileio_pread (%d,...,%d,%s) = %d (%d)", fd, len,
+		       pulongest (offset), ret, ret != -1 ? 0 : *target_errno);
   return ret;
 }
 
@@ -3320,10 +3307,8 @@ target_fileio_fstat (int fd, struct stat *sb, fileio_error *target_errno)
   else
     ret = fh->target->fileio_fstat (fh->target_fd, sb, target_errno);
 
-  if (targetdebug)
-    gdb_printf (gdb_stdlog,
-		"target_fileio_fstat (%d) = %d (%d)\n",
-		fd, ret, ret != -1 ? 0 : *target_errno);
+  target_debug_printf_nofunc ("target_fileio_fstat (%d) = %d (%d)", fd, ret,
+		       ret != -1 ? 0 : *target_errno);
   return ret;
 }
 
@@ -3347,10 +3332,8 @@ target_fileio_close (int fd, fileio_error *target_errno)
       release_fileio_fd (fd, fh);
     }
 
-  if (targetdebug)
-    gdb_printf (gdb_stdlog,
-		"target_fileio_close (%d) = %d (%d)\n",
-		fd, ret, ret != -1 ? 0 : *target_errno);
+  target_debug_printf_nofunc ("target_fileio_close (%d) = %d (%d)", fd, ret,
+		       ret != -1 ? 0 : *target_errno);
   return ret;
 }
 
@@ -3367,12 +3350,9 @@ target_fileio_unlink (struct inferior *inf, const char *filename,
       if (ret == -1 && *target_errno == FILEIO_ENOSYS)
 	continue;
 
-      if (targetdebug)
-	gdb_printf (gdb_stdlog,
-		    "target_fileio_unlink (%d,%s)"
-		    " = %d (%d)\n",
-		    inf == NULL ? 0 : inf->num, filename,
-		    ret, ret != -1 ? 0 : *target_errno);
+      target_debug_printf_nofunc ("target_fileio_unlink (%d,%s) = %d (%d)",
+			   inf == NULL ? 0 : inf->num, filename, ret,
+			   ret != -1 ? 0 : *target_errno);
       return ret;
     }
 
@@ -3394,13 +3374,10 @@ target_fileio_readlink (struct inferior *inf, const char *filename,
       if (!ret.has_value () && *target_errno == FILEIO_ENOSYS)
 	continue;
 
-      if (targetdebug)
-	gdb_printf (gdb_stdlog,
-		    "target_fileio_readlink (%d,%s)"
-		    " = %s (%d)\n",
-		    inf == NULL ? 0 : inf->num,
-		    filename, ret ? ret->c_str () : "(nil)",
-		    ret ? 0 : *target_errno);
+      target_debug_printf_nofunc ("target_fileio_readlink (%d,%s) = %s (%d)",
+			   inf == NULL ? 0 : inf->num, filename,
+			   ret ? ret->c_str () : "(nil)",
+			   ret ? 0 : *target_errno);
       return ret;
     }
 
@@ -3894,9 +3871,7 @@ void
 target_fetch_registers (struct regcache *regcache, int regno)
 {
   current_inferior ()->top_target ()->fetch_registers (regcache, regno);
-  if (targetdebug)
-    gdb_printf (gdb_stdlog, "target_fetch_registers: %s",
-		regcache->register_debug_string (regno).c_str ());
+  target_debug_printf ("%s", regcache->register_debug_string (regno).c_str ());
 }
 
 void
@@ -3906,9 +3881,7 @@ target_store_registers (struct regcache *regcache, int regno)
     error (_("Writing to registers is not allowed (regno %d)"), regno);
 
   current_inferior ()->top_target ()->store_registers (regcache, regno);
-  if (targetdebug)
-    gdb_printf (gdb_stdlog, "target_store_registers: %s",
-		regcache->register_debug_string (regno).c_str ());
+  target_debug_printf ("%s", regcache->register_debug_string (regno).c_str ());
 }
 
 int