diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b95214dfacf..a16904f7c19 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -36,6 +36,11 @@ Thu Sep 30 00:13:27 1999  Dirk Zoller  <duz@rtsffm.com>
 
 Wed Sep 29 23:43:39 1999  Jeffrey A Law  (law@cygnus.com)
 
+	* h8300.h (INIT_TARGET_OPTABS): Use init_one_optab instead of
+	generating RTL directly.
+	* mips.h (INIT_TARGET_OPTABS): Likewise.
+	* mn10200.h (INIT_TARGET_OPTABS): Likewise.
+
 	* expr.h (init_mov_optab): Delete declaration
 
 	* h8300.c (WORD_REG_USED): Update to avoid useless register
diff --git a/gcc/config/h8300/h8300.h b/gcc/config/h8300/h8300.h
index 9e8b68232f2..d0617e54d5f 100644
--- a/gcc/config/h8300/h8300.h
+++ b/gcc/config/h8300/h8300.h
@@ -1388,15 +1388,15 @@ extern int handle_pragma ();
 #define INIT_TARGET_OPTABS \
   do { \
     smul_optab->handlers[(int) HImode].libfunc		\
-      = gen_rtx_SYMBOL_REF (Pmode, MULHI3_LIBCALL);	\
+      = init_one_libfunc (MULHI3_LIBCALL);		\
     sdiv_optab->handlers[(int) HImode].libfunc		\
-      = gen_rtx_SYMBOL_REF (Pmode, DIVHI3_LIBCALL);	\
+      = init_one_libfunc (DIVHI3_LIBCALL);		\
     udiv_optab->handlers[(int) HImode].libfunc		\
-      = gen_rtx_SYMBOL_REF (Pmode, UDIVHI3_LIBCALL);	\
+      = init_one_libfunc (UDIVHI3_LIBCALL);		\
     smod_optab->handlers[(int) HImode].libfunc		\
-      = gen_rtx_SYMBOL_REF (Pmode, MODHI3_LIBCALL);	\
+      = init_one_libfunc (MODHI3_LIBCALL);		\
     umod_optab->handlers[(int) HImode].libfunc		\
-      = gen_rtx_SYMBOL_REF (Pmode, UMODHI3_LIBCALL);	\
+      = init_one_libfunc (UMODHI3_LIBCALL);		\
   } while (0)
 
 #define MOVE_RATIO 3
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index c826d398261..24af49e25da 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -4592,59 +4592,59 @@ do									\
     else								\
       {									\
 	add_optab->handlers[(int) SFmode].libfunc =			\
-	  gen_rtx (SYMBOL_REF, Pmode, "__mips16_addsf3");		\
+	  init_one_libfunc ("__mips16_addsf3");				\
 	sub_optab->handlers[(int) SFmode].libfunc =			\
-	  gen_rtx (SYMBOL_REF, Pmode, "__mips16_subsf3");		\
+	  init_one_libfunc ("__mips16_subsf3");				\
 	smul_optab->handlers[(int) SFmode].libfunc =			\
-	  gen_rtx (SYMBOL_REF, Pmode, "__mips16_mulsf3");		\
+	  init_one_libfunc ("__mips16_mulsf3");				\
 	flodiv_optab->handlers[(int) SFmode].libfunc =			\
-	  gen_rtx (SYMBOL_REF, Pmode, "__mips16_divsf3");		\
+	  init_one_libfunc ("__mips16_divsf3");				\
 									\
-	eqsf2_libfunc = gen_rtx (SYMBOL_REF, Pmode, "__mips16_eqsf2");	\
-	nesf2_libfunc = gen_rtx (SYMBOL_REF, Pmode, "__mips16_nesf2");	\
-	gtsf2_libfunc = gen_rtx (SYMBOL_REF, Pmode, "__mips16_gtsf2");	\
-	gesf2_libfunc = gen_rtx (SYMBOL_REF, Pmode, "__mips16_gesf2");	\
-	ltsf2_libfunc = gen_rtx (SYMBOL_REF, Pmode, "__mips16_ltsf2");	\
-	lesf2_libfunc = gen_rtx (SYMBOL_REF, Pmode, "__mips16_lesf2");	\
+	eqsf2_libfunc = init_one_libfunc ("__mips16_eqsf2");		\
+	nesf2_libfunc = init_one_libfunc ("__mips16_nesf2");		\
+	gtsf2_libfunc = init_one_libfunc ("__mips16_gtsf2");		\
+	gesf2_libfunc = init_one_libfunc ("__mips16_gesf2");		\
+	ltsf2_libfunc = init_one_libfunc ("__mips16_ltsf2");		\
+	lesf2_libfunc = init_one_libfunc ("__mips16_lesf2");		\
 									\
 	floatsisf_libfunc =						\
-	  gen_rtx (SYMBOL_REF, Pmode, "__mips16_floatsisf");		\
+	  init_one_libfunc ("__mips16_floatsisf");			\
 	fixsfsi_libfunc =						\
-	  gen_rtx (SYMBOL_REF, Pmode, "__mips16_fixsfsi");		\
+	  init_one_libfunc ("__mips16_fixsfsi");			\
 									\
 	if (TARGET_DOUBLE_FLOAT)					\
 	  {								\
 	    add_optab->handlers[(int) DFmode].libfunc =			\
-	      gen_rtx (SYMBOL_REF, Pmode, "__mips16_adddf3");		\
+	      init_one_libfunc ("__mips16_adddf3");			\
 	    sub_optab->handlers[(int) DFmode].libfunc =			\
-	      gen_rtx (SYMBOL_REF, Pmode, "__mips16_subdf3");		\
+	      init_one_libfunc ("__mips16_subdf3");			\
 	    smul_optab->handlers[(int) DFmode].libfunc =		\
-	      gen_rtx (SYMBOL_REF, Pmode, "__mips16_muldf3");		\
+	      init_one_libfunc ("__mips16_muldf3");			\
 	    flodiv_optab->handlers[(int) DFmode].libfunc =		\
-	      gen_rtx (SYMBOL_REF, Pmode, "__mips16_divdf3");		\
+	      init_one_libfunc ("__mips16_divdf3");			\
 									\
 	    extendsfdf2_libfunc =					\
-	      gen_rtx (SYMBOL_REF, Pmode, "__mips16_extendsfdf2");	\
+	      init_one_libfunc ("__mips16_extendsfdf2");		\
 	    truncdfsf2_libfunc =					\
-	      gen_rtx (SYMBOL_REF, Pmode, "__mips16_truncdfsf2");	\
+	      init_one_libfunc ("__mips16_truncdfsf2");			\
 									\
 	    eqdf2_libfunc =						\
-	      gen_rtx (SYMBOL_REF, Pmode, "__mips16_eqdf2");		\
+	      init_one_libfunc ("__mips16_eqdf2");			\
 	    nedf2_libfunc =						\
-	      gen_rtx (SYMBOL_REF, Pmode, "__mips16_nedf2");		\
+	      init_one_libfunc ("__mips16_nedf2");			\
 	    gtdf2_libfunc =						\
-	      gen_rtx (SYMBOL_REF, Pmode, "__mips16_gtdf2");		\
+	      init_one_libfunc ("__mips16_gtdf2");			\
 	    gedf2_libfunc =						\
-	      gen_rtx (SYMBOL_REF, Pmode, "__mips16_gedf2");		\
+	      init_one_libfunc ("__mips16_gedf2");			\
 	    ltdf2_libfunc =						\
-	      gen_rtx (SYMBOL_REF, Pmode, "__mips16_ltdf2");		\
+	      init_one_libfunc ("__mips16_ltdf2");			\
 	    ledf2_libfunc =						\
-	      gen_rtx (SYMBOL_REF, Pmode, "__mips16_ledf2");		\
+	      init_one_libfunc ("__mips16_ledf2");			\
 									\
 	    floatsidf_libfunc =						\
-	      gen_rtx (SYMBOL_REF, Pmode, "__mips16_floatsidf");	\
+	      init_one_libfunc ("__mips16_floatsidf");			\
 	    fixdfsi_libfunc =						\
-	      gen_rtx (SYMBOL_REF, Pmode, "__mips16_fixdfsi");		\
+	      init_one_libfunc ("__mips16_fixdfsi");			\
 	  }								\
       }									\
   }									\
diff --git a/gcc/config/mn10200/mn10200.h b/gcc/config/mn10200/mn10200.h
index ce44d826da7..1ade6f23957 100644
--- a/gcc/config/mn10200/mn10200.h
+++ b/gcc/config/mn10200/mn10200.h
@@ -1051,9 +1051,9 @@ do { char dstr[30];					\
 #define INIT_TARGET_OPTABS \
   do { \
     sdiv_optab->handlers[(int) HImode].libfunc		\
-      = gen_rtx_SYMBOL_REF (Pmode, DIVHI3_LIBCALL);	\
+      = init_one_libfunc (DIVHI3_LIBCALL);		\
     smod_optab->handlers[(int) HImode].libfunc		\
-      = gen_rtx_SYMBOL_REF (Pmode, MODHI3_LIBCALL);	\
+      = init_one_libfunc (MODHI3_LIBCALL);		\
   } while (0)
 
 /* The assembler op to get a word.  */