diff mbox

[6/6] Fix dw2-ifort-parameter.exp fail with clang

Message ID 1414195968-3333-7-git-send-email-yao@codesourcery.com
State New
Headers show

Commit Message

Yao Qi Oct. 25, 2014, 12:12 a.m. UTC
The patch <https://sourceware.org/ml/gdb-patches/2014-03/msg00202.html>
fixed dw2-ifort-parameter.exp on powerpc64 by adding some labels to
get the start and end address of function func.  This should also fix the
fail on thumb mode, however, this style is quite specific to gcc, and
other compiler, such as clang, may not guarantee the order of global
asms and functions.  The test fails with clang:

$ make check RUNTESTFLAGS='dw2-ifort-parameter.exp CC_FOR_TARGET=clang'
(gdb) p/x param^M
No symbol "param" in current context.^M
(gdb) FAIL: gdb.dwarf2/dw2-ifort-parameter.exp: p/x param

With this patch applied, dw2-ifort-parameter.exp still passes for gcc
on arm thumb mode and popwerpc64, and it also passes for clang on
x86_linux.

gdb/testsuite:

2014-10-24  Yao Qi  <yao@codesourcery.com>

	* gdb.dwarf2/dw2-ifort-parameter.c: Remove inline asm.
	(func): Add label func_label.
	* gdb.dwarf2/dw2-ifort-parameter.exp (Dwarf::assemble):
	Replace low_pc and high_pc with MACRO_AT_range.
	Replace name, low_pc and high_pc with MACRO_AT_func.
---
 gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.c   | 7 +------
 gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp | 8 +++-----
 2 files changed, 4 insertions(+), 11 deletions(-)

Comments

Doug Evans Nov. 4, 2014, 10:54 p.m. UTC | #1
Yao Qi writes:
 > The patch <https://sourceware.org/ml/gdb-patches/2014-03/msg00202.html>
 > fixed dw2-ifort-parameter.exp on powerpc64 by adding some labels to
 > get the start and end address of function func.  This should also fix the
 > fail on thumb mode, however, this style is quite specific to gcc, and
 > other compiler, such as clang, may not guarantee the order of global
 > asms and functions.  The test fails with clang:
 > 
 > $ make check RUNTESTFLAGS='dw2-ifort-parameter.exp CC_FOR_TARGET=clang'
 > (gdb) p/x param^M
 > No symbol "param" in current context.^M
 > (gdb) FAIL: gdb.dwarf2/dw2-ifort-parameter.exp: p/x param
 > 
 > With this patch applied, dw2-ifort-parameter.exp still passes for gcc
 > on arm thumb mode and popwerpc64, and it also passes for clang on
 > x86_linux.
 > 
 > gdb/testsuite:
 > 
 > 2014-10-24  Yao Qi  <yao@codesourcery.com>
 > 
 > 	* gdb.dwarf2/dw2-ifort-parameter.c: Remove inline asm.
 > 	(func): Add label func_label.
 > 	* gdb.dwarf2/dw2-ifort-parameter.exp (Dwarf::assemble):
 > 	Replace low_pc and high_pc with MACRO_AT_range.
 > 	Replace name, low_pc and high_pc with MACRO_AT_func.

LGTM
diff mbox

Patch

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.c b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.c
index 4474814..4918d7e 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.c
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.c
@@ -18,17 +18,12 @@ 
 int value = 0xdeadf00d;
 int *ptr = &value;
 
-asm (".section	\".text\"");
-asm (".balign 8");
-asm ("func_start: .globl func_start");
-
 static void
 func (void)
 {
+  asm ("func_label: .globl func_label");
 }
 
-asm ("func_end: .globl func_end");
-
 int
 main (void)
 {
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp
index 026e071..85a6ddd 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp
@@ -30,13 +30,13 @@  Dwarf::assemble $asm_file {
     declare_labels int_label
 
     extern func_start func_end ptr
+    global srcdir subdir srcfile
 
     cu {} {
 	compile_unit {
 	    {name file1.txt}
 	    {language @DW_LANG_C}
-	    {low_pc func_start addr}
-	    {high_pc func_end addr}
+	    {MACRO_AT_range { func ${srcdir}/${subdir}/${srcfile} }}
 	} {
 	    int_label: base_type {
 		{name int}
@@ -46,9 +46,7 @@  Dwarf::assemble $asm_file {
 
 	    subprogram {
 		{external 1 flag}
-		{name func}
-		{low_pc func_start addr}
-		{high_pc func_end addr}
+		{MACRO_AT_func { func ${srcdir}/${subdir}/${srcfile} }}
 	    } {
 		formal_parameter {
 		    {name param}