From 11fdaff16105f1030a1bc8785bc2bcdcef57fee0 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 2 Dec 2024 10:35:23 -0500 Subject: 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 --- gdb/configure | 106 +++++++++++++++++++++++++++++++++++++++++++++---------- gdb/configure.ac | 64 +++++++++++++++++++++++++-------- 2 files changed, 138 insertions(+), 32 deletions(-) (limited to 'gdb') diff --git a/gdb/configure b/gdb/configure index fcebd3e..4c498a8 100755 --- a/gdb/configure +++ b/gdb/configure @@ -19567,7 +19567,25 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h 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 : 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" @@ -20029,9 +20047,25 @@ if test "$ac_res" != no; then : fi - for ac_func in fdwalk getrlimit pipe pipe2 poll socketpair sigaction \ - ptrace64 sbrk setns sigaltstack sigprocmask \ - setpgid setpgrp getrusage getauxval sigtimedwait + for ac_func in \ + fdwalk \ + getauxval \ + getrlimit \ + getrusage \ + pipe \ + pipe2 \ + poll \ + ptrace64 \ + sbrk \ + setns \ + setpgid \ + setpgrp \ + sigaction \ + sigaltstack \ + sigprocmask \ + sigtimedwait \ + socketpair \ + do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -29154,12 +29188,23 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h fi # elf_hp.h is for HP/UX 64-bit shared library support. -for ac_header in nlist.h machine/reg.h \ - thread_db.h \ - sys/file.h sys/filio.h sys/ioctl.h sys/param.h \ - sys/procctl.h sys/resource.h sys/ptrace.h ptrace.h \ - sys/reg.h sys/debugreg.h \ - termios.h elf_hp.h +for ac_header in \ + elf_hp.h \ + machine/reg.h \ + nlist.h \ + ptrace.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 : 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" @@ -29172,6 +29217,7 @@ fi done + for ac_header in sys/user.h do : 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 -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 : 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" @@ -29202,6 +29255,7 @@ fi done + for ac_header in term.h do : 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. # # ------------------------------ # -for ac_func in getuid getgid \ - pread pread64 pwrite resize_term \ - getpgid setsid \ - sigsetmask \ - ttrace wresize setlocale iconvlist libiconvlist btowc \ - setrlimit getrlimit posix_madvise waitpid \ - use_default_colors +for ac_func in \ + btowc \ + getgid \ + getpgid \ + getrlimit \ + getuid \ + iconvlist \ + libiconvlist \ + posix_madvise \ + pread \ + pread64 \ + pwrite \ + resize_term \ + setlocale \ + setrlimit \ + setsid \ + sigsetmask \ + ttrace \ + use_default_colors \ + waitpid \ + wresize \ + do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -29872,6 +29941,7 @@ fi done + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 $as_echo_n "checking for nl_langinfo and CODESET... " >&6; } if ${am_cv_langinfo_codeset+:} false; then : diff --git a/gdb/configure.ac b/gdb/configure.ac index 6179b5c..72e0e56 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1295,19 +1295,39 @@ AC_SUBST(SRCHIGH_CFLAGS) AC_HEADER_STDC # elf_hp.h is for HP/UX 64-bit shared library support. -AC_CHECK_HEADERS([nlist.h machine/reg.h \ - thread_db.h \ - sys/file.h sys/filio.h sys/ioctl.h sys/param.h \ - sys/procctl.h sys/resource.h sys/ptrace.h ptrace.h \ - sys/reg.h sys/debugreg.h \ - termios.h elf_hp.h]) +AC_CHECK_HEADERS([ \ + elf_hp.h \ + machine/reg.h \ + nlist.h \ + ptrace.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, [], [], [#if HAVE_SYS_PARAM_H # include #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, [], [], [#if HAVE_CURSES_H # include @@ -1352,13 +1372,29 @@ AC_C_BIGENDIAN # Checks for library functions. # # ------------------------------ # -AC_CHECK_FUNCS([getuid getgid \ - pread pread64 pwrite resize_term \ - getpgid setsid \ - sigsetmask \ - ttrace wresize setlocale iconvlist libiconvlist btowc \ - setrlimit getrlimit posix_madvise waitpid \ - use_default_colors]) +AC_CHECK_FUNCS([ \ + btowc \ + getgid \ + getpgid \ + getrlimit \ + getuid \ + iconvlist \ + libiconvlist \ + posix_madvise \ + pread \ + pread64 \ + pwrite \ + resize_term \ + setlocale \ + setrlimit \ + setsid \ + sigsetmask \ + ttrace \ + use_default_colors \ + waitpid \ + wresize \ +]) + AM_LANGINFO_CODESET # Check the return and argument types of ptrace. -- cgit v1.1