diff options
author | Mike Frysinger <vapier@gentoo.org> | 2021-01-09 03:56:10 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2021-01-11 08:05:54 -0500 |
commit | 68ed2854284d415a71efd856a40343f550881ede (patch) | |
tree | f00f87cc7628c8e82de418bacc5d941db46c2481 /sim/m32r | |
parent | a8aa72b913e78407e5de4fefd22f9b98e4466f30 (diff) | |
download | fsf-binutils-gdb-68ed2854284d415a71efd856a40343f550881ede.zip fsf-binutils-gdb-68ed2854284d415a71efd856a40343f550881ede.tar.gz fsf-binutils-gdb-68ed2854284d415a71efd856a40343f550881ede.tar.bz2 |
sim: clean up C11 header includes
Since we require C11 now, we can assume many headers exist, and
clean up all of the conditional includes. It's not like any of
this code actually accounted for the headers not existing, just
whether we could include them.
The strings.h cleanup is a little nuanced: it isn't in C11, but
every use of it in the codebase will include strings.h only if
string.h doesn't exist. Since we now assume the C11 string.h
exists, we'll never include strings.h, so we can delete it.
Diffstat (limited to 'sim/m32r')
-rw-r--r-- | sim/m32r/ChangeLog | 6 | ||||
-rw-r--r-- | sim/m32r/config.in | 6 | ||||
-rwxr-xr-x | sim/m32r/configure | 41 | ||||
-rw-r--r-- | sim/m32r/sim-if.c | 8 |
4 files changed, 37 insertions, 24 deletions
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index ed284ea..dd4bba9 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,3 +1,9 @@ +2021-01-11 Mike Frysinger <vapier@gentoo.org> + + * config.in, configure: Regenerate. + * sim-if.c: Delete HAVE_STRING_H, HAVE_STRINGS_H, HAVE_STDLIB_H, + and strings.h include. + 2021-01-09 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. diff --git a/sim/m32r/config.in b/sim/m32r/config.in index ea6c08c..c60f7d8 100644 --- a/sim/m32r/config.in +++ b/sim/m32r/config.in @@ -16,9 +16,6 @@ /* Define if dv-sockser is usable. */ #undef HAVE_DV_SOCKSER -/* 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 @@ -136,9 +133,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/m32r/configure b/sim/m32r/configure index ceb542c..5b73aa5 100755 --- a/sim/m32r/configure +++ b/sim/m32r/configure @@ -6805,6 +6805,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 @@ -6898,6 +6911,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 @@ -7102,6 +7120,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 @@ -8938,15 +8961,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 @@ -8979,7 +9000,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" @@ -12916,7 +12937,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12919 "configure" +#line 12940 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13022,7 +13043,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13025 "configure" +#line 13046 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/sim/m32r/sim-if.c b/sim/m32r/sim-if.c index c25d9a8..08003b5 100644 --- a/sim/m32r/sim-if.c +++ b/sim/m32r/sim-if.c @@ -22,16 +22,8 @@ #include "libiberty.h" #include "bfd.h" -#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 #include "dv-m32r_uart.h" |