diff --git a/gas/ChangeLog b/gas/ChangeLog
index 59f514a56cd..e089d84ab8d 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-15  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* config/tc-mips.c (macro): Warn about wrong la/dla use.
+
 2002-05-15  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
 
 	* config/tc_mips.c (s_cpsetup): Fix completely bogus code which had
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index f112b84edcf..2d574e827b4 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -4604,6 +4604,12 @@ macro (ip)
       /* Load the address of a symbol into a register.  If breg is not
 	 zero, we then add a base register to it.  */
 
+      if (dbl && HAVE_32BIT_GPRS)
+	as_warn (_("dla used to load 32-bit register"));
+
+      if (! dbl && HAVE_64BIT_ADDRESSES)
+	as_warn (_("la used to load 64-bit address"));
+
       if (treg == breg)
 	{
 	  tempreg = AT;