[PATCH/committed] sim: switch to AC_CHECK_HEADERS_ONCE
Mike Frysinger
vapier@gentoo.org
Mon Apr 19 03:54:40 GMT 2021
This avoids duplicate tests for headers between common m4, arches,
and any other sources that would trigger header tests.
---
sim/ChangeLog | 5 ++
sim/aarch64/configure | 99 +++++++++++++--------------
sim/arm/configure | 99 +++++++++++++--------------
sim/avr/configure | 99 +++++++++++++--------------
sim/bfin/ChangeLog | 5 ++
sim/bfin/configure | 123 ++++++++++++++++------------------
sim/bfin/configure.ac | 16 ++---
sim/bpf/configure | 99 +++++++++++++--------------
sim/cr16/configure | 99 +++++++++++++--------------
sim/cris/ChangeLog | 5 ++
sim/cris/configure | 116 +++++++++++++++-----------------
sim/cris/configure.ac | 6 +-
sim/d10v/configure | 99 +++++++++++++--------------
sim/erc32/configure | 99 +++++++++++++--------------
sim/example-synacor/configure | 99 +++++++++++++--------------
sim/frv/configure | 99 +++++++++++++--------------
sim/ft32/configure | 99 +++++++++++++--------------
sim/h8300/ChangeLog | 5 ++
sim/h8300/configure | 109 +++++++++++++-----------------
sim/h8300/configure.ac | 2 +-
sim/iq2000/ChangeLog | 4 ++
sim/iq2000/configure | 99 +++++++++++++--------------
sim/lm32/configure | 99 +++++++++++++--------------
sim/m32c/ChangeLog | 5 ++
sim/m32c/configure | 118 ++++++++++++++++----------------
sim/m32c/configure.ac | 8 ++-
sim/m32r/configure | 99 +++++++++++++--------------
sim/m4/sim_ac_common.m4 | 15 +++--
sim/m68hc11/configure | 99 +++++++++++++--------------
sim/mcore/configure | 99 +++++++++++++--------------
sim/microblaze/configure | 99 +++++++++++++--------------
sim/mips/configure | 99 +++++++++++++--------------
sim/mn10300/configure | 99 +++++++++++++--------------
sim/moxie/ChangeLog | 4 ++
sim/moxie/configure | 99 +++++++++++++--------------
sim/msp430/ChangeLog | 4 ++
sim/msp430/configure | 99 +++++++++++++--------------
sim/or1k/configure | 99 +++++++++++++--------------
sim/pru/configure | 99 +++++++++++++--------------
sim/riscv/configure | 99 +++++++++++++--------------
sim/rl78/ChangeLog | 5 ++
sim/rl78/configure | 109 +++++++++++++-----------------
sim/rl78/configure.ac | 2 +-
sim/rx/ChangeLog | 5 ++
sim/rx/configure | 109 +++++++++++++-----------------
sim/rx/configure.ac | 2 +-
sim/sh/ChangeLog | 4 ++
sim/sh/configure | 99 +++++++++++++--------------
sim/v850/ChangeLog | 5 ++
sim/v850/configure | 109 +++++++++++++-----------------
sim/v850/configure.ac | 2 +-
51 files changed, 1580 insertions(+), 1698 deletions(-)
diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac
index 6b15b77d15bc..cedd9677f569 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, [
diff --git a/sim/cris/configure.ac b/sim/cris/configure.ac
index 1eee81762ad9..56afe58331a0 100644
--- a/sim/cris/configure.ac
+++ b/sim/cris/configure.ac
@@ -5,7 +5,11 @@ AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
SIM_AC_COMMON
# For dv-rv and rvdummy.
-AC_CHECK_HEADERS(sys/socket.h sys/select.h sys/param.h)
+AC_CHECK_HEADERS_ONCE(m4_flatten([
+ sys/param.h
+ sys/select.h
+ sys/socket.h
+]))
SIM_AC_OPTION_ENDIAN(LITTLE)
SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
diff --git a/sim/h8300/configure.ac b/sim/h8300/configure.ac
index 177f7dee465b..8dc33c4cf3ab 100644
--- a/sim/h8300/configure.ac
+++ b/sim/h8300/configure.ac
@@ -8,6 +8,6 @@ SIM_AC_OPTION_ENDIAN(BIG)
SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
SIM_AC_OPTION_WARNINGS(no)
-AC_CHECK_HEADERS(sys/param.h)
+AC_CHECK_HEADERS_ONCE(sys/param.h)
SIM_AC_OUTPUT
diff --git a/sim/m32c/configure.ac b/sim/m32c/configure.ac
index 789bce45a029..a69fa1282932 100644
--- a/sim/m32c/configure.ac
+++ b/sim/m32c/configure.ac
@@ -25,6 +25,12 @@ SIM_AC_COMMON
SIM_AC_OPTION_WARNINGS(no)
-AC_CHECK_HEADERS(sys/select.h termios.h sys/socket.h netinet/in.h netinet/tcp.h)
+AC_CHECK_HEADERS_ONCE(m4_flatten([
+ termios.h
+ netinet/in.h
+ netinet/tcp.h
+ sys/select.h
+ sys/socket.h
+]))
SIM_AC_OUTPUT
diff --git a/sim/m4/sim_ac_common.m4 b/sim/m4/sim_ac_common.m4
index 78451429a831..3cc9e87d89db 100644
--- a/sim/m4/sim_ac_common.m4
+++ b/sim/m4/sim_ac_common.m4
@@ -52,10 +52,17 @@ ZW_GNU_GETTEXT_SISTER_DIR(../../intl)
# Check for common headers.
# NB: You can assume C11 headers exist.
-AC_CHECK_HEADERS(unistd.h)
-AC_CHECK_HEADERS(sys/time.h sys/times.h sys/resource.h sys/mman.h)
-AC_CHECK_HEADERS(fcntl.h fpu_control.h)
-AC_CHECK_HEADERS(dlfcn.h sys/stat.h)
+AC_CHECK_HEADERS_ONCE(m4_flatten([
+ dlfcn.h
+ fcntl.h
+ fpu_control.h
+ unistd.h
+ sys/mman.h
+ sys/resource.h
+ sys/time.h
+ sys/times.h
+ sys/stat.h
+]))
AC_CHECK_FUNCS_ONCE(m4_flatten([
__setfpucw
ftruncate
diff --git a/sim/rl78/configure.ac b/sim/rl78/configure.ac
index 1314b980fea0..fad367ce7b6b 100644
--- a/sim/rl78/configure.ac
+++ b/sim/rl78/configure.ac
@@ -24,6 +24,6 @@ AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
SIM_AC_COMMON
SIM_AC_OPTION_WARNINGS(no)
-AC_CHECK_HEADERS(getopt.h)
+AC_CHECK_HEADERS_ONCE(getopt.h)
SIM_AC_OUTPUT
diff --git a/sim/rx/configure.ac b/sim/rx/configure.ac
index 16e64a556902..344ab3967f77 100644
--- a/sim/rx/configure.ac
+++ b/sim/rx/configure.ac
@@ -23,7 +23,7 @@ AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
SIM_AC_COMMON
-AC_CHECK_HEADERS(getopt.h)
+AC_CHECK_HEADERS_ONCE(getopt.h)
AC_ARG_ENABLE(cycle-accurate,
[AS_HELP_STRING([--disable-cycle-accurate],
diff --git a/sim/v850/configure.ac b/sim/v850/configure.ac
index b2f69c31d8b9..f2edf1f7c480 100644
--- a/sim/v850/configure.ac
+++ b/sim/v850/configure.ac
@@ -10,6 +10,6 @@ SIM_AC_OPTION_RESERVED_BITS
SIM_AC_OPTION_BITSIZE(32,31)
AC_CHECK_FUNCS_ONCE(chmod utime fork execve execv chown)
-AC_CHECK_HEADERS(utime.h)
+AC_CHECK_HEADERS_ONCE(utime.h)
SIM_AC_OUTPUT
--
2.30.2
More information about the Gdb-patches
mailing list