diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4dd3f15cef1..ac2ac51a264 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-19  Nick Clifton  <nickc@redhat.com>
+
+	* config/rs6000/eabispe.h (SUBSUBTARGET_OVERRIDE_OPTIONS): Use the
+	new rs6000_explicit_options structure.
+
 2005-05-19  Richard Henderson  <rth@redhat.com>
 
 	PR target/21390
diff --git a/gcc/config/rs6000/eabispe.h b/gcc/config/rs6000/eabispe.h
index 3abad991b74..54d8ce4f2c7 100644
--- a/gcc/config/rs6000/eabispe.h
+++ b/gcc/config/rs6000/eabispe.h
@@ -30,16 +30,16 @@
 #define SUBSUBTARGET_OVERRIDE_OPTIONS \
   if (rs6000_select[1].string == NULL) \
     rs6000_cpu = PROCESSOR_PPC8540; \
-  if (rs6000_abi_string == NULL) \
+  if (!rs6000_explicit_options.abi) \
     rs6000_spe_abi = 1; \
-  if (rs6000_float_gprs_string == NULL) \
+  if (!rs6000_explicit_options.float_gprs) \
     rs6000_float_gprs = 1; \
   /* See note below.  */ \
-  /*if (rs6000_long_double_size_string == NULL)*/ \
+  /*if (!rs6000_explicit_options.long_double)*/ \
   /*  rs6000_long_double_type_size = 128;*/ \
-  if (rs6000_spe_string == NULL) \
+  if (!rs6000_explicit_options.spe) \
     rs6000_spe = 1; \
-  if (rs6000_isel_string == NULL) \
+  if (!rs6000_explicit_options.isel) \
     rs6000_isel = 1; \
   if (target_flags & MASK_64BIT) \
     error ("-m64 not supported in this configuration")