diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 79533aebe6..4ecb4dce43 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Mon Feb 19 01:09:32 1996  Doug Evans  <dje@cygnus.com>
+
+	* dwarfread.c (add_partial_symbol): Use ADD_PSYMBOL_ADDR_TO_LIST
+	for CORE_ADDR values.
+	(new_symbol): Use SYMBOL_VALUE_ADDRESS for CORE_ADDR values.
+	* symfile.h (add_psymbol_{,addr}to_list): Add prototypes.
+
 Sun Feb 18 14:37:13 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
 	* mipsread.c (mipscoff_symfile_read):  Unconditionally add
@@ -10,7 +17,7 @@ Sun Feb 18 09:27:10 1996  Stu Grossman  (grossman@cygnus.com)
 	* config/sparc/tm-sparc.h:  Define PS_FLAG_CARRY.  Define
 	RETURN_VALUE_ON_STACK to return long doubles on the stack.
 
-Sat Feb 17 16:33:11 1996  Fred Fish  <fnf@cyngus.com>
+Sat Feb 17 16:33:11 1996  Fred Fish  <fnf@cygnus.com>
 
 	* Makefile.in (ch-exp.o): Add dependencies.
 	(various): Add gdb_string.h to dependencies that need it.
diff --git a/gdb/dwarfread.c b/gdb/dwarfread.c
index fb0234cd54..bdbd4addd6 100644
--- a/gdb/dwarfread.c
+++ b/gdb/dwarfread.c
@@ -2586,10 +2586,10 @@ add_partial_symbol (dip, objfile)
   switch (dip -> die_tag)
     {
     case TAG_global_subroutine:
-      ADD_PSYMBOL_TO_LIST (dip -> at_name, strlen (dip -> at_name),
-			   VAR_NAMESPACE, LOC_BLOCK,
-			   objfile -> global_psymbols,
-			   dip -> at_low_pc, cu_language, objfile);
+      ADD_PSYMBOL_ADDR_TO_LIST (dip -> at_name, strlen (dip -> at_name),
+				VAR_NAMESPACE, LOC_BLOCK,
+				objfile -> global_psymbols,
+				dip -> at_low_pc, cu_language, objfile);
       break;
     case TAG_global_variable:
       ADD_PSYMBOL_TO_LIST (dip -> at_name, strlen (dip -> at_name),
@@ -2598,10 +2598,10 @@ add_partial_symbol (dip, objfile)
 			   0, cu_language, objfile);
       break;
     case TAG_subroutine:
-      ADD_PSYMBOL_TO_LIST (dip -> at_name, strlen (dip -> at_name),
-			   VAR_NAMESPACE, LOC_BLOCK,
-			   objfile -> static_psymbols,
-			   dip -> at_low_pc, cu_language, objfile);
+      ADD_PSYMBOL_ADDR_TO_LIST (dip -> at_name, strlen (dip -> at_name),
+				VAR_NAMESPACE, LOC_BLOCK,
+				objfile -> static_psymbols,
+				dip -> at_low_pc, cu_language, objfile);
       break;
     case TAG_local_variable:
       ADD_PSYMBOL_TO_LIST (dip -> at_name, strlen (dip -> at_name),
@@ -2951,12 +2951,12 @@ new_symbol (dip, objfile)
       switch (dip -> die_tag)
 	{
 	case TAG_label:
-	  SYMBOL_VALUE (sym) = dip -> at_low_pc;
+	  SYMBOL_VALUE_ADDRESS (sym) = dip -> at_low_pc;
 	  SYMBOL_CLASS (sym) = LOC_LABEL;
 	  break;
 	case TAG_global_subroutine:
 	case TAG_subroutine:
-	  SYMBOL_VALUE (sym) = dip -> at_low_pc;
+	  SYMBOL_VALUE_ADDRESS (sym) = dip -> at_low_pc;
 	  SYMBOL_TYPE (sym) = lookup_function_type (SYMBOL_TYPE (sym));
 	  SYMBOL_CLASS (sym) = LOC_BLOCK;
 	  if (dip -> die_tag == TAG_global_subroutine)