* gdbarch.sh: Make multi-arch variable defaults, defaults for non-

multi-arch targets.
(TARGET_BFD_VMA_BIT, IEEE_FLOAT, CALL_DUMMY_WORDS,
SIZEOF_CALL_DUMMY_WORDS): Update.
* inferior.h (CALL_DUMMY_WORDS, SIZEOF_CALL_DUMMY_WORDS): Default
provided by gdbarch.
(CALL_DUMMY_P): Add FIXME. gdbarch should provide default.
* valprint.c (IEEE_FLOAT): Default provided by gdbarch.

1 files changed, 14 insertions, 10 deletions

diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 5cd4f88b63..ffa925e3b9 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -191,7 +191,7 @@ v:1:TARGET_LONG_LONG_BIT:int:long_long_bit::::8 * sizeof (LONGEST):0
 v:1:TARGET_FLOAT_BIT:int:float_bit::::8 * sizeof (float):0
 v:1:TARGET_DOUBLE_BIT:int:double_bit::::8 * sizeof (double):0
 v:1:TARGET_LONG_DOUBLE_BIT:int:long_double_bit::::8 * sizeof (long double):0
-v:1:IEEE_FLOAT:int:ieee_float::::0:1:0:::#
+v:1:IEEE_FLOAT:int:ieee_float::::0:0:0:::
 #
 f:1:TARGET_READ_PC:CORE_ADDR:read_pc:int pid:pid::0:0
 f:1:TARGET_WRITE_PC:void:write_pc:CORE_ADDR val, int pid:val, pid::0:0
@@ -423,11 +423,17 @@ do
 	echo ""
 	echo "extern ${returntype} gdbarch_${function} (struct gdbarch *gdbarch);"
 	echo "extern void set_gdbarch_${function} (struct gdbarch *gdbarch, ${returntype} ${function});"
-	echo "#if GDB_MULTI_ARCH"
+	if ! default_is_fallback_p
+	then
+	    echo "#if GDB_MULTI_ARCH"
+	fi
 	echo "#if (GDB_MULTI_ARCH > 1) || !defined (${macro})"
 	echo "#define ${macro} (gdbarch_${function} (current_gdbarch))"
 	echo "#endif"
-	echo "#endif"
+	if ! default_is_fallback_p
+	then
+	    echo "#endif"
+	fi
 	;;
     "f" )
 	echo ""
@@ -1134,6 +1140,11 @@ do
 	echo "${returntype}"
 	echo "gdbarch_${function} (struct gdbarch *gdbarch)"
 	echo "{"
+	if default_is_fallback_p && [ "${default}" != "0" ]
+	then
+	    echo "  if (GDB_MULTI_ARCH == 0)"
+	    echo "    return ${default};"
+	fi
 	if [ "${invalid_p}" = "0" ]
 	then
 	    echo "  /* Skip verify of ${function}, invalid_p == 0 */"
@@ -1940,13 +1951,6 @@ set_gdbarch_from_file (abfd)
 }
 
 
-#if defined (CALL_DUMMY)
-/* FIXME - this should go away */
-LONGEST call_dummy_words[] = CALL_DUMMY;
-int sizeof_call_dummy_words = sizeof (call_dummy_words);
-#endif
-
-
 /* Initialize the current architecture.  */
 void
 initialize_current_architecture ()