sim: switch to AC_CHECK_HEADERS_ONCE

This avoids duplicate tests for headers between common m4, arches,
and any other sources that would trigger header tests.

3 files changed, 70 insertions, 74 deletions

diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 64c71f9..a2653d4 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,5 +1,10 @@
 2021-04-18  Mike Frysinger  <vapier@gentoo.org>
 
+	* configure.ac: Change AC_CHECK_HEADERS to AC_CHECK_HEADERS_ONCE.
+	* configure: Regenerate.
+
+2021-04-18  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac: Change AC_CHECK_FUNCS to AC_CHECK_FUNCS_ONCE and
 	delete mmap & munmap.
 	* configure: Regenerate.
diff --git a/sim/bfin/configure b/sim/bfin/configure
index e1692b1..35ddcc9 100755
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@@ -629,6 +629,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
+ac_header_list=
 ac_func_list=
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
@@ -2312,6 +2313,15 @@ $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+as_fn_append ac_header_list " dlfcn.h"
+as_fn_append ac_header_list " fcntl.h"
+as_fn_append ac_header_list " fpu_control.h"
+as_fn_append ac_header_list " unistd.h"
+as_fn_append ac_header_list " sys/mman.h"
+as_fn_append ac_header_list " sys/resource.h"
+as_fn_append ac_header_list " sys/time.h"
+as_fn_append ac_header_list " sys/times.h"
+as_fn_append ac_header_list " sys/stat.h"
 as_fn_append ac_func_list " __setfpucw"
 as_fn_append ac_func_list " ftruncate"
 as_fn_append ac_func_list " getrusage"
@@ -2330,6 +2340,11 @@ as_fn_append ac_func_list " setuid"
 as_fn_append ac_func_list " setgid"
 as_fn_append ac_func_list " kill"
 as_fn_append ac_func_list " pread"
+as_fn_append ac_header_list " linux/if_tun.h"
+as_fn_append ac_header_list " linux/mii.h"
+as_fn_append ac_header_list " linux/types.h"
+as_fn_append ac_header_list " net/if.h"
+as_fn_append ac_header_list " sys/ioctl.h"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -3907,6 +3922,41 @@ DEPDIR="${am__leading_dot}deps"
 
 
 
+  for ac_header in $ac_header_list
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   for ac_func in $ac_func_list
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -7334,56 +7384,6 @@ fi
 
 # Check for common headers.
 # NB: You can assume C11 headers exist.
-for ac_header in unistd.h
-do :
-  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 HAVE_UNISTD_H 1
-_ACEOF
-
-fi
-
-done
-
-for ac_header in sys/time.h sys/times.h sys/resource.h sys/mman.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 :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-for ac_header in fcntl.h fpu_control.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 :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-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"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
 
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_dev" "ac_cv_member_struct_stat_st_dev" "#ifdef HAVE_SYS_TYPES_H
@@ -12304,25 +12304,16 @@ fi
 
 
 
-for ac_header in  \
-	linux/if_tun.h \
-	linux/mii.h \
-	linux/types.h \
-	net/if.h \
-	sys/ioctl.h \
-	sys/mman.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 :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
 
-fi
 
-done
+
+
+
+
+
+
+
 
 
 
diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac
index 6b15b77..cedd967 100644
--- a/sim/bfin/configure.ac
+++ b/sim/bfin/configure.ac
@@ -43,14 +43,14 @@ SIM_AC_OPTION_HARDWARE(yes,,\
 )
 
 AC_CHECK_FUNCS_ONCE([getuid getgid geteuid getegid setuid setgid kill pread])
-AC_CHECK_HEADERS([ \
-	linux/if_tun.h \
-	linux/mii.h \
-	linux/types.h \
-	net/if.h \
-	sys/ioctl.h \
-	sys/mman.h \
-])
+AC_CHECK_HEADERS_ONCE(m4_flatten([
+	linux/if_tun.h
+	linux/mii.h
+	linux/types.h
+	net/if.h
+	sys/ioctl.h
+	sys/mman.h
+]))
 
 PKG_PROG_PKG_CONFIG
 PKG_CHECK_MODULES(SDL, sdl, [