diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 77e51a5564a..931ba30a8c1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-13  Geoffrey Keating  <geoffk@apple.com>
+
+	* gcc.dg/asm-names.c: Use scan-assembler-not rather
+	than linker trickery.
+
 2003-10-13  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	PR c++/12370
diff --git a/gcc/testsuite/gcc.dg/asm-names.c b/gcc/testsuite/gcc.dg/asm-names.c
index d2841a0f40c..f5e44e65f6c 100644
--- a/gcc/testsuite/gcc.dg/asm-names.c
+++ b/gcc/testsuite/gcc.dg/asm-names.c
@@ -2,28 +2,15 @@
    to have an underscore prefixed, even if normal symbols are.
    Problem reported by Krister Walfridsson <cato@df.lth.se>.  */
 
-/* { dg-do link } */
+/* { dg-do compile } */
 /* { dg-options "-fleading-underscore" } */
+/* { dg-final { scan-assembler-not "____frob14" } } */
 
 extern void frobnicate (void) asm ("___frob14");  /* three underscores */
 
-void __frob14 (void) {} /* two underscores */
-
 int
 main (void)
 {
   frobnicate ();
   return 0;
 }
-
-/* In case built where the runtime expects no leading underscore on
-   main(). */
-extern int xmain (void) asm ("main");
-
-int xmain (void) { return main(); }
-
-/* In case built where the runtime calls __main.  */
-/* But make it weak because some targets already define this function.  */
-#pragma weak ymain
-extern int ymain (void) asm ("___main");
-int ymain (void) { return main(); }