Zap __FUNCTION__.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 383ad64751f1cb6ebde3742704c0a7c68290fa09..71cc75f82b57517a4ee9489860ad087697fd0459 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,6 +1,18 @@
+2002-09-29  Andrew Cagney  <[email protected]>
+
+       * gnu-nat.h (debug): Use __FILE__ and __LINE__ instead of
+       __FUNCTION__.
+       * gnu-nat.c (do_mach_notify_no_senders): Replace __FUNCTION__ with
+       function name.
+       (do_mach_notify_port_deleted, do_mach_notify_msg_accepted): Ditto.
+       (do_mach_notify_port_destroyed, do_mach_notify_send_once): Ditto.
+       (S_proc_setmsgport_reply, S_proc_getmsgport_reply): Ditto.
+       (S_msg_sig_post_reply): Ditto.
+       
 2002-09-28  Corinna Vinschen  <[email protected]>
 
-       * sh-tdep.c (sh_use_struct_convention): Use definition according to ABI.
+       * sh-tdep.c (sh_use_struct_convention): Use definition according
+       to ABI.
        (sh_push_arguments): Store in register with correct endianess.
        (sh_default_store_return_value): Ditto.
        (sh_gdbarch_init): Set sizeof long double to 8.

diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 59aad5dd7f328e25bcaf6b9fcfb154963a0e1990..e332dba3f3d61f40f055b0a3c81eb74224942071 100644 (file)
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -1759,31 +1759,31 @@ ill_rpc (char *fun)
 error_t
 do_mach_notify_no_senders (mach_port_t notify, mach_port_mscount_t count)
 {
-  return ill_rpc (__FUNCTION__);
+  return ill_rpc ("do_mach_notify_no_senders");
 }
 
 error_t
 do_mach_notify_port_deleted (mach_port_t notify, mach_port_t name)
 {
-  return ill_rpc (__FUNCTION__);
+  return ill_rpc ("do_mach_notify_port_deleted");
 }
 
 error_t
 do_mach_notify_msg_accepted (mach_port_t notify, mach_port_t name)
 {
-  return ill_rpc (__FUNCTION__);
+  return ill_rpc ("do_mach_notify_msg_accepted");
 }
 
 error_t
 do_mach_notify_port_destroyed (mach_port_t notify, mach_port_t name)
 {
-  return ill_rpc (__FUNCTION__);
+  return ill_rpc ("do_mach_notify_port_destroyed");
 }
 
 error_t
 do_mach_notify_send_once (mach_port_t notify)
 {
-  return ill_rpc (__FUNCTION__);
+  return ill_rpc ("do_mach_notify_send_once");
 }
 
 \f
@@ -1845,13 +1845,13 @@ error_t
 S_proc_setmsgport_reply (mach_port_t reply, error_t err,
                         mach_port_t old_msg_port)
 {
-  return ill_rpc (__FUNCTION__);
+  return ill_rpc ("S_proc_setmsgport_reply");
 }
 
 error_t
 S_proc_getmsgport_reply (mach_port_t reply, error_t err, mach_port_t msg_port)
 {
-  return ill_rpc (__FUNCTION__);
+  return ill_rpc ("S_proc_getmsgport_reply");
 }
 
 \f
@@ -1890,7 +1890,7 @@ S_msg_sig_post_untraced_reply (mach_port_t reply, error_t err)
 error_t
 S_msg_sig_post_reply (mach_port_t reply, error_t err)
 {
-  return ill_rpc (__FUNCTION__);
+  return ill_rpc ("S_msg_sig_post_reply");
 }
 
 \f

diff --git a/gdb/gnu-nat.h b/gdb/gnu-nat.h
index cc430835f2c86056cc6c64f7ee2abf442f058fdc..bcdfe6e7779f8224bcec2ed7a513bca840906cd4 100644 (file)
--- a/gdb/gnu-nat.h
+++ b/gdb/gnu-nat.h
@@ -96,6 +96,6 @@ extern int gnu_debug_flag;
 
 #define debug(msg, args...) \
  do { if (gnu_debug_flag) \
-        fprintf_unfiltered (gdb_stdlog, "%s: " msg "\r\n", __FUNCTION__ , ##args); } while (0)
+        fprintf_unfiltered (gdb_stdlog, "%s:%d: " msg "\r\n", __FILE__ , __LINE__ , ##args); } while (0)
 
 #endif /* __GNU_NAT_H__ */