[patch/5.3] No __FUNCTION__

[patch/5.3] No __FUNCTION__

[Andrew Cagney]

[-- Attachment #1: Type: text/plain, Size: 156 bytes --]

I've committed the attached (with a hesatant ok from MarkK) (HEAD and 
branch).

What GDB needs is something that works regardless of the compiler.

Andrew

[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 2687 bytes --]

2002-09-29  Andrew Cagney  <ac131313@redhat.com>

	* 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.
	
Index: gnu-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/gnu-nat.c,v
retrieving revision 1.23
diff -u -r1.23 gnu-nat.c
--- gnu-nat.c	26 Aug 2002 19:18:33 -0000	1.23
+++ gnu-nat.c	29 Sep 2002 15:23:37 -0000
@@ -1759,31 +1759,31 @@
 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 @@
 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 @@
 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
Index: gnu-nat.h
===================================================================
RCS file: /cvs/src/src/gdb/gnu-nat.h,v
retrieving revision 1.2
diff -u -r1.2 gnu-nat.h
--- gnu-nat.h	6 Mar 2001 08:21:07 -0000	1.2
+++ gnu-nat.h	29 Sep 2002 15:23:37 -0000
@@ -96,6 +96,6 @@
 
 #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__ */

Re: [patch/5.3] No __FUNCTION__

[Daniel Jacobowitz]

On Sun, Sep 29, 2002 at 11:41:00AM -0400, Andrew Cagney wrote:
> I've committed the attached (with a hesatant ok from MarkK) (HEAD and 
> branch).
> 
> What GDB needs is something that works regardless of the compiler.
> 
> Andrew

Where is this usage of __FUNCTION__ not portable?  Concatenating it
with things, now there's a problem; but I don't remember any compiler
that couldn't handle function(__FUNCTION__).



-- 
Daniel Jacobowitz
MontaVista Software                         Debian GNU/Linux Developer

Re: [patch/5.3] No __FUNCTION__

[Andrew Cagney]

> On Sun, Sep 29, 2002 at 11:41:00AM -0400, Andrew Cagney wrote:
> 
>> I've committed the attached (with a hesatant ok from MarkK) (HEAD and 
>> branch).
>> 
>> What GDB needs is something that works regardless of the compiler.
>> 
>> Andrew
> 
> 
> Where is this usage of __FUNCTION__ not portable?  Concatenating it
> with things, now there's a problem; but I don't remember any compiler
> that couldn't handle function(__FUNCTION__).

The macro __FUNCTION__ isn't part of ISO C 90.

Andrew