diff options
Diffstat (limited to 'sim/sh')
| -rw-r--r-- | sim/sh/ChangeLog | 6 | ||||
| -rw-r--r-- | sim/sh/config.in | 6 | ||||
| -rwxr-xr-x | sim/sh/configure | 41 | ||||
| -rw-r--r-- | sim/sh/interp.c | 12 |
4 files changed, 37 insertions, 28 deletions
diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog index 214c45e..c3a103a 100644 --- a/sim/sh/ChangeLog +++ b/sim/sh/ChangeLog @@ -1,3 +1,9 @@ +2021-01-11 Mike Frysinger <vapier@gentoo.org> + + * config.in, configure: Regenerate. + * interp.c, simops.c: Delete HAVE_STRING_H, HAVE_STRINGS_H, + HAVE_STDLIB_H, HAVE_TIME_H, and strings.h include. + 2021-01-09 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. diff --git a/sim/sh/config.in b/sim/sh/config.in index 7c667a1..cb5ea1b 100644 --- a/sim/sh/config.in +++ b/sim/sh/config.in @@ -13,9 +13,6 @@ /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you have the <errno.h> header file. */ -#undef HAVE_ERRNO_H - /* Define to 1 if you have the <fcntl.h> header file. */ #undef HAVE_FCNTL_H @@ -130,9 +127,6 @@ /* Define to 1 if you have the `time' function. */ #undef HAVE_TIME -/* Define to 1 if you have the <time.h> header file. */ -#undef HAVE_TIME_H - /* Define to 1 if you have the `truncate' function. */ #undef HAVE_TRUNCATE diff --git a/sim/sh/configure b/sim/sh/configure index d522be2..e781129 100755 --- a/sim/sh/configure +++ b/sim/sh/configure @@ -6797,6 +6797,19 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown +plugin_option= +plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll" +for plugin in $plugin_names; do + plugin_so=`${CC} ${CFLAGS} --print-prog-name $plugin` + if test x$plugin_so = x$plugin; then + plugin_so=`${CC} ${CFLAGS} --print-file-name $plugin` + fi + if test x$plugin_so != x$plugin; then + plugin_option="--plugin $plugin_so" + break + fi +done + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -6890,6 +6903,11 @@ else fi test -z "$AR" && AR=ar +if test -n "$plugin_option"; then + if $AR --help 2>&1 | grep -q "\--plugin"; then + AR="$AR $plugin_option" + fi +fi test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -7094,6 +7112,11 @@ else fi test -z "$RANLIB" && RANLIB=: +if test -n "$plugin_option" && test "$RANLIB" != ":"; then + if $RANLIB --help 2>&1 | grep -q "\--plugin"; then + RANLIB="$RANLIB $plugin_option" + fi +fi @@ -8930,15 +8953,13 @@ $as_echo "$LINGUAS" >&6; } fi # Check for common headers. -# FIXME: Seems to me this can cause problems for i386-windows hosts. -# At one point there were hardcoded AC_DEFINE's if ${host} = i386-*-windows*. -for ac_header in stdlib.h string.h strings.h unistd.h time.h +# NB: You can assume C11 headers exist. +for ac_header in unistd.h do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" +if test "x$ac_cv_header_unistd_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_UNISTD_H 1 _ACEOF fi @@ -8971,7 +8992,7 @@ fi done -for ac_header in dlfcn.h errno.h sys/stat.h +for ac_header in dlfcn.h sys/stat.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -12908,7 +12929,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12911 "configure" +#line 12932 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13014,7 +13035,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13017 "configure" +#line 13038 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/sh/interp.c b/sim/sh/interp.c index c77cf3b..872bfe2 100644 --- a/sim/sh/interp.c +++ b/sim/sh/interp.c @@ -37,24 +37,12 @@ # endif #endif -#ifdef HAVE_STRING_H #include <string.h> -#else -#ifdef HAVE_STRINGS_H -#include <strings.h> -#endif -#endif - -#ifdef HAVE_STDLIB_H #include <stdlib.h> -#endif - #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif -#ifdef HAVE_TIME_H #include <time.h> -#endif #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif |