diff --git a/gas/ChangeLog b/gas/ChangeLog
index ed3c93b3ad..f165585657 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-06  Daniel Jacobowitz  <drow@mvista.com>
+
+	* tc-mips.c (mips_after_parse_args): Always set mips_opts.ase_mips3d
+	and mips_opts.ase_mdmx if they are uninitialized.
+
 2002-06-06  John David Anglin  <dave@hiauly1.hia.nrc.ca>
 
 	* gas/config/tc-hppa.c (pa_ip): Replace "L$0\001" with FAKE_LABEL_NAME.
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index c054255744..944012fc75 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -10614,10 +10614,10 @@ mips_after_parse_args ()
 
   /* If the selected architecture includes support for ASEs, enable
      generation of code for them.  */
-  if (mips_opts.ase_mips3d == -1 && CPU_HAS_MIPS3D (mips_arch))
-    mips_opts.ase_mips3d = 1;
-  if (mips_opts.ase_mdmx == -1 && CPU_HAS_MDMX (mips_arch))
-    mips_opts.ase_mdmx = 1;
+  if (mips_opts.ase_mips3d == -1)
+    mips_opts.ase_mips3d = CPU_HAS_MIPS3D (mips_arch);
+  if (mips_opts.ase_mdmx == -1)
+    mips_opts.ase_mdmx = CPU_HAS_MDMX (mips_arch);
 
   if (file_mips_gp32 < 0)
     file_mips_gp32 = 0;