Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
-
81d10134
by Cheng Shao at 2025-12-24T06:11:52-05:00
8 changed files:
- configure.ac
- libraries/ghc-internal/configure.ac
- − m4/find_ghc_bootstrap_prog.m4
- − m4/fp_copy_shellvar.m4
- − m4/fp_prog_ld_flag.m4
- − m4/fp_prog_sort.m4
- m4/prep_target_file.m4
- rts/configure.ac
Changes:
| ... | ... | @@ -57,14 +57,10 @@ dnl ** which are needed by FP_SETUP_PROJECT_VERSION |
| 57 | 57 | |
| 58 | 58 | dnl ** Find find command (for Win32's benefit)
|
| 59 | 59 | FP_PROG_FIND
|
| 60 | -FP_PROG_SORT
|
|
| 61 | 60 | |
| 62 | 61 | dnl ----------------------------------------------------------
|
| 63 | 62 | FP_SETUP_PROJECT_VERSION
|
| 64 | 63 | |
| 65 | -# Hmmm, we fix the RPM release number to 1 here... Is this convenient?
|
|
| 66 | -AC_SUBST([release], [1])
|
|
| 67 | - |
|
| 68 | 64 | dnl * We require autoconf version 2.69 due to
|
| 69 | 65 | dnl https://bugs.ruby-lang.org/issues/8179. Also see #14910.
|
| 70 | 66 | dnl * We need 2.50 due to the use of AC_SYS_LARGEFILE and AC_MSG_NOTICE.
|
| ... | ... | @@ -249,9 +245,6 @@ then |
| 249 | 245 | fi
|
| 250 | 246 | AC_SUBST([WithGhc])
|
| 251 | 247 | |
| 252 | -dnl ** Without optimization some INLINE trickery fails for GHCi
|
|
| 253 | -SRC_CC_OPTS="-O"
|
|
| 254 | - |
|
| 255 | 248 | dnl--------------------------------------------------------------------
|
| 256 | 249 | dnl * Choose host(/target/build) platform
|
| 257 | 250 | dnl--------------------------------------------------------------------
|
| ... | ... | @@ -753,10 +746,6 @@ AC_PROG_LN_S |
| 753 | 746 | dnl ** Find the path to sed
|
| 754 | 747 | AC_PATH_PROGS(SedCmd,gsed sed,sed)
|
| 755 | 748 | |
| 756 | - |
|
| 757 | -dnl ** check for time command
|
|
| 758 | -AC_PATH_PROG(TimeCmd,time)
|
|
| 759 | - |
|
| 760 | 749 | dnl ** check for tar
|
| 761 | 750 | dnl if GNU tar is named gtar, look for it first.
|
| 762 | 751 | AC_PATH_PROGS(TarCmd,gnutar gtar tar,tar)
|
| ... | ... | @@ -23,7 +23,7 @@ AC_MSG_RESULT($WINDOWS) |
| 23 | 23 | AC_CHECK_TYPES([long long])
|
| 24 | 24 | |
| 25 | 25 | # check for specific header (.h) files that we are interested in
|
| 26 | -AC_CHECK_HEADERS([ctype.h errno.h fcntl.h inttypes.h limits.h signal.h sys/file.h sys/resource.h sys/select.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/utsname.h sys/wait.h termios.h time.h unistd.h utime.h windows.h winsock.h langinfo.h poll.h sys/epoll.h sys/event.h sys/eventfd.h sys/socket.h])
|
|
| 26 | +AC_CHECK_HEADERS([ctype.h errno.h fcntl.h inttypes.h limits.h signal.h sys/resource.h sys/select.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/utsname.h sys/wait.h termios.h unistd.h utime.h windows.h winsock.h langinfo.h poll.h sys/epoll.h sys/event.h sys/eventfd.h sys/socket.h])
|
|
| 27 | 27 | |
| 28 | 28 | # Enable large file support. Do this before testing the types ino_t, off_t, and
|
| 29 | 29 | # rlim_t, because it will affect the result of that test.
|
| 1 | -# FIND_GHC_BOOTSTRAP_PROG()
|
|
| 2 | -# --------------------------------
|
|
| 3 | -# Parse the bootstrap GHC's compiler settings file for the location of things
|
|
| 4 | -# like the `llc` and `opt` commands.
|
|
| 5 | -#
|
|
| 6 | -# $1 = the variable to set
|
|
| 7 | -# $2 = The bootstrap compiler.
|
|
| 8 | -# $3 = The string to grep for to find the correct line.
|
|
| 9 | -#
|
|
| 10 | -AC_DEFUN([FIND_GHC_BOOTSTRAP_PROG],[
|
|
| 11 | - BootstrapTmpCmd=`grep $3 $($2 --print-libdir)/settings 2>/dev/null | sed 's/.*", "//;s/".*//'`
|
|
| 12 | - if test -n "$BootstrapTmpCmd" && test `basename $BootstrapTmpCmd` = $BootstrapTmpCmd ; then
|
|
| 13 | - AC_PATH_PROG([$1], [$BootstrapTmpCmd], "")
|
|
| 14 | - else
|
|
| 15 | - $1=$BootstrapTmpCmd
|
|
| 16 | - fi
|
|
| 17 | -]) |
| 1 | -# Helper for cloning a shell variable's state
|
|
| 2 | -AC_DEFUN([FP_COPY_SHELLVAR],
|
|
| 3 | -[if test -n "${$1+set}"; then $2="$$1"; else unset $2; fi ]) |
| 1 | -# FP_PROG_LD_FLAG
|
|
| 2 | -# ---------------
|
|
| 3 | -# Sets the output variable $2 to $1 if ld supports the $1 flag.
|
|
| 4 | -# Otherwise the variable's value is empty.
|
|
| 5 | -AC_DEFUN([FP_PROG_LD_FLAG],
|
|
| 6 | -[
|
|
| 7 | -AC_CACHE_CHECK([whether ld understands $1], [fp_cv_$2],
|
|
| 8 | -[echo 'int foo() { return 0; }' > conftest.c
|
|
| 9 | -${CC-cc} -c conftest.c
|
|
| 10 | -if $LD -r $1 -o conftest2.o conftest.o > /dev/null 2>&1; then
|
|
| 11 | - fp_cv_$2=$1
|
|
| 12 | -else
|
|
| 13 | - fp_cv_$2=
|
|
| 14 | -fi
|
|
| 15 | -rm -rf conftest*])
|
|
| 16 | -$2=$fp_cv_$2
|
|
| 17 | -])# FP_PROG_LD_FLAG |
| 1 | -# FP_PROG_SORT
|
|
| 2 | -# ------------
|
|
| 3 | -# Find a Unix-like sort
|
|
| 4 | -AC_DEFUN([FP_PROG_SORT],
|
|
| 5 | -[AC_PATH_PROG([fp_prog_sort], [sort])
|
|
| 6 | -echo conwip > conftest.txt
|
|
| 7 | -$fp_prog_sort -f conftest.txt > conftest.out 2>&1
|
|
| 8 | -if grep 'conwip' conftest.out > /dev/null 2>&1 ; then
|
|
| 9 | - # The goods
|
|
| 10 | - SortCmd="$fp_prog_sort"
|
|
| 11 | -else
|
|
| 12 | - # Summink else..pick next one.
|
|
| 13 | - AC_MSG_WARN([$fp_prog_sort looks like a non-*nix sort, ignoring it])
|
|
| 14 | - FP_CHECK_PROG([SortCmd], [sort], [], [], [$fp_prog_sort])
|
|
| 15 | -fi
|
|
| 16 | -rm -f conftest.txt conftest.out
|
|
| 17 | -AC_SUBST([SortCmd])[]dnl
|
|
| 18 | -])# FP_PROG_SORT |
| ... | ... | @@ -229,5 +229,3 @@ AC_DEFUN([PREP_TARGET_FILE],[ |
| 229 | 229 | esac
|
| 230 | 230 | AC_SUBST([TargetEndianness])
|
| 231 | 231 | ]) |
| 232 | - |
|
| 233 | -AC_DEFUN() |
| ... | ... | @@ -96,7 +96,7 @@ dnl off_t, because it will affect the result of that test. |
| 96 | 96 | AC_SYS_LARGEFILE
|
| 97 | 97 | |
| 98 | 98 | dnl ** check for specific header (.h) files that we are interested in
|
| 99 | -AC_CHECK_HEADERS([ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h nlist.h pthread.h pwd.h signal.h sys/param.h sys/mman.h sys/resource.h sys/select.h sys/time.h sys/timeb.h sys/timerfd.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h utime.h windows.h winsock.h sched.h])
|
|
| 99 | +AC_CHECK_HEADERS([ctype.h dlfcn.h errno.h fcntl.h limits.h locale.h nlist.h pthread.h signal.h sys/param.h sys/mman.h sys/resource.h sys/select.h sys/time.h sys/timeb.h sys/timerfd.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h utime.h windows.h winsock.h sched.h])
|
|
| 100 | 100 | |
| 101 | 101 | dnl sys/cpuset.h needs sys/param.h to be included first on FreeBSD 9.1; #7708
|
| 102 | 102 | AC_CHECK_HEADERS([sys/cpuset.h], [], [],
|
| ... | ... | @@ -148,7 +148,7 @@ FP_CHECK_FUNC([GetModuleFileName], |
| 148 | 148 | |
| 149 | 149 | dnl ** check for more functions
|
| 150 | 150 | dnl ** The following have been verified to be used in ghc/, but might be used somewhere else, too.
|
| 151 | -AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times ctime_r sched_setaffinity sched_getaffinity setlocale uselocale])
|
|
| 151 | +AC_CHECK_FUNCS([getclock getrusage gettimeofday sysconf times ctime_r sched_setaffinity sched_getaffinity uselocale])
|
|
| 152 | 152 | |
| 153 | 153 | dnl ** On OS X 10.4 (at least), time.h doesn't declare ctime_r if
|
| 154 | 154 | dnl ** _POSIX_C_SOURCE is defined
|
| ... | ... | @@ -488,5 +488,3 @@ cat ghcautoconf.h.autoconf | sed \ |
| 488 | 488 | >> include/ghcautoconf.h
|
| 489 | 489 | echo "#endif /* __GHCAUTOCONF_H__ */" >> include/ghcautoconf.h
|
| 490 | 490 | ] |
| 491 | - |
|
| 492 | - |