diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 51ed4fa944e..378826d7ad2 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-14  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.dwarf2/implptr-optimized-out.exp (Dwarf::assemble):
+	Replace name, low_pc and high_pc with MACRO_AT_func.
+
 2014-11-14  Yao Qi  <yao@codesourcery.com>
 
 	* gdb.dwarf2/implptr-optimized-out.exp: Use Dwarf::assemble to
diff --git a/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp b/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp
index 226fc5cb890..dd9c517b6b4 100644
--- a/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp
+++ b/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp
@@ -25,6 +25,8 @@ set executable ${testfile}
 # Create the DWARF.
 set asm_file [standard_output_file $srcfile2]
 Dwarf::assemble $asm_file {
+    global srcdir subdir srcfile
+
     cu { version 3 addr_size 4 } {
 	compile_unit {
 	    {producer "GNU C 4.4.3"}
@@ -51,9 +53,7 @@ Dwarf::assemble $asm_file {
 	    }
 
 	    subprogram {
-		{name main}
-		{low_pc main addr}
-		{high_pc main+0x100 addr}
+		{MACRO_AT_func { main ${srcdir}/${subdir}/${srcfile} }}
 		{type :$int_label}
 		{external 1 flag}
 	    } {