diff options
| -rw-r--r-- | sim/Makefile.in | 23 | ||||
| -rw-r--r-- | sim/aclocal.m4 | 4 | ||||
| -rw-r--r-- | sim/arch-subdir.mk.in | 6 | ||||
| -rw-r--r-- | sim/common/Make-common.in | 16 | ||||
| -rw-r--r-- | sim/config.h.in | 10 | ||||
| -rwxr-xr-x | sim/configure | 363 | ||||
| -rw-r--r-- | sim/m4/sim_ac_platform.m4 | 16 | ||||
| -rw-r--r-- | sim/moxie/Makefile.in | 2 | ||||
| -rw-r--r-- | sim/ppc/Makefile.in | 9 |
9 files changed, 18 insertions, 431 deletions
diff --git a/sim/Makefile.in b/sim/Makefile.in index 39fbc2f..f660db9 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -166,13 +166,9 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/depstand.m4 \ - $(top_srcdir)/../config/gettext-sister.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/override.m4 \ - $(top_srcdir)/../config/pkg.m4 \ - $(top_srcdir)/../config/plugins.m4 \ - $(top_srcdir)/../config/zlib.m4 \ - $(top_srcdir)/../config/zstd.m4 $(top_srcdir)/../libtool.m4 \ + $(top_srcdir)/../config/pkg.m4 $(top_srcdir)/../libtool.m4 \ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ $(top_srcdir)/m4/sim_ac_option_alignment.m4 \ @@ -695,8 +691,6 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CC_FOR_BUILD = @CC_FOR_BUILD@ @@ -741,7 +735,6 @@ CPPFLAGS = @CPPFLAGS@ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ CYGPATH_W = @CYGPATH_W@ C_DIALECT = @C_DIALECT@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ @@ -753,16 +746,12 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GENCAT = @GENCAT@ -GMSGFMT = @GMSGFMT@ GREP = @GREP@ -INCINTL = @INCINTL@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ LD = @LD@ LDFLAGS = @LDFLAGS@ LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ @@ -799,8 +788,6 @@ LD_FOR_TARGET_RL78 = @LD_FOR_TARGET_RL78@ LD_FOR_TARGET_RX = @LD_FOR_TARGET_RX@ LD_FOR_TARGET_SH = @LD_FOR_TARGET_SH@ LD_FOR_TARGET_V850 = @LD_FOR_TARGET_V850@ -LIBINTL = @LIBINTL@ -LIBINTL_DEP = @LIBINTL_DEP@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -828,7 +815,6 @@ PKGVERSION = @PKGVERSION@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POSUB = @POSUB@ RANLIB = @RANLIB@ RANLIB_FOR_BUILD = @RANLIB_FOR_BUILD@ READLINE_CFLAGS = @READLINE_CFLAGS@ @@ -850,13 +836,9 @@ SIM_SUBDIRS = @SIM_SUBDIRS@ SIM_TOOLCHAIN_VARS = @SIM_TOOLCHAIN_VARS@ STRIP = @STRIP@ TERMCAP_LIB = @TERMCAP_LIB@ -USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ WERROR_CFLAGS = @WERROR_CFLAGS@ -XGETTEXT = @XGETTEXT@ -ZSTD_CFLAGS = @ZSTD_CFLAGS@ -ZSTD_LIBS = @ZSTD_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -896,7 +878,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_cv_dlopen_libs = @lt_cv_dlopen_libs@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -921,8 +902,6 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -zlibdir = @zlibdir@ -zlibinc = @zlibinc@ AUTOMAKE_OPTIONS = dejagnu foreign no-dist subdir-objects ACLOCAL_AMFLAGS = -Im4 -I.. -I../config GNULIB_PARENT_DIR = .. diff --git a/sim/aclocal.m4 b/sim/aclocal.m4 index 5ecf08a..f220c82 100644 --- a/sim/aclocal.m4 +++ b/sim/aclocal.m4 @@ -1169,13 +1169,9 @@ AC_SUBST([am__untar]) m4_include([../config/acx.m4]) m4_include([../config/depstand.m4]) -m4_include([../config/gettext-sister.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/override.m4]) m4_include([../config/pkg.m4]) -m4_include([../config/plugins.m4]) -m4_include([../config/zlib.m4]) -m4_include([../config/zstd.m4]) m4_include([../libtool.m4]) m4_include([../ltoptions.m4]) m4_include([../ltsugar.m4]) diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in index dd75abc..bd047c9 100644 --- a/sim/arch-subdir.mk.in +++ b/sim/arch-subdir.mk.in @@ -53,12 +53,6 @@ am__v_lt_1 = DEPMODE = @CCDEPMODE@ DEPDIR = @DEPDIR@ -zlibdir = @zlibdir@ -ZSTD_LIBS = @ZSTD_LIBS@ -@PLUGINS_TRUE@LIBDL = @lt_cv_dlopen_libs@ -LIBINTL = @LIBINTL@ -LIBINTL_DEP = @LIBINTL_DEP@ -INTL_CFLAGS = @INCINTL@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_LIBS = @SDL_LIBS@ TERMCAP_LIB = @TERMCAP_LIB@ diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 83b1cf1..c58eb0d 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -210,8 +210,7 @@ CSEARCH = -I. -I$(srcdir) -I$(srccom) \ -I$(srcroot)/include \ -I../../bfd -I$(srcroot)/bfd \ -I$(srcroot)/opcodes \ - -I../.. \ - $(INTL_CFLAGS) + -I../.. ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(INCGNU) $(SIM_EXTRA_CFLAGS) $(CFLAGS) BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(CSEARCH) @@ -219,14 +218,13 @@ COMMON_DEP_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(SIM_EXTRA_CFLAGS) SIM_HW_DEVICES = cfi core pal glue $(SIM_EXTRA_HW_DEVICES) -ZLIB = $(zlibdir) -lz LIBIBERTY_LIB = ../../libiberty/libiberty.a -BFD_LIB = ../../bfd/libbfd.a -OPCODES_LIB = ../../opcodes/libopcodes.a -CONFIG_LIBS = $(COMMON_LIBS) @LIBS@ $(ZLIB) $(ZSTD_LIBS) -LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL_DEP) $(LIBIBERTY_LIB) -EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBINTL) $(LIBIBERTY_LIB) \ - $(CONFIG_LIBS) $(SIM_EXTRA_LIBS) $(LIBDL) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) +BFD_LIB = ../../bfd/libbfd.la +OPCODES_LIB = ../../opcodes/libopcodes.la +CONFIG_LIBS = $(COMMON_LIBS) @LIBS@ +LIBDEPS = $(BFD_LIB) $(OPCODES_LIB) $(LIBIBERTY_LIB) +EXTRA_LIBS = $(BFD_LIB) $(OPCODES_LIB) $(LIBIBERTY_LIB) \ + $(CONFIG_LIBS) $(SIM_EXTRA_LIBS) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) COMMON_OBJS_NAMES = \ callback.o \ diff --git a/sim/config.h.in b/sim/config.h.in index 9a94b28..ba167b3 100644 --- a/sim/config.h.in +++ b/sim/config.h.in @@ -6,10 +6,6 @@ /* Sim debug setting */ #undef DEBUG -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#undef ENABLE_NLS - /* Define to the type of elements in the array set by `getgroups'. Usually this is either `int' or `gid_t'. */ #undef GETGROUPS_T @@ -383,12 +379,6 @@ /* Define to 1 if you have the <utime.h> header file. */ #undef HAVE_UTIME_H -/* Define to 1 if you have the <windows.h> header file. */ -#undef HAVE_WINDOWS_H - -/* Define to 1 if zstd is enabled. */ -#undef HAVE_ZSTD - /* Define to 1 if the system has the type `__int128'. */ #undef HAVE___INT128 diff --git a/sim/configure b/sim/configure index 538e528..c91cad2 100755 --- a/sim/configure +++ b/sim/configure @@ -861,7 +861,6 @@ READLINE_LIB TERMCAP_LIB SDL_LIBS SDL_CFLAGS -lt_cv_dlopen_libs OTOOL64 OTOOL LIPO @@ -878,24 +877,6 @@ LD FGREP SED LIBTOOL -PLUGINS_FALSE -PLUGINS_TRUE -ZSTD_LIBS -ZSTD_CFLAGS -zlibinc -zlibdir -CATOBJEXT -GENCAT -INSTOBJEXT -DATADIRNAME -CATALOGS -POSUB -GMSGFMT -XGETTEXT -INCINTL -LIBINTL_DEP -LIBINTL -USE_NLS LIBOBJS C_DIALECT PKG_CONFIG_LIBDIR @@ -984,9 +965,6 @@ ac_user_opts=' enable_option_checking with_pkgversion with_bugurl -with_system_zlib -with_zstd -enable_plugins enable_shared enable_static with_pic @@ -1030,8 +1008,6 @@ CPP PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR -ZSTD_CFLAGS -ZSTD_LIBS SDL_CFLAGS SDL_LIBS AS_FOR_TARGET_AARCH64 @@ -1755,7 +1731,6 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-plugins Enable support for plugins --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1813,9 +1788,6 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-pkgversion=PKG Use PKG in the version string in place of "SIM" --with-bugurl=URL Direct users to URL to report a bug - --with-system-zlib use installed libz - --with-zstd support zstd compressed debug sections - (default=auto) --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -1834,8 +1806,6 @@ Some influential environment variables: directories to add to pkg-config's search path PKG_CONFIG_LIBDIR path overriding pkg-config's built-in search path - ZSTD_CFLAGS C compiler flags for ZSTD, overriding pkg-config - ZSTD_LIBS linker flags for ZSTD, overriding pkg-config SDL_CFLAGS C compiler flags for SDL, overriding pkg-config SDL_LIBS linker flags for SDL, overriding pkg-config AS_FOR_TARGET_AARCH64 @@ -8988,336 +8958,16 @@ $as_echo "#define gid_t int" >>confdefs.h fi -ALL_LINGUAS= -# If we haven't got the data from the intl directory, -# assume NLS is disabled. -USE_NLS=no -LIBINTL= -LIBINTL_DEP= -INCINTL= -XGETTEXT= -GMSGFMT= -POSUB= - -if test -f ../intl/config.intl; then - . ../intl/config.intl -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 -$as_echo_n "checking whether NLS is requested... " >&6; } -if test x"$USE_NLS" != xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define ENABLE_NLS 1" >>confdefs.h - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 -$as_echo_n "checking for catalogs to be installed... " >&6; } - # Look for .po and .gmo files in the source directory. - CATALOGS= - XLINGUAS= - for cat in $srcdir/po/*.gmo $srcdir/po/*.po; do - # If there aren't any .gmo files the shell will give us the - # literal string "../path/to/srcdir/po/*.gmo" which has to be - # weeded out. - case "$cat" in *\**) - continue;; - esac - # The quadruple backslash is collapsed to a double backslash - # by the backticks, then collapsed again by the double quotes, - # leaving us with one backslash in the sed expression (right - # before the dot that mustn't act as a wildcard). - cat=`echo $cat | sed -e "s!$srcdir/po/!!" -e "s!\\\\.po!.gmo!"` - lang=`echo $cat | sed -e "s!\\\\.gmo!!"` - # The user is allowed to set LINGUAS to a list of languages to - # install catalogs for. If it's empty that means "all of them." - if test "x$LINGUAS" = x; then - CATALOGS="$CATALOGS $cat" - XLINGUAS="$XLINGUAS $lang" - else - case "$LINGUAS" in *$lang*) - CATALOGS="$CATALOGS $cat" - XLINGUAS="$XLINGUAS $lang" - ;; - esac - fi - done - LINGUAS="$XLINGUAS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 -$as_echo "$LINGUAS" >&6; } - - - DATADIRNAME=share - - INSTOBJEXT=.mo - - GENCAT=gencat - - CATOBJEXT=.gmo - -fi - - - # Use the system's zlib library. - zlibdir="-L\$(top_builddir)/../zlib" - zlibinc="-I\$(top_srcdir)/../zlib" - -# Check whether --with-system-zlib was given. -if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then - zlibdir= - zlibinc= - fi - -fi - - - - - - -# Check whether --with-zstd was given. -if test "${with_zstd+set}" = set; then : - withval=$with_zstd; -else - with_zstd=auto -fi - - -if test "$with_zstd" != no; then : - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libzstd" >&5 -$as_echo_n "checking for libzstd... " >&6; } - -if test -n "$ZSTD_CFLAGS"; then - pkg_cv_ZSTD_CFLAGS="$ZSTD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzstd\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libzstd") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_ZSTD_CFLAGS=`$PKG_CONFIG --cflags "libzstd" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$ZSTD_LIBS"; then - pkg_cv_ZSTD_LIBS="$ZSTD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzstd\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libzstd") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_ZSTD_LIBS=`$PKG_CONFIG --libs "libzstd" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - -if test $pkg_failed = no; then - pkg_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $pkg_cv_ZSTD_LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - -else - pkg_failed=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$pkg_save_LDFLAGS -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - ZSTD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libzstd" 2>&1` - else - ZSTD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libzstd" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$ZSTD_PKG_ERRORS" >&5 - - - if test "$with_zstd" = yes; then - as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 - fi - -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - - if test "$with_zstd" = yes; then - as_fn_error $? "--with-zstd was given, but pkgconfig/libzstd.pc is not found" "$LINENO" 5 - fi - -else - ZSTD_CFLAGS=$pkg_cv_ZSTD_CFLAGS - ZSTD_LIBS=$pkg_cv_ZSTD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - -$as_echo "#define HAVE_ZSTD 1" >>confdefs.h - - -fi - -fi - - - - maybe_plugins=no - for ac_header in dlfcn.h -do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default -" -if test "x$ac_cv_header_dlfcn_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF - maybe_plugins=yes -fi - -done - - for ac_header in windows.h -do : - ac_fn_c_check_header_compile "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default -" -if test "x$ac_cv_header_windows_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_WINDOWS_H 1 -_ACEOF - maybe_plugins=yes -fi - -done - - - # Check whether --enable-plugins was given. -if test "${enable_plugins+set}" = set; then : - enableval=$enable_plugins; case "${enableval}" in - no) plugins=no ;; - *) plugins=yes - if test "$maybe_plugins" != "yes" ; then - as_fn_error $? "Building with plugin support requires a host that supports dlopen." "$LINENO" 5 - fi ;; - esac -else - plugins=$maybe_plugins - -fi - - if test "$plugins" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlsym" >&5 -$as_echo_n "checking for library containing dlsym... " >&6; } -if ${ac_cv_search_dlsym+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlsym (); -int -main () -{ -return dlsym (); - ; - return 0; -} -_ACEOF -for ac_lib in '' dl; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_dlsym=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_dlsym+:} false; then : - break -fi -done -if ${ac_cv_search_dlsym+:} false; then : - -else - ac_cv_search_dlsym=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlsym" >&5 -$as_echo "$ac_cv_search_dlsym" >&6; } -ac_res=$ac_cv_search_dlsym -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - - fi - - if test "$plugins" = yes; then - PLUGINS_TRUE= - PLUGINS_FALSE='#' -else - PLUGINS_TRUE='#' - PLUGINS_FALSE= -fi - # Set options -enable_dlopen=yes + enable_dlopen=no + enable_win32_dll=no @@ -12776,7 +12426,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12779 "configure" +#line 12429 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12882,7 +12532,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12885 "configure" +#line 12535 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13120,7 +12770,6 @@ CC="$lt_save_CC" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind in -lsocket" >&5 $as_echo_n "checking for bind in -lsocket... " >&6; } if ${ac_cv_lib_socket_bind+:} false; then : @@ -16625,10 +16274,6 @@ LTLIBOBJS=$ac_ltlibobjs -if test -z "${PLUGINS_TRUE}" && test -z "${PLUGINS_FALSE}"; then - as_fn_error $? "conditional \"PLUGINS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/sim/m4/sim_ac_platform.m4 b/sim/m4/sim_ac_platform.m4 index a91b233..92fb00a 100644 --- a/sim/m4/sim_ac_platform.m4 +++ b/sim/m4/sim_ac_platform.m4 @@ -142,21 +142,7 @@ AC_TYPE_SIGNAL AC_TYPE_SIZE_T AC_TYPE_UID_T -dnl We don't use gettext, but bfd does. So we do the appropriate checks -dnl to see if there are intl libraries we should link against. -ALL_LINGUAS= -ZW_GNU_GETTEXT_SISTER_DIR - -dnl BFD conditionally uses zlib, so we must link it in if libbfd does, by -dnl using the same condition. -AM_ZLIB -AC_ZSTD - -dnl BFD uses libdl when when plugins enabled. -AC_PLUGINS -AM_CONDITIONAL(PLUGINS, test "$plugins" = yes) -LT_INIT([dlopen]) -AC_SUBST(lt_cv_dlopen_libs) +LT_INIT dnl Libraries. AC_CHECK_LIB(socket, bind) diff --git a/sim/moxie/Makefile.in b/sim/moxie/Makefile.in index b267adc..1c01ec6 100644 --- a/sim/moxie/Makefile.in +++ b/sim/moxie/Makefile.in @@ -22,7 +22,7 @@ SIM_OBJS = \ interp.o \ sim-resume.o -SIM_EXTRA_LIBS = -lm -lz +SIM_EXTRA_LIBS = -lm SIM_EXTRA_CFLAGS = -DDTB="\"$(dtbdir)/moxie-gdb.dtb\"" ## COMMON_POST_CONFIG_FRAG diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 2b5a11a..b1fda1f 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -88,7 +88,7 @@ CONFIG_CFLAGS = \ $(DEVZERO_CFLAGS) SIM_FPU_CFLAGS = -DHAVE_COMMON_FPU -I../common -I${srcdir}/../common -STD_CFLAGS = $(CFLAGS) $(WERROR_CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(INCGNU) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS) +STD_CFLAGS = $(CFLAGS) $(WERROR_CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(INCGNU) $(SIM_FPU_CFLAGS) NOWARN_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(INCLUDES) $(SIM_FPU_CFLAGS) BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARN_CFLAGS) @@ -132,8 +132,7 @@ GDB_INCLUDES = -I../../gdb -I$(srcdir)/../../gdb -I$(srcdir)/../../gdb/config INCLUDES = -I. -I$(srcdir) $(LIB_INCLUDES) $(BFD_INCLUDES) $(GDB_INCLUDES) -I../.. LIBIBERTY_LIB = ../../libiberty/libiberty.a -BFD_LIB = ../../bfd/libbfd.a -ZLIB = $(zlibdir) -lz +BFD_LIB = ../../bfd/libbfd.la TARGETLIB = libsim.a @@ -521,9 +520,9 @@ PACKAGE_SRC = @sim_pk_src@ PACKAGE_OBJ = @sim_pk_obj@ -psim$(EXEEXT): $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(LIBINTL_DEP) +psim$(EXEEXT): $(TARGETLIB) main.o $(LIBIBERTY_LIB) $(BFD_LIB) $(ECHO_CCLD) $(LIBTOOL) $(AM_V_lt) --tag=CC --mode=link \ - $(CC) $(CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(ZLIB) $(ZSTD_LIBS) $(LIBINTL) $(LIBIBERTY_LIB) $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o psim$(EXEEXT) main.o $(TARGETLIB) $(BFD_LIB) $(LIBIBERTY_LIB) $(LIBS) run$(EXEEXT): psim$(EXEEXT) $(SILENCE) rm -f $@ |