gdb, gdbserver, gdbsupport: flatten and sort some list in configure files

This makes the lists easier sort read and modify.  There are no changes
in the generated config.h files, so I'm confident this brings no
functional changes.

Change-Id: Ib6b7fc532bcd662af7dbb230070fb1f4fc75f86b
This commit is contained in:
Simon Marchi
2024-12-02 10:35:23 -05:00
parent 4de92ce8b2
commit 11fdaff161
6 changed files with 298 additions and 59 deletions

106
gdb/configure vendored
View File

@@ -19567,7 +19567,25 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
fi fi
for ac_header in linux/perf_event.h locale.h memory.h signal.h sys/resource.h sys/socket.h sys/un.h sys/wait.h thread_db.h wait.h termios.h dlfcn.h linux/elf.h proc_service.h poll.h sys/poll.h sys/select.h for ac_header in \
dlfcn.h \
linux/elf.h \
linux/perf_event.h \
locale.h \
memory.h \
poll.h \
proc_service.h \
signal.h \
sys/poll.h \
sys/resource.h \
sys/select.h \
sys/socket.h \
sys/un.h \
sys/wait.h \
termios.h \
thread_db.h \
wait.h \
do : do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 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" ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -20029,9 +20047,25 @@ if test "$ac_res" != no; then :
fi fi
for ac_func in fdwalk getrlimit pipe pipe2 poll socketpair sigaction \ for ac_func in \
ptrace64 sbrk setns sigaltstack sigprocmask \ fdwalk \
setpgid setpgrp getrusage getauxval sigtimedwait getauxval \
getrlimit \
getrusage \
pipe \
pipe2 \
poll \
ptrace64 \
sbrk \
setns \
setpgid \
setpgrp \
sigaction \
sigaltstack \
sigprocmask \
sigtimedwait \
socketpair \
do : do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -29154,12 +29188,23 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi fi
# elf_hp.h is for HP/UX 64-bit shared library support. # elf_hp.h is for HP/UX 64-bit shared library support.
for ac_header in nlist.h machine/reg.h \ for ac_header in \
thread_db.h \ elf_hp.h \
sys/file.h sys/filio.h sys/ioctl.h sys/param.h \ machine/reg.h \
sys/procctl.h sys/resource.h sys/ptrace.h ptrace.h \ nlist.h \
sys/reg.h sys/debugreg.h \ ptrace.h \
termios.h elf_hp.h sys/debugreg.h \
sys/file.h \
sys/filio.h \
sys/ioctl.h \
sys/param.h \
sys/procctl.h \
sys/ptrace.h \
sys/reg.h \
sys/resource.h \
termios.h \
thread_db.h \
do : do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 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" ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -29172,6 +29217,7 @@ fi
done done
for ac_header in sys/user.h for ac_header in sys/user.h
do : do :
ac_fn_c_check_header_compile "$LINENO" "sys/user.h" "ac_cv_header_sys_user_h" "#if HAVE_SYS_PARAM_H ac_fn_c_check_header_compile "$LINENO" "sys/user.h" "ac_cv_header_sys_user_h" "#if HAVE_SYS_PARAM_H
@@ -29189,7 +29235,14 @@ fi
done done
for ac_header in curses.h cursesX.h ncurses.h ncursesw/ncurses.h ncurses/ncurses.h ncurses/term.h for ac_header in \
curses.h \
cursesX.h \
ncurses.h \
ncurses/ncurses.h \
ncurses/term.h \
ncursesw/ncurses.h \
do : do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 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" ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -29202,6 +29255,7 @@ fi
done done
for ac_header in term.h for ac_header in term.h
do : do :
ac_fn_c_check_header_compile "$LINENO" "term.h" "ac_cv_header_term_h" "#if HAVE_CURSES_H ac_fn_c_check_header_compile "$LINENO" "term.h" "ac_cv_header_term_h" "#if HAVE_CURSES_H
@@ -29853,13 +29907,28 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
# Checks for library functions. # # Checks for library functions. #
# ------------------------------ # # ------------------------------ #
for ac_func in getuid getgid \ for ac_func in \
pread pread64 pwrite resize_term \ btowc \
getpgid setsid \ getgid \
sigsetmask \ getpgid \
ttrace wresize setlocale iconvlist libiconvlist btowc \ getrlimit \
setrlimit getrlimit posix_madvise waitpid \ getuid \
use_default_colors iconvlist \
libiconvlist \
posix_madvise \
pread \
pread64 \
pwrite \
resize_term \
setlocale \
setrlimit \
setsid \
sigsetmask \
ttrace \
use_default_colors \
waitpid \
wresize \
do : do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -29872,6 +29941,7 @@ fi
done done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
$as_echo_n "checking for nl_langinfo and CODESET... " >&6; } $as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
if ${am_cv_langinfo_codeset+:} false; then : if ${am_cv_langinfo_codeset+:} false; then :

View File

