From 646f4417760ab12c0d955dabf821d8737d94335a Mon Sep 17 00:00:00 2001
From: Andreas Arnez <arnez@linux.vnet.ibm.com>
Date: Fri, 7 Mar 2014 12:23:47 +0000
Subject: [PATCH] Fix dw2-ifort-parameter.exp on PPC64

On PPC64, 'func' and 'main' are function descriptors and don't point
to the actual code.  Thus the usage of these symbols in the DWARF
assembler source was broken.  The patch introduces new labels
func_start and func_end for this purpose.
---
 gdb/testsuite/ChangeLog                          |  8 ++++++++
 gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.c   |  8 +++++++-
 gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp | 10 +++++-----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2452c77fe7..56275a3aa1 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2014-03-12  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+	* gdb.dwarf2/dw2-ifort-parameter.c (func): Define labels
+	'func_start' and 'func_end' for the beginning and end of the
+	function code, respectively.
+	* gdb.dwarf2/dw2-ifort-parameter.exp: Use 'func_start' and
+	'func_end' instead of 'func' and 'main'.
+
 2014-03-12  Andreas Arnez  <arnez@linux.vnet.ibm.com>
 
 	* gdb.dwarf2/dw2-ifort-parameter-debug.S: Remove.
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.c b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.c
index 361c44d8ae..4474814767 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.c
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.c
@@ -18,11 +18,17 @@
 int value = 0xdeadf00d;
 int *ptr = &value;
 
-void
+asm (".section	\".text\"");
+asm (".balign 8");
+asm ("func_start: .globl func_start");
+
+static void
 func (void)
 {
 }
 
+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 d11de9ed31..026e071e7c 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp
@@ -29,14 +29,14 @@ set asm_file [standard_output_file $srcfile2]
 Dwarf::assemble $asm_file {
     declare_labels int_label
 
-    extern main func ptr
+    extern func_start func_end ptr
 
     cu {} {
 	compile_unit {
 	    {name file1.txt}
 	    {language @DW_LANG_C}
-	    {low_pc func addr}
-	    {high_pc main addr}
+	    {low_pc func_start addr}
+	    {high_pc func_end addr}
 	} {
 	    int_label: base_type {
 		{name int}
@@ -47,8 +47,8 @@ Dwarf::assemble $asm_file {
 	    subprogram {
 		{external 1 flag}
 		{name func}
-		{low_pc func addr}
-		{high_pc main addr}
+		{low_pc func_start addr}
+		{high_pc func_end addr}
 	    } {
 		formal_parameter {
 		    {name param}