diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 30dd3f2c90f1..a642eb676857 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 27 10:36:51 2000  Alexandre Oliva  <aoliva@cygnus.com>
+
+	* config/mn10300/mn10300.c (mn10300_address_cost): Test
+	ASHIFT, AND and LABEL_REF.
+
 Thu Apr 27 15:08:46 MET DST 2000  Jan Hubicka  <jh@suse.cz>
 
 	* invoke.texi (-foptimize-sibling-calls): Fix.
diff --git a/gcc/config/mn10300/mn10300.c b/gcc/config/mn10300/mn10300.c
index 3c5d359ec3db..70577ff499ff 100644
--- a/gcc/config/mn10300/mn10300.c
+++ b/gcc/config/mn10300/mn10300.c
@@ -1084,6 +1084,8 @@ mn10300_address_cost (x, unsig)
 
     case PLUS:
     case MINUS:
+    case ASHIFT:
+    case AND:
     case IOR:
       return (mn10300_address_cost (XEXP (x, 0), unsig)
 	      + mn10300_address_cost (XEXP (x, 1), unsig));
@@ -1110,6 +1112,7 @@ mn10300_address_cost (x, unsig)
 
     case CONST:
     case SYMBOL_REF:
+    case LABEL_REF:
       return 8;
 
     case ADDRESSOF: