+2020-02-06  Alan Modra  <amodra@gmail.com>
+
+       * configure.tgt (i[3-7]86-*-moss*): Don't clear targ_extra_ofiles.
+       (i[3-7]86-*-openbsd*, x86_64-*-openbsd*): Add.
+
 2020-02-02  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR gas/25380
 
                        ;;
 i[3-7]86-*-netbsdelf* | \
 i[3-7]86-*-netbsd*-gnu* | \
-i[3-7]86-*-knetbsd*-gnu)
+i[3-7]86-*-knetbsd*-gnu | \
+i[3-7]86-*-openbsd*)
                        targ_emul=elf_i386
                        targ_extra_emuls="elf_iamcu"
                        ;;
                        ;;
 i[3-7]86-*-moss*)      targ_emul=i386moss
                        targ_extra_emuls=i386msdos
-                       targ_extra_ofiles=
                        ;;
 i[3-7]86-*-winnt*)     targ_emul=i386pe ;
                        targ_extra_ofiles="deffilep.o pe-dll.o"
                        targ_extra_libpath=$targ_extra_emuls
                        tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'`
                        ;;
-x86_64-*-netbsd*)      targ_emul=elf_x86_64
+x86_64-*-netbsd* | x86_64-*-openbsd*)
+                       targ_emul=elf_x86_64
                        targ_extra_emuls="elf_i386 elf_iamcu elf_l1om elf_k1om"
                        tdir_elf_iamcu=`echo ${targ_alias} | \
                            sed -e 's/x86_64/i386/'`