diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0249245cfb..880ae7461b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-03  Thiago Jung Bauermann  <bauerman@br.ibm.com>
+
+	* symtab.c (find_pc_sect_line): Use SYMBOL_VALUE_ADDRESS instead
+	of SYMBOL_VALUE when working with function symbols.
+
 2008-01-03  Joel Brobecker  <brobecker@adacore.com>
 
 	* ada-lang.c (resolve_subexp): Add handling of OP_REGISTER
diff --git a/gdb/symtab.c b/gdb/symtab.c
index c95348bdd5..2e0a9b7df1 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -2109,13 +2109,13 @@ find_pc_sect_line (CORE_ADDR pc, struct bfd_section *section, int notcurrent)
 	   * So I commented out the warning. RT */
 	  /* warning ("In stub for %s; unable to find real function/line info", SYMBOL_LINKAGE_NAME (msymbol)) */ ;
 	/* fall through */
-	else if (SYMBOL_VALUE (mfunsym) == SYMBOL_VALUE (msymbol))
+	else if (SYMBOL_VALUE_ADDRESS (mfunsym) == SYMBOL_VALUE_ADDRESS (msymbol))
 	  /* Avoid infinite recursion */
 	  /* See above comment about why warning is commented out */
 	  /* warning ("In stub for %s; unable to find real function/line info", SYMBOL_LINKAGE_NAME (msymbol)) */ ;
 	/* fall through */
 	else
-	  return find_pc_line (SYMBOL_VALUE (mfunsym), 0);
+	  return find_pc_line (SYMBOL_VALUE_ADDRESS (mfunsym), 0);
       }