@@ -1295,19 +1295,39 @@ AC_SUBST(SRCHIGH_CFLAGS)
AC_HEADER_STDC AC_HEADER_STDC
# elf_hp.h is for HP/UX 64-bit shared library support. # elf_hp.h is for HP/UX 64-bit shared library support.
AC_CHECK_HEADERS([nlist.h machine/reg.h \ AC_CHECK_HEADERS([ \
thread_db.h \ elf_hp.h \
sys/file.h sys/filio.h sys/ioctl.h sys/param.h \ machine/reg.h \
sys/procctl.h sys/resource.h sys/ptrace.h ptrace.h \ nlist.h \
sys/reg.h sys/debugreg.h \ ptrace.h \
termios.h elf_hp.h]) sys/debugreg.h \
sys/file.h \
sys/filio.h \
sys/ioctl.h \
sys/param.h \
sys/procctl.h \
sys/ptrace.h \
sys/reg.h \
sys/resource.h \
termios.h \
thread_db.h \
])
AC_CHECK_HEADERS(sys/user.h, [], [], AC_CHECK_HEADERS(sys/user.h, [], [],
[#if HAVE_SYS_PARAM_H [#if HAVE_SYS_PARAM_H
# include <sys/param.h> # include <sys/param.h>
#endif #endif
]) ])
AC_CHECK_HEADERS(curses.h cursesX.h ncurses.h ncursesw/ncurses.h ncurses/ncurses.h ncurses/term.h) AC_CHECK_HEADERS([ \
curses.h \
cursesX.h \
ncurses.h \
ncurses/ncurses.h \
ncurses/term.h \
ncursesw/ncurses.h \
])
AC_CHECK_HEADERS(term.h, [], [], AC_CHECK_HEADERS(term.h, [], [],
[#if HAVE_CURSES_H [#if HAVE_CURSES_H
# include <curses.h> # include <curses.h>
@@ -1352,13 +1372,29 @@ AC_C_BIGENDIAN
# Checks for library functions. # # Checks for library functions. #
# ------------------------------ # # ------------------------------ #
AC_CHECK_FUNCS([getuid getgid \ AC_CHECK_FUNCS([ \
pread pread64 pwrite resize_term \ btowc \
getpgid setsid \ getgid \
sigsetmask \ getpgid \
ttrace wresize setlocale iconvlist libiconvlist btowc \ getrlimit \
setrlimit getrlimit posix_madvise waitpid \ getuid \
use_default_colors]) iconvlist \
libiconvlist \
posix_madvise \
pread \
pread64 \
pwrite \
resize_term \
setlocale \
setrlimit \
setsid \
sigsetmask \
ttrace \
use_default_colors \
waitpid \
wresize \
])
AM_LANGINFO_CODESET AM_LANGINFO_CODESET
# Check the return and argument types of ptrace. # Check the return and argument types of ptrace.

67
gdbserver/configure vendored
View File

@@ -8274,7 +8274,25 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
fi fi
for ac_header in linux/perf_event.h locale.h memory.h signal.h sys/resource.h sys/socket.h sys/un.h sys/wait.h thread_db.h wait.h termios.h dlfcn.h linux/elf.h proc_service.h poll.h sys/poll.h sys/select.h for ac_header in \
dlfcn.h \
linux/elf.h \
linux/perf_event.h \
locale.h \
memory.h \
poll.h \
proc_service.h \
signal.h \
sys/poll.h \
sys/resource.h \
sys/select.h \
sys/socket.h \
sys/un.h \
sys/wait.h \
termios.h \
thread_db.h \
wait.h \
do : do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 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" ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -8736,9 +8754,25 @@ if test "$ac_res" != no; then :
fi fi
for ac_func in fdwalk getrlimit pipe pipe2 poll socketpair sigaction \ for ac_func in \
ptrace64 sbrk setns sigaltstack sigprocmask \ fdwalk \
setpgid setpgrp getrusage getauxval sigtimedwait getauxval \
getrlimit \
getrusage \
pipe \
pipe2 \
poll \
ptrace64 \
sbrk \
setns \
setpgid \
setpgrp \
sigaction \
sigaltstack \
sigprocmask \
sigtimedwait \
socketpair \
do : do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -13119,7 +13153,23 @@ else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
fi fi
for ac_header in termios.h sys/reg.h string.h sys/procfs.h linux/elf.h fcntl.h signal.h sys/file.h sys/ioctl.h netinet/in.h sys/socket.h netdb.h netinet/tcp.h arpa/inet.h ws2tcpip.h for ac_header in \
arpa/inet.h \
fcntl.h \
linux/elf.h \
netdb.h \
netinet/in.h \
netinet/tcp.h \
signal.h \
string.h \
sys/file.h \
sys/ioctl.h \
sys/procfs.h \
sys/reg.h \
sys/socket.h \
termios.h \
ws2tcpip.h \
do : do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 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" ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -13132,6 +13182,7 @@ fi
done done
for ac_header in vfork.h for ac_header in vfork.h
do : do :
ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
@@ -13345,7 +13396,11 @@ $as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
fi fi
for ac_func in pread pwrite pread64 for ac_func in \
pread \
pread64 \
pwrite \
do : do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

View File

@@ -80,13 +80,30 @@ AC_CONFIG_COMMANDS([gdbdepdir],[
ZW_PROG_COMPILER_DEPENDENCIES([CC]) ZW_PROG_COMPILER_DEPENDENCIES([CC])
AC_CHECK_HEADERS(termios.h sys/reg.h string.h dnl AC_CHECK_HEADERS([ \
sys/procfs.h linux/elf.h dnl arpa/inet.h \
fcntl.h signal.h sys/file.h dnl fcntl.h \
sys/ioctl.h netinet/in.h sys/socket.h netdb.h dnl linux/elf.h \
netinet/tcp.h arpa/inet.h ws2tcpip.h) netdb.h \
netinet/in.h \
netinet/tcp.h \
signal.h \
string.h \
sys/file.h \
sys/ioctl.h \
sys/procfs.h \
sys/reg.h \
sys/socket.h \
termios.h \
ws2tcpip.h \
])
AC_FUNC_FORK AC_FUNC_FORK
AC_CHECK_FUNCS(pread pwrite pread64) AC_CHECK_FUNCS([ \
pread \
pread64 \
pwrite \
])
# Check the return and argument types of ptrace. # Check the return and argument types of ptrace.
GDB_AC_PTRACE GDB_AC_PTRACE

View File

@@ -40,22 +40,49 @@ AC_DEFUN([GDB_AC_COMMON], [
dnl by the users of common.m4. dnl by the users of common.m4.
AM_LANGINFO_CODESET AM_LANGINFO_CODESET
AC_CHECK_HEADERS(linux/perf_event.h locale.h memory.h signal.h dnl AC_CHECK_HEADERS([ \
sys/resource.h sys/socket.h dnl dlfcn.h \
sys/un.h sys/wait.h dnl linux/elf.h \
thread_db.h wait.h dnl linux/perf_event.h \
termios.h dnl locale.h \
dlfcn.h dnl memory.h \
linux/elf.h proc_service.h dnl poll.h \
poll.h sys/poll.h sys/select.h) proc_service.h \
signal.h \
sys/poll.h \
sys/resource.h \
sys/select.h \
sys/socket.h \
sys/un.h \
sys/wait.h \
termios.h \
thread_db.h \
wait.h \
])
AC_FUNC_MMAP AC_FUNC_MMAP
AC_FUNC_FORK AC_FUNC_FORK
# Some systems (e.g. Solaris) have `socketpair' in libsocket. # Some systems (e.g. Solaris) have `socketpair' in libsocket.
AC_SEARCH_LIBS(socketpair, socket) AC_SEARCH_LIBS(socketpair, socket)
AC_CHECK_FUNCS([fdwalk getrlimit pipe pipe2 poll socketpair sigaction \ AC_CHECK_FUNCS([ \
ptrace64 sbrk setns sigaltstack sigprocmask \ fdwalk \
setpgid setpgrp getrusage getauxval sigtimedwait]) getauxval \
getrlimit \
getrusage \
pipe \
pipe2 \
poll \
ptrace64 \
sbrk \
setns \
setpgid \
setpgrp \
sigaction \
sigaltstack \
sigprocmask \
sigtimedwait \
socketpair \
])
# This is needed for RHEL 5 and uclibc-ng < 1.0.39. # This is needed for RHEL 5 and uclibc-ng < 1.0.39.
# These did not define ADDR_NO_RANDOMIZE in sys/personality.h, # These did not define ADDR_NO_RANDOMIZE in sys/personality.h,

42
gdbsupport/configure vendored
View File

@@ -11048,7 +11048,25 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
fi fi
for ac_header in linux/perf_event.h locale.h memory.h signal.h sys/resource.h sys/socket.h sys/un.h sys/wait.h thread_db.h wait.h termios.h dlfcn.h linux/elf.h proc_service.h poll.h sys/poll.h sys/select.h for ac_header in \
dlfcn.h \
linux/elf.h \
linux/perf_event.h \
locale.h \
memory.h \
poll.h \
proc_service.h \
signal.h \
sys/poll.h \
sys/resource.h \
sys/select.h \
sys/socket.h \
sys/un.h \
sys/wait.h \
termios.h \
thread_db.h \
wait.h \
do : do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 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" ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -11510,9 +11528,25 @@ if test "$ac_res" != no; then :
fi fi
for ac_func in fdwalk getrlimit pipe pipe2 poll socketpair sigaction \ for ac_func in \
ptrace64 sbrk setns sigaltstack sigprocmask \ fdwalk \
setpgid setpgrp getrusage getauxval sigtimedwait getauxval \
getrlimit \
getrusage \
pipe \
pipe2 \
poll \
ptrace64 \
sbrk \
setns \
setpgid \
setpgrp \
sigaction \
sigaltstack \
sigprocmask \
sigtimedwait \
socketpair \
do : do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"