From 66d659b12a75b0275839472b41528d7f52f1eeb8 Mon Sep 17 00:00:00 2001
From: Andrew Cagney <cagney@redhat.com>
Date: Sun, 20 Jun 2004 19:17:17 +0000
Subject: [PATCH] 2004-06-20  Andrew Cagney  <cagney@gnu.org>

	* gdbarch.sh: Use the function, instead of macro name in
	errors and the log file.
	(return_value): Remove stray ":" in spec.
---
 gdb/ChangeLog  | 4 ++++
 gdb/gdbarch.sh | 7 +++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d80de75..94ef7c4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2004-06-20  Andrew Cagney  <cagney@gnu.org>
 
+	* gdbarch.sh: Use the function, instead of macro name in
+	errors and the log file.
+	(return_value): Remove stray ":" in spec.
+
 	* gdbarch.sh (RETURN_VALUE): Default to legacy_return_value.
 	* gdbarch.h, gdbarch.c: Re-generate.
 	* Makefile.in (arch-utils.o): Update dependencies.
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index ac00784..732c5a6 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -545,7 +545,7 @@ F:DEPRECATED_STORE_STRUCT_RETURN:void:deprecated_store_struct_return:CORE_ADDR a
 # the predicate with default hack to avoid calling STORE_RETURN_VALUE
 # (via legacy_return_value), when a small struct is involved.
 
-M:::enum return_value_convention:return_value:struct type *valtype, struct regcache *regcache, void *readbuf, const void *writebuf:valtype, regcache, readbuf, writebuf:::legacy_return_value
+M::enum return_value_convention:return_value:struct type *valtype, struct regcache *regcache, void *readbuf, const void *writebuf:valtype, regcache, readbuf, writebuf:::legacy_return_value
 
 # The deprecated methods EXTRACT_RETURN_VALUE, STORE_RETURN_VALUE,
 # DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS and
@@ -725,8 +725,7 @@ exec > new-gdbarch.log
 function_list | while do_read
 do
     cat <<EOF
-${class} ${macro}(${actual})
-  ${returntype} ${function} ($formal)${attrib}
+${class} ${returntype} ${function} ($formal)${attrib}
 EOF
     for r in ${read}
     do
@@ -734,7 +733,7 @@ EOF
     done
     if class_is_predicate_p && fallback_default_p
     then
-	echo "Error: predicate function ${macro} can not have a non- multi-arch default" 1>&2
+	echo "Error: predicate function ${function} can not have a non- multi-arch default" 1>&2
 	kill $$
 	exit 1
     fi
-- 
2.7.4