From b5689863bdca11c6c86fe8d02b4f7330804f6883 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 18 Jun 2021 02:03:44 -0400 Subject: sim: unify bfd library dependency testing logic Move these options up to the common dir so we only test & export them once across all ports. --- sim/ppc/ChangeLog | 7 + sim/ppc/Makefile.in | 4 +- sim/ppc/aclocal.m4 | 2 - sim/ppc/config.in | 6 - sim/ppc/configure | 798 ++++++++++++++++++++------------------------------- sim/ppc/configure.ac | 7 - 6 files changed, 318 insertions(+), 506 deletions(-) (limited to 'sim/ppc') diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index c5af4c8..7957178 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,10 @@ +2021-06-19 Mike Frysinger + + * Makefile.in (LIBS): Add $(COMMON_LIBS). + (ZLIB): Use $(zlibdir). + * configure.ac: Delete AM_ZLIB & AC_PLUGINS calls. + * aclocal.m4, config.in, configure: Regenerate. + 2021-06-18 Mike Frysinger * Makefile.in (WERROR_CFLAGS): Delete. diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 695b0f1..a45d4aa 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -105,7 +105,7 @@ NOWARN_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(INCLUDES) $(SIM_FP BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS) LDFLAGS_FOR_BUILD = -LIBS = @LIBS@ +LIBS = $(COMMON_LIBS) @LIBS@ COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ @@ -147,7 +147,7 @@ INCLUDES = -I. -I$(srcdir) $(LIB_INCLUDES) $(BFD_INCLUDES) $(GDB_INCLUDES) -I../ LIBIBERTY_LIB = ../../libiberty/libiberty.a BFD_LIB = ../../bfd/libbfd.a -ZLIB = @zlibdir@ -lz +ZLIB = $(zlibdir) -lz LIBINTL = @LIBINTL@ LIBINTL_DEP = @LIBINTL_DEP@ diff --git a/sim/ppc/aclocal.m4 b/sim/ppc/aclocal.m4 index 16c4360..4056719 100644 --- a/sim/ppc/aclocal.m4 +++ b/sim/ppc/aclocal.m4 @@ -13,5 +13,3 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([../../config/gettext-sister.m4]) -m4_include([../../config/plugins.m4]) -m4_include([../../config/zlib.m4]) diff --git a/sim/ppc/config.in b/sim/ppc/config.in index 1067e02..f55317c 100644 --- a/sim/ppc/config.in +++ b/sim/ppc/config.in @@ -4,9 +4,6 @@ language is requested. */ #undef ENABLE_NLS -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -43,9 +40,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the header file. */ -#undef HAVE_WINDOWS_H - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff --git a/sim/ppc/configure b/sim/ppc/configure index afd6471..0cdb5f8 100755 --- a/sim/ppc/configure +++ b/sim/ppc/configure @@ -661,8 +661,6 @@ CC_FOR_BUILD EGREP GREP CPP -zlibinc -zlibdir target_os target_vendor target_cpu @@ -762,8 +760,6 @@ enable_sim_switch enable_sim_timebase enable_sim_warnings enable_sim_xor_endian -with_system_zlib -enable_plugins ' ac_precious_vars='build_alias host_alias @@ -1415,12 +1411,6 @@ Optional Features: --enable-sim-timebase Specify whether the PPC timebase is supported. --enable-sim-warnings=opts Extra CFLAGS for turning on compiler warnings except for idecode.o, semantics.o and psim.o --enable-sim-xor-endian=n Specify number bytes involved in PowerPC XOR bi-endian mode (default 8). - --enable-plugins Enable support for plugins - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-system-zlib use installed libz Some influential environment variables: CC C compiler command @@ -1592,11 +1582,11 @@ fi } # ac_fn_c_try_run -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 @@ -1604,15 +1594,38 @@ $as_echo_n "checking for $2... " >&6; } if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else + eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 -#include <$2> +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + else - eval "$3=no" + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -1621,7 +1634,7 @@ eval ac_res=\$$3 $as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -} # ac_fn_c_check_header_compile +} # ac_fn_c_check_type # ac_fn_c_try_cpp LINENO # ---------------------- @@ -1660,57 +1673,11 @@ fi } # ac_fn_c_try_cpp -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - test -x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_link - -# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -# ------------------------------------------- -# Tests whether TYPE exists after having included INCLUDES, setting cache -# variable VAR accordingly. -ac_fn_c_check_type () +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 @@ -1718,38 +1685,15 @@ $as_echo_n "checking for $2... " >&6; } if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else - eval "$3=no" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof ($2)) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 -int -main () -{ -if (sizeof (($2))) - return 0; - ; - return 0; -} +#include <$2> _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - -else eval "$3=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + eval "$3=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -1758,7 +1702,7 @@ eval ac_res=\$$3 $as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -} # ac_fn_c_check_type +} # ac_fn_c_check_header_compile cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -3864,116 +3808,300 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# BFD conditionally uses zlib, so we must link it in if libbfd does, by -# using the same condition. - - # 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 +case ${host} in + *mingw32*) -fi +$as_echo "#define USE_WIN32API 1" >>confdefs.h + ;; +esac +ac_config_headers="$ac_config_headers config.h:config.in" -# BFD uses libdl when when plugins enabled. -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : +sim_termio="" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct termios" >&5 +$as_echo_n "checking for struct termios... " >&6; } +if ${ac_cv_termios_struct+:} false; then : $as_echo_n "(cached) " >&6 else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error +#include +#include +int +main () +{ +static struct termios x; + x.c_iflag = 0; + x.c_oflag = 0; + x.c_cflag = 0; + x.c_lflag = 0; + x.c_cc[NCCS] = 0; + ; + return 0; +} _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_termios_struct=yes else - # Broken: fails on valid input. -continue + ac_cv_termios_struct=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.i conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_termios_struct" >&5 +$as_echo "$ac_cv_termios_struct" >&6; } +if test $ac_cv_termios_struct = yes; then + sim_termio="$sim_termio -DHAVE_TERMIOS_STRUCTURE" +fi + +if test "$ac_cv_termios_struct" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c_line field in struct termios" >&5 +$as_echo_n "checking for c_line field in struct termios... " >&6; } + if ${ac_cv_termios_cline+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#include +#include +int +main () +{ +static struct termios x; x.c_line = 0; + ; + return 0; +} _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_termios_cline=yes else - # Passes both tests. -ac_preproc_ok=: -break + ac_cv_termios_cline=no fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - done - ac_cv_prog_CPP=$CPP -fi - CPP=$ac_cv_prog_CPP + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_termios_cline" >&5 +$as_echo "$ac_cv_termios_cline" >&6; } + if test $ac_cv_termios_cline = yes; then + sim_termio="$sim_termio -DHAVE_TERMIOS_CLINE" + fi else - ac_cv_prog_CPP=$CPP + ac_cv_termios_cline=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. + +if test "$ac_cv_termios_struct" != "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct termio" >&5 +$as_echo_n "checking for struct termio... " >&6; } + if ${ac_cv_termio_struct+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC__ +#include +#include +int +main () +{ +static struct termio x; + x.c_iflag = 0; + x.c_oflag = 0; + x.c_cflag = 0; + x.c_lflag = 0; + x.c_cc[NCC] = 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_termio_struct=yes +else + ac_cv_termio_struct=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_termio_struct" >&5 +$as_echo "$ac_cv_termio_struct" >&6; } + if test $ac_cv_termio_struct = yes; then + sim_termio="$sim_termio -DHAVE_TERMIO_STRUCTURE" + fi +else + ac_cv_termio_struct=no +fi + +if test "$ac_cv_termio_struct" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c_line field in struct termio" >&5 +$as_echo_n "checking for c_line field in struct termio... " >&6; } + if ${ac_cv_termio_cline+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +int +main () +{ +static struct termio x; x.c_line = 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_termio_cline=yes +else + ac_cv_termio_cline=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_termio_cline" >&5 +$as_echo "$ac_cv_termio_cline" >&6; } + if test $ac_cv_termio_cline = yes; then + sim_termio="$sim_termio -DHAVE_TERMIO_CLINE" + fi +else + ac_cv_termio_cline=no +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct statfs" >&5 +$as_echo_n "checking for struct statfs... " >&6; } +if ${ac_cv_struct_statfs+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#ifdef HAVE_SYS_PARAM_H +#include +#endif +#ifdef HAVE_SYS_MOUNT_H +#include +#endif +#ifdef HAVE_SYS_VFS_H +#include +#endif +#ifdef HAVE_SYS_STATFS_H +#include +#endif +int +main () +{ +static struct statfs s; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_struct_statfs=yes +else + ac_cv_struct_statfs=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_statfs" >&5 +$as_echo "$ac_cv_struct_statfs" >&6; } +if test $ac_cv_struct_statfs = yes; then + +$as_echo "#define HAVE_STRUCT_STATFS 1" >>confdefs.h + +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ # include #else # include @@ -4282,314 +4410,6 @@ fi done - - 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 - - -case ${host} in - *mingw32*) - -$as_echo "#define USE_WIN32API 1" >>confdefs.h - - ;; -esac - -ac_config_headers="$ac_config_headers config.h:config.in" - - - -sim_termio="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct termios" >&5 -$as_echo_n "checking for struct termios... " >&6; } -if ${ac_cv_termios_struct+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -int -main () -{ -static struct termios x; - x.c_iflag = 0; - x.c_oflag = 0; - x.c_cflag = 0; - x.c_lflag = 0; - x.c_cc[NCCS] = 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_termios_struct=yes -else - ac_cv_termios_struct=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_termios_struct" >&5 -$as_echo "$ac_cv_termios_struct" >&6; } -if test $ac_cv_termios_struct = yes; then - sim_termio="$sim_termio -DHAVE_TERMIOS_STRUCTURE" -fi - -if test "$ac_cv_termios_struct" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c_line field in struct termios" >&5 -$as_echo_n "checking for c_line field in struct termios... " >&6; } - if ${ac_cv_termios_cline+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -int -main () -{ -static struct termios x; x.c_line = 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_termios_cline=yes -else - ac_cv_termios_cline=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_termios_cline" >&5 -$as_echo "$ac_cv_termios_cline" >&6; } - if test $ac_cv_termios_cline = yes; then - sim_termio="$sim_termio -DHAVE_TERMIOS_CLINE" - fi -else - ac_cv_termios_cline=no -fi - -if test "$ac_cv_termios_struct" != "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct termio" >&5 -$as_echo_n "checking for struct termio... " >&6; } - if ${ac_cv_termio_struct+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -int -main () -{ -static struct termio x; - x.c_iflag = 0; - x.c_oflag = 0; - x.c_cflag = 0; - x.c_lflag = 0; - x.c_cc[NCC] = 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_termio_struct=yes -else - ac_cv_termio_struct=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_termio_struct" >&5 -$as_echo "$ac_cv_termio_struct" >&6; } - if test $ac_cv_termio_struct = yes; then - sim_termio="$sim_termio -DHAVE_TERMIO_STRUCTURE" - fi -else - ac_cv_termio_struct=no -fi - -if test "$ac_cv_termio_struct" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c_line field in struct termio" >&5 -$as_echo_n "checking for c_line field in struct termio... " >&6; } - if ${ac_cv_termio_cline+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -int -main () -{ -static struct termio x; x.c_line = 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_termio_cline=yes -else - ac_cv_termio_cline=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_termio_cline" >&5 -$as_echo "$ac_cv_termio_cline" >&6; } - if test $ac_cv_termio_cline = yes; then - sim_termio="$sim_termio -DHAVE_TERMIO_CLINE" - fi -else - ac_cv_termio_cline=no -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct statfs" >&5 -$as_echo_n "checking for struct statfs... " >&6; } -if ${ac_cv_struct_statfs+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#ifdef HAVE_SYS_PARAM_H -#include -#endif -#ifdef HAVE_SYS_MOUNT_H -#include -#endif -#ifdef HAVE_SYS_VFS_H -#include -#endif -#ifdef HAVE_SYS_STATFS_H -#include -#endif -int -main () -{ -static struct statfs s; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_struct_statfs=yes -else - ac_cv_struct_statfs=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_statfs" >&5 -$as_echo "$ac_cv_struct_statfs" >&6; } -if test $ac_cv_struct_statfs = yes; then - -$as_echo "#define HAVE_STRUCT_STATFS 1" >>confdefs.h - -fi - ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default" if test "x$ac_cv_type_long_long" = xyes; then : diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac index fb0eae6..605bdf9 100644 --- a/sim/ppc/configure.ac +++ b/sim/ppc/configure.ac @@ -506,13 +506,6 @@ fi],[sim_xor_endian=""])dnl AC_CANONICAL_SYSTEM AC_ARG_PROGRAM -# BFD conditionally uses zlib, so we must link it in if libbfd does, by -# using the same condition. -AM_ZLIB - -# BFD uses libdl when when plugins enabled. -AC_PLUGINS - case ${host} in *mingw32*) AC_DEFINE(USE_WIN32API, 1, -- cgit v1.1