Fix sim build when configured with --enable-plugins

* common/Make-common.in: Use lt_cv_dlopen_libs under PLUGINS
	condition.
	* common/acinclude.m4: Define lt_cv_dlopen_libs.
	* arm/configure: Regenerate.
	* avr/configure: Regenerate.
	* bfin/configure: Regenerate.
	* common/configure: Regenerate.
	* cr16/configure: Regenerate.
	* cris/configure: Regenerate.
	* d10v/configure: Regenerate.
	* erc32/configure: Regenerate.
	* frv/configure: Regenerate.
	* h8300/configure: Regenerate.
	* igen/configure: Regenerate.
	* iq2000/configure: Regenerate.
	* lm32/configure: Regenerate.
	* m32c/configure: Regenerate.
	* m32r/configure: Regenerate.
	* m68hc11/configure: Regenerate.
	* mcore/configure: Regenerate.
	* microblaze/configure: Regenerate.
	* mips/configure: Regenerate.
	* mn10300/configure: Regenerate.
	* moxie/configure: Regenerate.
	* ppc/configure: Regenerate.
	* rl78/configure: Regenerate.
	* rx/configure: Regenerate.
	* sh/configure: Regenerate.
	* sh64/configure: Regenerate.
	* testsuite/configure: Regenerate.
	* v850/configure: Regenerate.

sim/ChangeLog

@@ -1,3 +1,37 @@
+2012-11-20  Pavel Chupin  <pavel.v.chupin@intel.com>
+
+	* common/Make-common.in: Use lt_cv_dlopen_libs under PLUGINS
+	condition.
+	* common/acinclude.m4: Define lt_cv_dlopen_libs.
+	* arm/configure: Regenerate.
+	* avr/configure: Regenerate.
+	* bfin/configure: Regenerate.
+	* common/configure: Regenerate.
+	* cr16/configure: Regenerate.
+	* cris/configure: Regenerate.
+	* d10v/configure: Regenerate.
+	* erc32/configure: Regenerate.
+	* frv/configure: Regenerate.
+	* h8300/configure: Regenerate.
+	* igen/configure: Regenerate.
+	* iq2000/configure: Regenerate.
+	* lm32/configure: Regenerate.
+	* m32c/configure: Regenerate.
+	* m32r/configure: Regenerate.
+	* m68hc11/configure: Regenerate.
+	* mcore/configure: Regenerate.
+	* microblaze/configure: Regenerate.
+	* mips/configure: Regenerate.
+	* mn10300/configure: Regenerate.
+	* moxie/configure: Regenerate.
+	* ppc/configure: Regenerate.
+	* rl78/configure: Regenerate.
+	* rx/configure: Regenerate.
+	* sh/configure: Regenerate.
+	* sh64/configure: Regenerate.
+	* testsuite/configure: Regenerate.
+	* v850/configure: Regenerate.
+
 2012-11-05  Stephane Carrez  <Stephane.Carrez@gmail.com>
 
 	* MAINTAINERS: Update my email address.

sim/common/Make-common.in

@@ -58,6 +58,7 @@ man1dir = $(mandir)/man1
 infodir = @infodir@
 includedir = @includedir@
 
+lt_cv_dlopen_libs = @lt_cv_dlopen_libs@
 # This can be referenced by the gettext configuration code.
 top_builddir = ..
 
@@ -255,6 +256,7 @@ COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH)
 
 LIBIBERTY_LIB = ../../libiberty/libiberty.a
 BFD_LIB = ../../bfd/libbfd.a
+@PLUGINS_TRUE@LIBDL = @lt_cv_dlopen_libs@
 OPCODES_LIB = ../../opcodes/libopcodes.a
 LIBINTL = @LIBINTL@
 LIBINTL_DEP = @LIBINTL_DEP@
@@ -262,7 +264,7 @@ CONFIG_LIBS = @LIBS@
 LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB) \
 	$(SIM_EXTRA_LIBDEPS)
 EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \
-	$(CONFIG_LIBS) $(SIM_EXTRA_LIBS)
+	$(CONFIG_LIBS) $(SIM_EXTRA_LIBS) $(LIBDL)
 
 LIB_OBJS = callback.o syscall.o targ-map.o version.o $(SIM_OBJS)
 

sim/common/acinclude.m4

@@ -21,6 +21,12 @@
 # Include global overrides and fixes for Autoconf.
 m4_include(../../config/override.m4)
 sinclude([../../config/zlib.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 sinclude([../../config/depstand.m4])
 
 AC_DEFUN([SIM_AC_COMMON],
@@ -90,6 +96,12 @@ AC_CHECK_LIB(nsl, gethostbyname)
 # using the same condition.
 AM_ZLIB
 
+# BFD uses libdl when when plugins enabled.
+AC_PLUGINS
+AM_CONDITIONAL(PLUGINS, test "$plugins" = yes)
+LT_INIT([dlopen])
+AC_SUBST(lt_cv_dlopen_libs)
+
 . ${srcdir}/../../bfd/configure.host
 
 dnl Standard (and optional) simulator options.

sim/testsuite/configure

@@ -1907,7 +1907,7 @@ case "${target}" in
        sim_arch=sh
        sim_testsuite=yes
        ;;
-   sparc-*-rtems*|sparc-*-elf*|erc32*-*-*)
+   sparc-*-rtems*|sparc-*-elf*)
        sim_arch=erc32
        sim_testsuite=yes
        ;;