2004-09-02 Andrew Cagney <cagney@gnu.org>

	* gdbarch.sh: Instead of GDB_MULTI_ARCH print GDB_NM_FILE,
	GDB_TM_FILE and GDB_XM_FILE.
	* gdbarch.c: Re-generate.
	* configure.in (GDB_XM_FILE, GDB_NM_FILE, GDB_TM_FILE): Include
	quotes in macro definition.
	* configure.in: Re-generate.

5 files changed, 54 insertions, 11 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d064ea1..7914fd4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
 2004-09-02  Andrew Cagney  <cagney@gnu.org>
 
+	* gdbarch.sh: Instead of GDB_MULTI_ARCH print GDB_NM_FILE,
+	GDB_TM_FILE and GDB_XM_FILE.
+	* gdbarch.c: Re-generate.	
+	* configure.in (GDB_XM_FILE, GDB_NM_FILE, GDB_TM_FILE): Include
+	quotes in macro definition.
+	* configure.in: Re-generate.
+
 	* gdbarch.sh: Delete check for GDB_MULTI_ARCH_PARTIAL when
 	validating architecture methods.
 	* gdbarch.c: Re-generate.
diff --git a/gdb/configure b/gdb/configure
index 3c5df37..d173c86 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -11036,7 +11036,7 @@ if test "${hostfile}" != ""; then
     files="${files} ${GDB_XM_FILE}"
     links="${links} xm.h"
     cat >> confdefs.h <<EOF
-#define GDB_XM_FILE ${GDB_XM_FILE}
+#define GDB_XM_FILE "${GDB_XM_FILE}"
 EOF
 
 fi
@@ -11050,7 +11050,7 @@ if test "${targetfile}" != ""; then
     files="${files} ${GDB_TM_FILE}"
     links="${links} tm.h"
     cat >> confdefs.h <<EOF
-#define GDB_TM_FILE ${GDB_TM_FILE}
+#define GDB_TM_FILE "${GDB_TM_FILE}"
 EOF
 
 fi
@@ -11064,7 +11064,7 @@ if test "${nativefile}" != ""; then
     files="${files} ${GDB_NM_FILE}"
     links="${links} nm.h"
     cat >> confdefs.h <<EOF
-#define GDB_NM_FILE ${GDB_NM_FILE}
+#define GDB_NM_FILE "${GDB_NM_FILE}"
 EOF
 
 fi
@@ -11150,7 +11150,7 @@ else
   if { (eval echo configure:11151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.C | *.o | *.obj | *.ilk | *.pdb) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
diff --git a/gdb/configure.in b/gdb/configure.in
index da0ad48..e527648 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -1523,7 +1523,7 @@ if test "${hostfile}" != ""; then
     GDB_XM_FILE="config/${gdb_host_cpu}/${hostfile}"
     files="${files} ${GDB_XM_FILE}"
     links="${links} xm.h"
-    AC_DEFINE_UNQUOTED(GDB_XM_FILE, ${GDB_XM_FILE})
+    AC_DEFINE_UNQUOTED(GDB_XM_FILE, "${GDB_XM_FILE}")
 fi
 AC_SUBST(xm_h)
 
@@ -1534,7 +1534,7 @@ if test "${targetfile}" != ""; then
     GDB_TM_FILE="config/${gdb_target_cpu}/${targetfile}"
     files="${files} ${GDB_TM_FILE}"
     links="${links} tm.h"
-    AC_DEFINE_UNQUOTED(GDB_TM_FILE, ${GDB_TM_FILE})
+    AC_DEFINE_UNQUOTED(GDB_TM_FILE, "${GDB_TM_FILE}")
 fi
 AC_SUBST(tm_h)
 
@@ -1545,7 +1545,7 @@ if test "${nativefile}" != ""; then
     GDB_NM_FILE="config/${gdb_host_cpu}/${nativefile}"
     files="${files} ${GDB_NM_FILE}"
     links="${links} nm.h"
-    AC_DEFINE_UNQUOTED(GDB_NM_FILE, ${GDB_NM_FILE})
+    AC_DEFINE_UNQUOTED(GDB_NM_FILE, "${GDB_NM_FILE}")
 fi
 AC_SUBST(nm_h)
 
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index fdf7bb2..7eb4aeb 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -631,9 +631,27 @@ verify_gdbarch (struct gdbarch *current_gdbarch)
 void
 gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file)
 {
+  const char *gdb_xm_file = "<not-defined>";
+  const char *gdb_nm_file = "<not-defined>";
+  const char *gdb_tm_file = "<not-defined>";
+#if defined (GDB_XM_FILE)
+  gdb_xm_file = GDB_XM_FILE;
+#endif
+  fprintf_unfiltered (file,
+                      "gdbarch_dump: GDB_XM_FILE = %s\n",
+                      gdb_xm_file);
+#if defined (GDB_NM_FILE)
+  gdb_nm_file = GDB_NM_FILE;
+#endif
+  fprintf_unfiltered (file,
+                      "gdbarch_dump: GDB_NM_FILE = %s\n",
+                      gdb_nm_file);
+#if defined (GDB_TM_FILE)
+  gdb_tm_file = GDB_TM_FILE;
+#endif
   fprintf_unfiltered (file,
-                      "gdbarch_dump: GDB_MULTI_ARCH = %d\n",
-                      GDB_MULTI_ARCH);
+                      "gdbarch_dump: GDB_TM_FILE = %s\n",
+                      gdb_tm_file);
 #ifdef TARGET_ADDR_BIT
   fprintf_unfiltered (file,
                       "gdbarch_dump: TARGET_ADDR_BIT # %s\n",
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 298faf0..3ffb85e 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -1486,9 +1486,27 @@ cat <<EOF
 void
 gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file)
 {
+  const char *gdb_xm_file = "<not-defined>";
+  const char *gdb_nm_file = "<not-defined>";
+  const char *gdb_tm_file = "<not-defined>";
+#if defined (GDB_XM_FILE)
+  gdb_xm_file = GDB_XM_FILE;
+#endif
+  fprintf_unfiltered (file,
+                      "gdbarch_dump: GDB_XM_FILE = %s\\n",
+                      gdb_xm_file);
+#if defined (GDB_NM_FILE)
+  gdb_nm_file = GDB_NM_FILE;
+#endif
+  fprintf_unfiltered (file,
+                      "gdbarch_dump: GDB_NM_FILE = %s\\n",
+                      gdb_nm_file);
+#if defined (GDB_TM_FILE)
+  gdb_tm_file = GDB_TM_FILE;
+#endif
   fprintf_unfiltered (file,
-                      "gdbarch_dump: GDB_MULTI_ARCH = %d\\n",
-                      GDB_MULTI_ARCH);
+                      "gdbarch_dump: GDB_TM_FILE = %s\\n",
+                      gdb_tm_file);
 EOF
 function_list | sort -t: -k 4 | while do_read
 do