2006-01-04 Jim Blandy <jimb@redhat.com>

	* gdb.asm/asm-source.exp: Independently provide default values for
	asm-flags and debug-flags.  Use 'string equal' to do the
	comparison, not the implicit expr's '==' operator.  Remove
	now-unneeded assignments to asm-flags.  In h8300 case, place
	"-gdwarf-2", not "-gdwarf2", in debug-flags, not asm-flags.

2 files changed, 13 insertions, 9 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a5353bb..8eecae8 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-04  Jim Blandy  <jimb@redhat.com>
+
+	* gdb.asm/asm-source.exp: Independently provide default values for
+	asm-flags and debug-flags.  Use 'string equal' to do the
+	comparison, not the implicit expr's '==' operator.  Remove
+	now-unneeded assignments to asm-flags.  In h8300 case, place
+	"-gdwarf-2", not "-gdwarf2", in debug-flags, not asm-flags.
+
 2006-01-04  Michael Snyder  <msnyder@redhat.com>
 
 	* gdb.base/checkpoint.c: New file.
diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp
index d1a4be8..cbd38a4 100644
--- a/gdb/testsuite/gdb.asm/asm-source.exp
+++ b/gdb/testsuite/gdb.asm/asm-source.exp
@@ -65,7 +65,6 @@ switch -glob -- [istarget] {
     }
     "x86_64-*-*" {
         set asm-arch x86_64
-        set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
 	set debug-flags "-gdwarf-2"
     }
     "i\[3456\]86-*-*" {
@@ -108,7 +107,6 @@ switch -glob -- [istarget] {
     }
     "sh*-*-*" {
         set asm-arch sh
-        set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
 	set debug-flags "-gdwarf-2"
     }
     "sparc-*-*" {
@@ -121,7 +119,6 @@ switch -glob -- [istarget] {
     }
     "xstormy16-*-*" {
         set asm-arch xstormy16
-        set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
 	set debug-flags "-gdwarf-2"
     }
     "v850-*-*" {
@@ -133,7 +130,6 @@ switch -glob -- [istarget] {
     }
     "ia64-*-*" {
         set asm-arch ia64
-        set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
 	set debug-flags "-gdwarf-2"
     }
     "iq2000-*-*" {
@@ -141,22 +137,19 @@ switch -glob -- [istarget] {
     }
     "hppa*-linux-*" {
         set asm-arch pa
-        set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
 	set debug-flags "-gdwarf-2"
     }
     "hppa-*-openbsd*" {
         set asm-arch pa
-        set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
 	set debug-flags "-gdwarf-2"
     }
     "hppa64-*-hpux*" {
         set asm-arch pa64
-        set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
 	set debug-flags "-gdwarf-2"
     }
     "h83*-*" {
 	set asm-arch h8300
-	set asm-flags "-gdwarf2 -I${srcdir}/${subdir} -I${objdir}/${subdir}"
+        set debug-flags "-gdwarf-2"
     }
 }
 
@@ -203,8 +196,11 @@ remote_download host ${srcdir}/${subdir}/${asm-arch}.inc ${subdir}/arch.inc
 remote_exec build "rm -f ${subdir}/note.inc"
 remote_download host ${srcdir}/${subdir}/${asm-note}.inc ${subdir}/note.inc
 
-if { "${asm-flags}" == "" } {
+if { [string equal ${asm-flags} ""] } {
     set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
+}
+
+if { [string equal ${debug-flags} ""] } {
     set debug-flags "-gstabs"
 }