diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ff9e9f4b11c..2d31946dc7c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-06  Michael Snyder  <msnyder@redhat.com>
+
+	* gdb.asm/asm-source.exp: Add tests for info target, info symbol, 
+	and detect whether the start symbol has a leading underscore.
+
 2001-12-04  Jim Blandy  <jimb@redhat.com>
 
 	* gdb.base/completion.exp: Clarify indentation.
diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp
index 81de92f823f..2af398f91f9 100644
--- a/gdb/testsuite/gdb.asm/asm-source.exp
+++ b/gdb/testsuite/gdb.asm/asm-source.exp
@@ -99,8 +99,43 @@ gdb_test "n" "33\[ 	\]*.*foo2" "next over macro"
 # See if we can properly `step' into a subroutine call.
 gdb_test "s" "8\[ 	\]*.*" "step into foo2"
 
+# Test 'info target', and incidentally capture the entry point address.
+set entry_point 0
+send_gdb "info target\n"
+gdb_expect {
+    -re "Symbols from .*asm-source.*Entry point: 0x(\[01232456789abcdefABCDEF\]+).*$gdb_prompt $" {
+	set entry_point $expect_out(1,string)
+	pass "info target"
+    }
+    -re ".*$gdb_prompt $" {
+	fail "info target"
+    }
+    timeout {
+	fail "info target (timeout)"
+    }
+}
+
+# Capture the start symbol (may be '_start' or 'start')
+set entry_symbol ""
+send_gdb "info symbol 0x$entry_point\n"
+gdb_expect {
+    -re "info symbol 0x$entry_point\[\r\n\]*" {
+	exp_continue
+    }
+    -re "(.*) in section .*$gdb_prompt $" {
+	set entry_symbol $expect_out(1,string)
+	pass "info symbol"
+    }
+    -re ".*$gdb_prompt $" {
+	fail "info symbol"
+    }
+    timeout {
+	fail "info symbol (timeout)"
+    }
+}
+
 # Now try a 'list' from the other source file.
-gdb_test "list _start" ".*gdbasm_startup.*" "list"
+gdb_test "list $entry_symbol" ".*gdbasm_startup.*" "list"
 
 # Now try a source file search
 gdb_test "search A routine for foo2 to call" \