diff --git a/GHC/Base.hs b/GHC/Base.hs --- a/GHC/Base.hs +++ b/GHC/Base.hs @@ -300,6 +300,7 @@ -- >>> mconcat ["Hello", " ", "Haskell", "!"] -- "Hello Haskell!" mconcat :: [a] -> a + {-# INLINE mconcat #-} mconcat = foldr mappend mempty -- | @since 4.9.0.0 diff --git a/GHC/Event/Control.hs b/GHC/Event/Control.hs --- a/GHC/Event/Control.hs +++ b/GHC/Event/Control.hs @@ -124,6 +124,10 @@ -- the RTS, then *BEFORE* the wakeup file is closed, we must call -- c_setIOManagerWakeupFd (-1), so that the RTS does not try to use the wakeup -- file after it has been closed. +-- +-- Note, however, that even if we do the above, this function is still racy +-- since we do not synchronize between here and ioManagerWakeup. +-- ioManagerWakeup ignores failures that arise from this case. closeControl :: Control -> IO () closeControl w = do _ <- atomicSwapIORef (controlIsDead w) True diff --git a/GHC/IO/Handle/Lock/LinuxOFD.hsc b/GHC/IO/Handle/Lock/LinuxOFD.hsc --- a/GHC/IO/Handle/Lock/LinuxOFD.hsc +++ b/GHC/IO/Handle/Lock/LinuxOFD.hsc @@ -12,6 +12,9 @@ import GHC.Base () -- Make implicit dependency known to build system #else +-- Not only is this a good idea but it also works around #17950. +#define _FILE_OFFSET_BITS 64 + #include #include diff --git a/aclocal.m4 b/aclocal.m4 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# FP_COMPUTE_INT(EXPRESSION, VARIABLE, INCLUDES, IF-FAILS) +# FP_COMPUTE_INT(VARIABLE, EXPRESSION, INCLUDES, IF-FAILS) # -------------------------------------------------------- # Assign VARIABLE the value of the compile-time EXPRESSION using INCLUDES for # compilation. Execute IF-FAILS when unable to determine the value. Works for @@ -10,7 +10,7 @@ # The public AC_COMPUTE_INT macro isn't supported by some versions of # autoconf. AC_DEFUN([FP_COMPUTE_INT], -[_AC_COMPUTE_INT([$2], [$1], [$3], [$4])[]dnl +[AC_COMPUTE_INT([$1], [$2], [$3], [$4])[]dnl ])# FP_COMPUTE_INT @@ -33,7 +33,7 @@ # --------------------------------------- # autoheader helper for FP_CHECK_CONSTS m4_define([FP_CHECK_CONSTS_TEMPLATE], -[AC_FOREACH([fp_Const], [$1], +[m4_foreach_w([fp_Const], [$1], [AH_TEMPLATE(AS_TR_CPP(CONST_[]fp_Const), [The value of ]fp_Const[.])])[]dnl ])# FP_CHECK_CONSTS_TEMPLATE diff --git a/base.cabal b/base.cabal --- a/base.cabal +++ b/base.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: base -version: 4.14.1.0 +version: 4.14.2.0 -- NOTE: Don't forget to update ./changelog.md license: BSD-3-Clause @@ -95,7 +95,7 @@ UnliftedFFITypes Unsafe - build-depends: rts == 1.0, ghc-prim ^>= 0.6.1 + build-depends: rts == 1.0.*, ghc-prim >= 0.5.1.0 && < 0.7 -- sanity-check to ensure exactly one flag is set if !((flag(integer-gmp) && !flag(integer-simple)) || (!flag(integer-gmp) && flag(integer-simple))) diff --git a/cbits/WCsubst.c b/cbits/WCsubst.c --- a/cbits/WCsubst.c +++ b/cbits/WCsubst.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- This is an automatically generated file: do not edit -Generated by ubconfc at Tue Aug 14 10:04:18 UTC 2018 +Generated by ubconfc at Fri Jun 4 04:17:56 PM IST 2021 @generated -------------------------------------------------------------------------*/ @@ -90,8 +90,8 @@ #define GENCAT_MN 2097152 #define GENCAT_LO 16384 #define MAX_UNI_CHAR 1114109 -#define NUM_BLOCKS 3349 -#define NUM_CONVBLOCKS 1326 +#define NUM_BLOCKS 3396 +#define NUM_CONVBLOCKS 1332 #define NUM_SPACEBLOCKS 7 #define NUM_LAT1BLOCKS 63 #define NUM_RULES 205 @@ -1123,7 +1123,7 @@ {2142, 1, &rule2}, {2144, 11, &rule14}, {2208, 21, &rule14}, - {2230, 8, &rule14}, + {2230, 18, &rule14}, {2259, 15, &rule92}, {2274, 1, &rule16}, {2275, 32, &rule92}, @@ -1239,7 +1239,7 @@ {2887, 2, &rule124}, {2891, 2, &rule124}, {2893, 1, &rule92}, - {2902, 1, &rule92}, + {2901, 2, &rule92}, {2903, 1, &rule124}, {2908, 2, &rule14}, {2911, 3, &rule14}, @@ -1318,7 +1318,7 @@ {3313, 2, &rule14}, {3328, 2, &rule92}, {3330, 2, &rule124}, - {3333, 8, &rule14}, + {3332, 9, &rule14}, {3342, 3, &rule14}, {3346, 41, &rule14}, {3387, 2, &rule92}, @@ -1339,6 +1339,7 @@ {3440, 9, &rule17}, {3449, 1, &rule13}, {3450, 6, &rule14}, + {3457, 1, &rule92}, {3458, 2, &rule124}, {3461, 18, &rule14}, {3482, 24, &rule14}, @@ -1485,7 +1486,8 @@ {5112, 6, &rule110}, {5120, 1, &rule7}, {5121, 620, &rule14}, - {5741, 2, &rule2}, + {5741, 1, &rule13}, + {5742, 1, &rule2}, {5743, 17, &rule14}, {5760, 1, &rule1}, {5761, 26, &rule14}, @@ -1581,6 +1583,7 @@ {6824, 6, &rule2}, {6832, 14, &rule92}, {6846, 1, &rule119}, + {6847, 2, &rule92}, {6912, 4, &rule92}, {6916, 1, &rule124}, {6917, 47, &rule14}, @@ -2220,7 +2223,7 @@ {11079, 6, &rule6}, {11085, 39, &rule13}, {11126, 32, &rule13}, - {11160, 104, &rule13}, + {11159, 105, &rule13}, {11264, 47, &rule122}, {11312, 47, &rule123}, {11360, 1, &rule22}, @@ -2416,6 +2419,8 @@ {11841, 1, &rule2}, {11842, 1, &rule4}, {11843, 13, &rule2}, + {11856, 2, &rule13}, + {11858, 1, &rule2}, {11904, 26, &rule13}, {11931, 89, &rule13}, {12032, 214, &rule13}, @@ -2475,7 +2480,7 @@ {12688, 2, &rule13}, {12690, 4, &rule17}, {12694, 10, &rule13}, - {12704, 27, &rule14}, + {12704, 32, &rule14}, {12736, 36, &rule13}, {12784, 16, &rule14}, {12800, 31, &rule13}, @@ -2488,11 +2493,10 @@ {12928, 10, &rule17}, {12938, 39, &rule13}, {12977, 15, &rule17}, - {12992, 63, &rule13}, - {13056, 256, &rule13}, - {13312, 6582, &rule14}, + {12992, 320, &rule13}, + {13312, 6592, &rule14}, {19904, 64, &rule13}, - {19968, 20976, &rule14}, + {19968, 20989, &rule14}, {40960, 21, &rule14}, {40981, 1, &rule91}, {40982, 1143, &rule14}, @@ -2750,6 +2754,12 @@ {42948, 1, &rule194}, {42949, 1, &rule195}, {42950, 1, &rule196}, + {42951, 1, &rule22}, + {42952, 1, &rule23}, + {42953, 1, &rule22}, + {42954, 1, &rule23}, + {42997, 1, &rule22}, + {42998, 1, &rule23}, {42999, 1, &rule14}, {43000, 2, &rule91}, {43002, 1, &rule20}, @@ -2764,6 +2774,7 @@ {43045, 2, &rule92}, {43047, 1, &rule124}, {43048, 4, &rule13}, + {43052, 1, &rule92}, {43056, 6, &rule17}, {43062, 2, &rule13}, {43064, 1, &rule3}, @@ -2799,8 +2810,8 @@ {43444, 2, &rule124}, {43446, 4, &rule92}, {43450, 2, &rule124}, - {43452, 1, &rule92}, - {43453, 4, &rule124}, + {43452, 2, &rule92}, + {43454, 3, &rule124}, {43457, 13, &rule2}, {43471, 1, &rule91}, {43472, 10, &rule8}, @@ -2865,7 +2876,9 @@ {43860, 7, &rule20}, {43867, 1, &rule10}, {43868, 4, &rule91}, - {43872, 8, &rule20}, + {43872, 9, &rule20}, + {43881, 1, &rule91}, + {43882, 2, &rule10}, {43888, 80, &rule198}, {43968, 35, &rule14}, {44003, 2, &rule124}, @@ -3022,7 +3035,7 @@ {65913, 17, &rule13}, {65930, 2, &rule17}, {65932, 3, &rule13}, - {65936, 12, &rule13}, + {65936, 13, &rule13}, {65952, 1, &rule13}, {66000, 45, &rule13}, {66045, 1, &rule92}, @@ -3121,6 +3134,10 @@ {68900, 4, &rule92}, {68912, 10, &rule8}, {69216, 31, &rule17}, + {69248, 42, &rule14}, + {69291, 2, &rule92}, + {69293, 1, &rule7}, + {69296, 2, &rule14}, {69376, 29, &rule14}, {69405, 10, &rule17}, {69415, 1, &rule14}, @@ -3128,6 +3145,8 @@ {69446, 11, &rule92}, {69457, 4, &rule17}, {69461, 5, &rule2}, + {69552, 21, &rule14}, + {69573, 7, &rule17}, {69600, 23, &rule14}, {69632, 1, &rule124}, {69633, 1, &rule92}, @@ -3159,6 +3178,7 @@ {69952, 4, &rule2}, {69956, 1, &rule14}, {69957, 2, &rule124}, + {69959, 1, &rule14}, {69968, 35, &rule14}, {70003, 1, &rule92}, {70004, 2, &rule2}, @@ -3173,6 +3193,8 @@ {70085, 4, &rule2}, {70089, 4, &rule92}, {70093, 1, &rule2}, + {70094, 1, &rule124}, + {70095, 1, &rule92}, {70096, 10, &rule8}, {70106, 1, &rule14}, {70107, 1, &rule2}, @@ -3231,10 +3253,10 @@ {70727, 4, &rule14}, {70731, 5, &rule2}, {70736, 10, &rule8}, - {70747, 1, &rule2}, + {70746, 2, &rule2}, {70749, 1, &rule2}, {70750, 1, &rule92}, - {70751, 1, &rule14}, + {70751, 3, &rule14}, {70784, 48, &rule14}, {70832, 3, &rule124}, {70835, 6, &rule92}, @@ -3299,17 +3321,33 @@ {71872, 32, &rule12}, {71904, 10, &rule8}, {71914, 9, &rule17}, - {71935, 1, &rule14}, + {71935, 8, &rule14}, + {71945, 1, &rule14}, + {71948, 8, &rule14}, + {71957, 2, &rule14}, + {71960, 24, &rule14}, + {71984, 6, &rule124}, + {71991, 2, &rule124}, + {71995, 2, &rule92}, + {71997, 1, &rule124}, + {71998, 1, &rule92}, + {71999, 1, &rule14}, + {72000, 1, &rule124}, + {72001, 1, &rule14}, + {72002, 1, &rule124}, + {72003, 1, &rule92}, + {72004, 3, &rule2}, + {72016, 10, &rule8}, {72096, 8, &rule14}, {72106, 39, &rule14}, - {72145, 1, &rule124}, - {72146, 1, &rule92}, - {72147, 1, &rule124}, + {72145, 3, &rule124}, {72148, 4, &rule92}, {72154, 2, &rule92}, {72156, 4, &rule124}, {72160, 1, &rule92}, - {72161, 3, &rule14}, + {72161, 1, &rule14}, + {72162, 1, &rule2}, + {72163, 1, &rule14}, {72164, 1, &rule124}, {72192, 1, &rule14}, {72193, 10, &rule92}, @@ -3377,6 +3415,7 @@ {73459, 2, &rule92}, {73461, 2, &rule124}, {73463, 2, &rule2}, + {73648, 1, &rule14}, {73664, 21, &rule17}, {73685, 8, &rule13}, {73693, 4, &rule3}, @@ -3420,8 +3459,11 @@ {94176, 2, &rule91}, {94178, 1, &rule2}, {94179, 1, &rule91}, + {94180, 1, &rule92}, + {94192, 2, &rule124}, {94208, 6136, &rule14}, - {100352, 755, &rule14}, + {100352, 1238, &rule14}, + {101632, 9, &rule14}, {110592, 287, &rule14}, {110928, 3, &rule14}, {110948, 4, &rule14}, @@ -3545,7 +3587,8 @@ {123184, 7, &rule92}, {123191, 7, &rule91}, {123200, 10, &rule8}, - {123214, 2, &rule14}, + {123214, 1, &rule14}, + {123215, 1, &rule13}, {123584, 44, &rule14}, {123628, 4, &rule92}, {123632, 10, &rule8}, @@ -3556,6 +3599,7 @@ {125184, 34, &rule203}, {125218, 34, &rule204}, {125252, 7, &rule92}, + {125259, 1, &rule91}, {125264, 10, &rule8}, {125278, 2, &rule2}, {126065, 59, &rule17}, @@ -3607,8 +3651,7 @@ {127169, 15, &rule13}, {127185, 37, &rule13}, {127232, 13, &rule17}, - {127248, 93, &rule13}, - {127344, 61, &rule13}, + {127245, 161, &rule13}, {127462, 29, &rule13}, {127504, 44, &rule13}, {127552, 9, &rule13}, @@ -3616,9 +3659,9 @@ {127584, 6, &rule13}, {127744, 251, &rule13}, {127995, 5, &rule10}, - {128000, 726, &rule13}, + {128000, 728, &rule13}, {128736, 13, &rule13}, - {128752, 11, &rule13}, + {128752, 13, &rule13}, {128768, 116, &rule13}, {128896, 89, &rule13}, {128992, 12, &rule13}, @@ -3627,24 +3670,28 @@ {129104, 10, &rule13}, {129120, 40, &rule13}, {129168, 30, &rule13}, - {129280, 12, &rule13}, - {129293, 101, &rule13}, - {129395, 4, &rule13}, - {129402, 41, &rule13}, - {129445, 6, &rule13}, - {129454, 29, &rule13}, + {129200, 2, &rule13}, + {129280, 121, &rule13}, + {129402, 82, &rule13}, {129485, 135, &rule13}, {129632, 14, &rule13}, - {129648, 4, &rule13}, + {129648, 5, &rule13}, {129656, 3, &rule13}, - {129664, 3, &rule13}, - {129680, 6, &rule13}, - {131072, 42711, &rule14}, + {129664, 7, &rule13}, + {129680, 25, &rule13}, + {129712, 7, &rule13}, + {129728, 3, &rule13}, + {129744, 7, &rule13}, + {129792, 147, &rule13}, + {129940, 55, &rule13}, + {130032, 10, &rule8}, + {131072, 42718, &rule14}, {173824, 4149, &rule14}, {177984, 222, &rule14}, {178208, 5762, &rule14}, {183984, 7473, &rule14}, {194560, 542, &rule14}, + {196608, 4939, &rule14}, {917505, 1, &rule16}, {917536, 96, &rule16}, {917760, 240, &rule92}, @@ -4962,6 +5009,12 @@ {42948, 1, &rule194}, {42949, 1, &rule195}, {42950, 1, &rule196}, + {42951, 1, &rule22}, + {42952, 1, &rule23}, + {42953, 1, &rule22}, + {42954, 1, &rule23}, + {42997, 1, &rule22}, + {42998, 1, &rule23}, {43859, 1, &rule197}, {43888, 80, &rule198}, {65313, 26, &rule9}, diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,16 @@ # Changelog for [`base` package](http://hackage.haskell.org/package/base) +## 4.14.2.0 *June 2021* + + * Bundled with GHC 8.10.5 + + * Update Unicode class definitions to Unicode version 7.0 + + * Inline mconcat (#17123) + + * Enable large-file support in `base`'s the OFD file locking + implementation, avoiding #17950. + ## 4.14.1.0 *Jul 2020* * Bundled with GHC 8.10.2 diff --git a/config.guess b/config.guess --- a/config.guess +++ b/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2019 Free Software Foundation, Inc. +# Copyright 1992-2021 Free Software Foundation, Inc. -timestamp='2019-12-21' +timestamp='2021-05-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,12 +27,12 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess # # Please send patches to . -me=`echo "$0" | sed -e 's,.*/,,'` +me=$(echo "$0" | sed -e 's,.*/,,') usage="\ Usage: $0 [OPTION] @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2019 Free Software Foundation, Inc. +Copyright 1992-2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -103,7 +103,7 @@ test "$tmp" && return 0 : "${TMPDIR=/tmp}" # shellcheck disable=SC2039 - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=$( (umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null) && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } @@ -131,16 +131,14 @@ PATH=$PATH:/.attbin ; export PATH fi -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +UNAME_MACHINE=$( (uname -m) 2>/dev/null) || UNAME_MACHINE=unknown +UNAME_RELEASE=$( (uname -r) 2>/dev/null) || UNAME_RELEASE=unknown +UNAME_SYSTEM=$( (uname -s) 2>/dev/null) || UNAME_SYSTEM=unknown +UNAME_VERSION=$( (uname -v) 2>/dev/null) || UNAME_VERSION=unknown -case "$UNAME_SYSTEM" in +case $UNAME_SYSTEM in Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu + LIBC=unknown set_cc_for_build cat <<-EOF > "$dummy.c" @@ -149,24 +147,36 @@ LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #else + #elif defined(__GLIBC__) LIBC=gnu + #else + #include + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl #endif + #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g')" - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu + fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in +case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -178,27 +188,27 @@ # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - "/sbin/$sysctl" 2>/dev/null || \ - "/usr/sbin/$sysctl" 2>/dev/null || \ - echo unknown)` - case "$UNAME_MACHINE_ARCH" in + UNAME_MACHINE_ARCH=$( (uname -p 2>/dev/null || \ + /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + echo unknown)) + case $UNAME_MACHINE_ARCH in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + arch=$(echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,') + endian=$(echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p') machine="${arch}${endian}"-unknown ;; *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) os=netbsdelf ;; @@ -219,10 +229,10 @@ ;; esac # Determine ABI tags. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` + abi=$(echo "$UNAME_MACHINE_ARCH" | sed -e "$expr") ;; esac # The OS release @@ -230,12 +240,12 @@ # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "$UNAME_VERSION" in + case $UNAME_VERSION in Debian*) release='-gnu' ;; *) - release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=$(echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2) ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: @@ -244,15 +254,19 @@ echo "$machine-${os}${release}${abi-}" exit ;; *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + UNAME_MACHINE_ARCH=$(arch | sed 's/Bitrig.//') echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + UNAME_MACHINE_ARCH=$(arch | sed 's/OpenBSD.//') echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" exit ;; + *:SecBSD:*:*) + UNAME_MACHINE_ARCH=$(arch | sed 's/SecBSD.//') + echo "$UNAME_MACHINE_ARCH"-unknown-secbsd"$UNAME_RELEASE" + exit ;; *:LibertyBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + UNAME_MACHINE_ARCH=$(arch | sed 's/^.*BSD\.//') echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" exit ;; *:MidnightBSD:*:*) @@ -286,20 +300,22 @@ echo mips-dec-osf1 exit ;; alpha:OSF1:*:*) + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + trap '' 0 case $UNAME_RELEASE in *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $3}') ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $4}') ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in + ALPHA_CPU_TYPE=$(/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1) + case $ALPHA_CPU_TYPE in "EV4 (21064)") UNAME_MACHINE=alpha ;; "EV4.5 (21064)") @@ -336,11 +352,8 @@ # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; + echo "$UNAME_MACHINE"-dec-osf"$(echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)" + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; @@ -370,7 +383,7 @@ exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then + if test "$( (/bin/universe) 2>/dev/null)" = att ; then echo pyramid-pyramid-sysv3 else echo pyramid-pyramid-bsd @@ -383,17 +396,17 @@ echo sparc-icl-nx6 exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in + case $(/usr/bin/uname -p) in sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + echo "$UNAME_MACHINE"-ibm-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo sparc-hal-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + echo sparc-sun-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) echo i386-pc-auroraux"$UNAME_RELEASE" @@ -404,7 +417,7 @@ # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null @@ -412,30 +425,30 @@ SUN_ARCH=x86_64 fi fi - echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo sparc-sun-solaris3"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case $(/usr/bin/arch -k) in Series*|S4*) - UNAME_RELEASE=`uname -v` + UNAME_RELEASE=$(uname -v) ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" + echo sparc-sun-sunos"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/')" exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=$( (sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null) test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in + case $(/bin/arch) in sun3) echo m68k-sun-sunos"$UNAME_RELEASE" ;; @@ -515,8 +528,8 @@ } EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && - dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`"$dummy" "$dummyarg"` && + dummyarg=$(echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p') && + SYSTEM_NAME=$("$dummy" "$dummyarg") && { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos"$UNAME_RELEASE" exit ;; @@ -543,11 +556,11 @@ exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] + UNAME_PROCESSOR=$(/usr/bin/uname -p) + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ - [ "$TARGET_BINARY_INTERFACE"x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then echo m88k-dg-dgux"$UNAME_RELEASE" else @@ -571,17 +584,17 @@ echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" + echo mips-sgi-irix"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/g')" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + exit ;; # Note that: echo "'$(uname -s)'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix exit ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if test -x /usr/bin/oslevel ; then + IBM_REV=$(/usr/bin/oslevel) else IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi @@ -601,7 +614,7 @@ exit(0); } EOF - if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") then echo "$SYSTEM_NAME" else @@ -614,15 +627,15 @@ fi exit ;; *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + IBM_CPU_ID=$(/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }') if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | - awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + if test -x /usr/bin/lslpp ; then + IBM_REV=$(/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/) else IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi @@ -650,26 +663,26 @@ echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - case "$UNAME_MACHINE" in + HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//') + case $UNAME_MACHINE in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "$sc_cpu_version" in + if test -x /usr/bin/getconf; then + sc_cpu_version=$(/usr/bin/getconf SC_CPU_VERSION 2>/dev/null) + sc_kernel_bits=$(/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null) + case $sc_cpu_version in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "$sc_kernel_bits" in + case $sc_kernel_bits in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "$HP_ARCH" = "" ]; then + if test "$HP_ARCH" = ""; then set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -704,11 +717,11 @@ exit (0); } EOF - (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=$("$dummy") test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ "$HP_ARCH" = hppa2.0w ] + if test "$HP_ARCH" = hppa2.0w then set_cc_for_build @@ -732,7 +745,7 @@ echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//') echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) @@ -762,7 +775,7 @@ exit (0); } EOF - $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; @@ -782,7 +795,7 @@ echo hppa1.0-hp-osf exit ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then + if test -x /usr/sbin/sysversion ; then echo "$UNAME_MACHINE"-unknown-osf1mk else echo "$UNAME_MACHINE"-unknown-osf1 @@ -831,14 +844,14 @@ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` + FUJITSU_PROC=$(uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz) + FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///') + FUJITSU_REL=$(echo "$UNAME_RELEASE" | sed -e 's/ /_/') echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///') + FUJITSU_REL=$(echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/') echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -851,25 +864,25 @@ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; arm:FreeBSD:*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) set_cc_for_build if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi + echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabi else - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf + echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabihf fi exit ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` - case "$UNAME_PROCESSOR" in + UNAME_PROCESSOR=$(/usr/bin/uname -p) + case $UNAME_PROCESSOR in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + echo "$UNAME_PROCESSOR"-unknown-freebsd"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')" exit ;; i*:CYGWIN*:*) echo "$UNAME_MACHINE"-pc-cygwin @@ -887,7 +900,7 @@ echo "$UNAME_MACHINE"-pc-pw32 exit ;; *:Interix*:*) - case "$UNAME_MACHINE" in + case $UNAME_MACHINE in x86) echo i586-pc-interix"$UNAME_RELEASE" exit ;; @@ -905,15 +918,15 @@ echo x86_64-pc-cygwin exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; *:GNU:*:*) # the GNU system - echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" + echo "$(echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" + echo "$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')-$LIBC" exit ;; *:Minix:*:*) echo "$UNAME_MACHINE"-unknown-minix @@ -926,7 +939,7 @@ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in + case $(sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null) in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -939,7 +952,7 @@ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; - arc:Linux:*:* | arceb:Linux:*:*) + arc:Linux:*:* | arceb:Linux:*:* | arc64:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) @@ -985,6 +998,9 @@ k1om:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; m32r*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; @@ -1035,7 +1051,7 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`" + eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI')" test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) @@ -1055,7 +1071,7 @@ exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + case $(grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2) in PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; *) echo hppa-unknown-linux-"$LIBC" ;; @@ -1073,7 +1089,7 @@ ppcle:Linux:*:*) echo powerpcle-unknown-linux-"$LIBC" exit ;; - riscv32:Linux:*:* | riscv64:Linux:*:*) + riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) @@ -1095,7 +1111,17 @@ echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + set_cc_for_build + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_X32 >/dev/null + then + LIBCABI="$LIBC"x32 + fi + fi + echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI" exit ;; xtensa*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -1135,7 +1161,7 @@ echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; i*86:*:4.*:*) - UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` + UNAME_REL=$(echo "$UNAME_RELEASE" | sed 's/\/MP$//') if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else @@ -1144,7 +1170,7 @@ exit ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in + case $(/bin/uname -X | grep "^Machine") in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; @@ -1153,10 +1179,10 @@ exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + UNAME_REL=$( (/bin/uname -X|grep Release|sed -e 's/.*= //')) (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 @@ -1206,7 +1232,7 @@ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ @@ -1217,7 +1243,7 @@ NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ @@ -1250,7 +1276,7 @@ exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=$( (uname -p) 2>/dev/null) echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv @@ -1284,7 +1310,7 @@ echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then + if test -d /usr/nec; then echo mips-nec-sysv"$UNAME_RELEASE" else echo mips-unknown-sysv"$UNAME_RELEASE" @@ -1332,8 +1358,11 @@ *:Rhapsody:*:*) echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; + arm64:Darwin:*:*) + echo aarch64-apple-darwin"$UNAME_RELEASE" + exit ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) case $UNAME_PROCESSOR in unknown) UNAME_PROCESSOR=powerpc ;; esac @@ -1346,7 +1375,7 @@ else set_cc_for_build fi - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null @@ -1370,7 +1399,7 @@ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc @@ -1408,10 +1437,9 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - # shellcheck disable=SC2154 - if test "$cputype" = 386; then + if test "${cputype-}" = 386; then UNAME_MACHINE=i386 - else + elif test "x${cputype-}" != x; then UNAME_MACHINE="$cputype" fi echo "$UNAME_MACHINE"-unknown-plan9 @@ -1438,11 +1466,11 @@ echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + echo "$UNAME_MACHINE"-unknown-dragonfly"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')" exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "$UNAME_MACHINE" in + UNAME_MACHINE=$( (uname -p) 2>/dev/null) + case $UNAME_MACHINE in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; @@ -1451,13 +1479,13 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" + echo "$UNAME_MACHINE"-pc-skyos"$(echo "$UNAME_RELEASE" | sed -e 's/ .*$//')" exit ;; i*86:rdos:*:*) echo "$UNAME_MACHINE"-pc-rdos exit ;; - i*86:AROS:*:*) - echo "$UNAME_MACHINE"-pc-aros + *:AROS:*:*) + echo "$UNAME_MACHINE"-unknown-aros exit ;; x86_64:VMkernel:*:*) echo "$UNAME_MACHINE"-unknown-esx @@ -1509,7 +1537,7 @@ #define __ARCHITECTURE__ "m68k" #endif int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + version=$( (hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null); if (version < 4) printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); else @@ -1601,7 +1629,7 @@ } EOF -$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` && +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=$($dummy) && { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. @@ -1609,7 +1637,7 @@ echo "$0: unable to guess system type" >&2 -case "$UNAME_MACHINE:$UNAME_SYSTEM" in +case $UNAME_MACHINE:$UNAME_SYSTEM in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 <&2 </dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` +uname -m = $( (uname -m) 2>/dev/null || echo unknown) +uname -r = $( (uname -r) 2>/dev/null || echo unknown) +uname -s = $( (uname -s) 2>/dev/null || echo unknown) +uname -v = $( (uname -v) 2>/dev/null || echo unknown) -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` +/usr/bin/uname -p = $( (/usr/bin/uname -p) 2>/dev/null) +/bin/uname -X = $( (/bin/uname -X) 2>/dev/null) -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` +hostinfo = $( (hostinfo) 2>/dev/null) +/bin/universe = $( (/bin/universe) 2>/dev/null) +/usr/bin/arch -k = $( (/usr/bin/arch -k) 2>/dev/null) +/bin/arch = $( (/bin/arch) 2>/dev/null) +/usr/bin/oslevel = $( (/usr/bin/oslevel) 2>/dev/null) +/usr/convex/getsysinfo = $( (/usr/convex/getsysinfo) 2>/dev/null) UNAME_MACHINE = "$UNAME_MACHINE" UNAME_RELEASE = "$UNAME_RELEASE" UNAME_SYSTEM = "$UNAME_SYSTEM" UNAME_VERSION = "$UNAME_VERSION" EOF +fi exit 1 diff --git a/config.sub b/config.sub --- a/config.sub +++ b/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2019 Free Software Foundation, Inc. +# Copyright 1992-2021 Free Software Foundation, Inc. -timestamp='2019-06-30' +timestamp='2021-04-30' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -50,7 +50,7 @@ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -me=`echo "$0" | sed -e 's,.*/,,'` +me=$(echo "$0" | sed -e 's,.*/,,') usage="\ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS @@ -67,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2019 Free Software Foundation, Inc. +Copyright 1992-2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -124,28 +124,27 @@ ;; *-*-*-*) basic_machine=$field1-$field2 - os=$field3-$field4 + basic_os=$field3-$field4 ;; *-*-*) # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two # parts maybe_os=$field2-$field3 case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ - | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ + nto-qnx* | linux-* | uclinux-uclibc* \ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ | storm-chaos* | os2-emx* | rtmk-nova*) basic_machine=$field1 - os=$maybe_os + basic_os=$maybe_os ;; android-linux) basic_machine=$field1-unknown - os=linux-android + basic_os=linux-android ;; *) basic_machine=$field1-$field2 - os=$field3 + basic_os=$field3 ;; esac ;; @@ -154,7 +153,7 @@ case $field1-$field2 in decstation-3100) basic_machine=mips-dec - os= + basic_os= ;; *-*) # Second component is usually, but not always the OS @@ -162,7 +161,7 @@ # Prevent following clause from handling this valid os sun*os*) basic_machine=$field1 - os=$field2 + basic_os=$field2 ;; # Manufacturers dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ @@ -175,11 +174,11 @@ | microblaze* | sim | cisco \ | oki | wec | wrs | winbond) basic_machine=$field1-$field2 - os= + basic_os= ;; *) basic_machine=$field1 - os=$field2 + basic_os=$field2 ;; esac ;; @@ -191,447 +190,451 @@ case $field1 in 386bsd) basic_machine=i386-pc - os=bsd + basic_os=bsd ;; a29khif) basic_machine=a29k-amd - os=udi + basic_os=udi ;; adobe68k) basic_machine=m68010-adobe - os=scout + basic_os=scout ;; alliant) basic_machine=fx80-alliant - os= + basic_os= ;; altos | altos3068) basic_machine=m68k-altos - os= + basic_os= ;; am29k) basic_machine=a29k-none - os=bsd + basic_os=bsd ;; amdahl) basic_machine=580-amdahl - os=sysv + basic_os=sysv ;; amiga) basic_machine=m68k-unknown - os= + basic_os= ;; amigaos | amigados) basic_machine=m68k-unknown - os=amigaos + basic_os=amigaos ;; amigaunix | amix) basic_machine=m68k-unknown - os=sysv4 + basic_os=sysv4 ;; apollo68) basic_machine=m68k-apollo - os=sysv + basic_os=sysv ;; apollo68bsd) basic_machine=m68k-apollo - os=bsd + basic_os=bsd ;; aros) basic_machine=i386-pc - os=aros + basic_os=aros ;; aux) basic_machine=m68k-apple - os=aux + basic_os=aux ;; balance) basic_machine=ns32k-sequent - os=dynix + basic_os=dynix ;; blackfin) basic_machine=bfin-unknown - os=linux + basic_os=linux ;; cegcc) basic_machine=arm-unknown - os=cegcc + basic_os=cegcc ;; convex-c1) basic_machine=c1-convex - os=bsd + basic_os=bsd ;; convex-c2) basic_machine=c2-convex - os=bsd + basic_os=bsd ;; convex-c32) basic_machine=c32-convex - os=bsd + basic_os=bsd ;; convex-c34) basic_machine=c34-convex - os=bsd + basic_os=bsd ;; convex-c38) basic_machine=c38-convex - os=bsd + basic_os=bsd ;; cray) basic_machine=j90-cray - os=unicos + basic_os=unicos ;; crds | unos) basic_machine=m68k-crds - os= + basic_os= ;; da30) basic_machine=m68k-da30 - os= + basic_os= ;; decstation | pmax | pmin | dec3100 | decstatn) basic_machine=mips-dec - os= + basic_os= ;; delta88) basic_machine=m88k-motorola - os=sysv3 + basic_os=sysv3 ;; dicos) basic_machine=i686-pc - os=dicos + basic_os=dicos ;; djgpp) basic_machine=i586-pc - os=msdosdjgpp + basic_os=msdosdjgpp ;; ebmon29k) basic_machine=a29k-amd - os=ebmon + basic_os=ebmon ;; es1800 | OSE68k | ose68k | ose | OSE) basic_machine=m68k-ericsson - os=ose + basic_os=ose ;; gmicro) basic_machine=tron-gmicro - os=sysv + basic_os=sysv ;; go32) basic_machine=i386-pc - os=go32 + basic_os=go32 ;; h8300hms) basic_machine=h8300-hitachi - os=hms + basic_os=hms ;; h8300xray) basic_machine=h8300-hitachi - os=xray + basic_os=xray ;; h8500hms) basic_machine=h8500-hitachi - os=hms + basic_os=hms ;; harris) basic_machine=m88k-harris - os=sysv3 + basic_os=sysv3 ;; hp300 | hp300hpux) basic_machine=m68k-hp - os=hpux + basic_os=hpux ;; hp300bsd) basic_machine=m68k-hp - os=bsd + basic_os=bsd ;; hppaosf) basic_machine=hppa1.1-hp - os=osf + basic_os=osf ;; hppro) basic_machine=hppa1.1-hp - os=proelf + basic_os=proelf ;; i386mach) basic_machine=i386-mach - os=mach + basic_os=mach ;; isi68 | isi) basic_machine=m68k-isi - os=sysv + basic_os=sysv ;; m68knommu) basic_machine=m68k-unknown - os=linux + basic_os=linux ;; magnum | m3230) basic_machine=mips-mips - os=sysv + basic_os=sysv ;; merlin) basic_machine=ns32k-utek - os=sysv + basic_os=sysv ;; mingw64) basic_machine=x86_64-pc - os=mingw64 + basic_os=mingw64 ;; mingw32) basic_machine=i686-pc - os=mingw32 + basic_os=mingw32 ;; mingw32ce) basic_machine=arm-unknown - os=mingw32ce + basic_os=mingw32ce ;; monitor) basic_machine=m68k-rom68k - os=coff + basic_os=coff ;; morphos) basic_machine=powerpc-unknown - os=morphos + basic_os=morphos ;; moxiebox) basic_machine=moxie-unknown - os=moxiebox + basic_os=moxiebox ;; msdos) basic_machine=i386-pc - os=msdos + basic_os=msdos ;; msys) basic_machine=i686-pc - os=msys + basic_os=msys ;; mvs) basic_machine=i370-ibm - os=mvs + basic_os=mvs ;; nacl) basic_machine=le32-unknown - os=nacl + basic_os=nacl ;; ncr3000) basic_machine=i486-ncr - os=sysv4 + basic_os=sysv4 ;; netbsd386) basic_machine=i386-pc - os=netbsd + basic_os=netbsd ;; netwinder) basic_machine=armv4l-rebel - os=linux + basic_os=linux ;; news | news700 | news800 | news900) basic_machine=m68k-sony - os=newsos + basic_os=newsos ;; news1000) basic_machine=m68030-sony - os=newsos + basic_os=newsos ;; necv70) basic_machine=v70-nec - os=sysv + basic_os=sysv ;; nh3000) basic_machine=m68k-harris - os=cxux + basic_os=cxux ;; nh[45]000) basic_machine=m88k-harris - os=cxux + basic_os=cxux ;; nindy960) basic_machine=i960-intel - os=nindy + basic_os=nindy ;; mon960) basic_machine=i960-intel - os=mon960 + basic_os=mon960 ;; nonstopux) basic_machine=mips-compaq - os=nonstopux + basic_os=nonstopux ;; os400) basic_machine=powerpc-ibm - os=os400 + basic_os=os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson - os=ose + basic_os=ose ;; os68k) basic_machine=m68k-none - os=os68k + basic_os=os68k ;; paragon) basic_machine=i860-intel - os=osf + basic_os=osf ;; parisc) basic_machine=hppa-unknown - os=linux + basic_os=linux ;; + psp) + basic_machine=mipsallegrexel-sony + basic_os=psp + ;; pw32) basic_machine=i586-unknown - os=pw32 + basic_os=pw32 ;; rdos | rdos64) basic_machine=x86_64-pc - os=rdos + basic_os=rdos ;; rdos32) basic_machine=i386-pc - os=rdos + basic_os=rdos ;; rom68k) basic_machine=m68k-rom68k - os=coff + basic_os=coff ;; sa29200) basic_machine=a29k-amd - os=udi + basic_os=udi ;; sei) basic_machine=mips-sei - os=seiux + basic_os=seiux ;; sequent) basic_machine=i386-sequent - os= + basic_os= ;; sps7) basic_machine=m68k-bull - os=sysv2 + basic_os=sysv2 ;; st2000) basic_machine=m68k-tandem - os= + basic_os= ;; stratus) basic_machine=i860-stratus - os=sysv4 + basic_os=sysv4 ;; sun2) basic_machine=m68000-sun - os= + basic_os= ;; sun2os3) basic_machine=m68000-sun - os=sunos3 + basic_os=sunos3 ;; sun2os4) basic_machine=m68000-sun - os=sunos4 + basic_os=sunos4 ;; sun3) basic_machine=m68k-sun - os= + basic_os= ;; sun3os3) basic_machine=m68k-sun - os=sunos3 + basic_os=sunos3 ;; sun3os4) basic_machine=m68k-sun - os=sunos4 + basic_os=sunos4 ;; sun4) basic_machine=sparc-sun - os= + basic_os= ;; sun4os3) basic_machine=sparc-sun - os=sunos3 + basic_os=sunos3 ;; sun4os4) basic_machine=sparc-sun - os=sunos4 + basic_os=sunos4 ;; sun4sol2) basic_machine=sparc-sun - os=solaris2 + basic_os=solaris2 ;; sun386 | sun386i | roadrunner) basic_machine=i386-sun - os= + basic_os= ;; sv1) basic_machine=sv1-cray - os=unicos + basic_os=unicos ;; symmetry) basic_machine=i386-sequent - os=dynix + basic_os=dynix ;; t3e) basic_machine=alphaev5-cray - os=unicos + basic_os=unicos ;; t90) basic_machine=t90-cray - os=unicos + basic_os=unicos ;; toad1) basic_machine=pdp10-xkl - os=tops20 + basic_os=tops20 ;; tpf) basic_machine=s390x-ibm - os=tpf + basic_os=tpf ;; udi29k) basic_machine=a29k-amd - os=udi + basic_os=udi ;; ultra3) basic_machine=a29k-nyu - os=sym1 + basic_os=sym1 ;; v810 | necv810) basic_machine=v810-nec - os=none + basic_os=none ;; vaxv) basic_machine=vax-dec - os=sysv + basic_os=sysv ;; vms) basic_machine=vax-dec - os=vms + basic_os=vms ;; vsta) basic_machine=i386-pc - os=vsta + basic_os=vsta ;; vxworks960) basic_machine=i960-wrs - os=vxworks + basic_os=vxworks ;; vxworks68) basic_machine=m68k-wrs - os=vxworks + basic_os=vxworks ;; vxworks29k) basic_machine=a29k-wrs - os=vxworks + basic_os=vxworks ;; xbox) basic_machine=i686-pc - os=mingw32 + basic_os=mingw32 ;; ymp) basic_machine=ymp-cray - os=unicos + basic_os=unicos ;; *) basic_machine=$1 - os= + basic_os= ;; esac ;; @@ -683,17 +686,17 @@ bluegene*) cpu=powerpc vendor=ibm - os=cnk + basic_os=cnk ;; decsystem10* | dec10*) cpu=pdp10 vendor=dec - os=tops10 + basic_os=tops10 ;; decsystem20* | dec20*) cpu=pdp10 vendor=dec - os=tops20 + basic_os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) @@ -703,7 +706,7 @@ dpx2*) cpu=m68k vendor=bull - os=sysv3 + basic_os=sysv3 ;; encore | umax | mmax) cpu=ns32k @@ -712,7 +715,7 @@ elxsi) cpu=elxsi vendor=elxsi - os=${os:-bsd} + basic_os=${basic_os:-bsd} ;; fx2800) cpu=i860 @@ -725,7 +728,7 @@ h3050r* | hiux*) cpu=hppa1.1 vendor=hitachi - os=hiuxwe2 + basic_os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) cpu=hppa1.0 @@ -766,38 +769,38 @@ vendor=hp ;; i*86v32) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc - os=sysv32 + basic_os=sysv32 ;; i*86v4*) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc - os=sysv4 + basic_os=sysv4 ;; i*86v) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc - os=sysv + basic_os=sysv ;; i*86sol2) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc - os=solaris2 + basic_os=solaris2 ;; j90 | j90-cray) cpu=j90 vendor=cray - os=${os:-unicos} + basic_os=${basic_os:-unicos} ;; iris | iris4d) cpu=mips vendor=sgi - case $os in + case $basic_os in irix*) ;; *) - os=irix4 + basic_os=irix4 ;; esac ;; @@ -808,26 +811,26 @@ *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) cpu=m68k vendor=atari - os=mint + basic_os=mint ;; news-3600 | risc-news) cpu=mips vendor=sony - os=newsos + basic_os=newsos ;; next | m*-next) cpu=m68k vendor=next - case $os in + case $basic_os in openstep*) ;; nextstep*) ;; ns2*) - os=nextstep2 + basic_os=nextstep2 ;; *) - os=nextstep3 + basic_os=nextstep3 ;; esac ;; @@ -838,12 +841,12 @@ op50n-* | op60c-*) cpu=hppa1.1 vendor=oki - os=proelf + basic_os=proelf ;; pa-hitachi) cpu=hppa1.1 vendor=hitachi - os=hiuxwe2 + basic_os=hiuxwe2 ;; pbd) cpu=sparc @@ -880,12 +883,12 @@ sde) cpu=mipsisa32 vendor=sde - os=${os:-elf} + basic_os=${basic_os:-elf} ;; simso-wrs) cpu=sparclite vendor=wrs - os=vxworks + basic_os=vxworks ;; tower | tower-32) cpu=m68k @@ -902,7 +905,7 @@ w89k-*) cpu=hppa1.1 vendor=winbond - os=proelf + basic_os=proelf ;; none) cpu=none @@ -914,7 +917,7 @@ ;; leon-*|leon[3-9]-*) cpu=sparc - vendor=`echo "$basic_machine" | sed 's/-.*//'` + vendor=$(echo "$basic_machine" | sed 's/-.*//') ;; *-*) @@ -955,11 +958,11 @@ # some cases the only manufacturer, in others, it is the most popular. craynv-unknown) vendor=cray - os=${os:-unicosmp} + basic_os=${basic_os:-unicosmp} ;; c90-unknown | c90-cray) vendor=cray - os=${os:-unicos} + basic_os=${Basic_os:-unicos} ;; fx80-unknown) vendor=alliant @@ -1003,7 +1006,7 @@ dpx20-unknown | dpx20-bull) cpu=rs6000 vendor=bull - os=${os:-bosx} + basic_os=${basic_os:-bosx} ;; # Here we normalize CPU types irrespective of the vendor @@ -1012,7 +1015,7 @@ ;; blackfin-*) cpu=bfin - os=linux + basic_os=linux ;; c54x-*) cpu=tic54x @@ -1025,7 +1028,7 @@ ;; e500v[12]-*) cpu=powerpc - os=$os"spe" + basic_os=${basic_os}"spe" ;; mips3*-*) cpu=mips64 @@ -1035,7 +1038,7 @@ ;; m68knommu-*) cpu=m68k - os=linux + basic_os=linux ;; m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*) cpu=s12z @@ -1045,7 +1048,7 @@ ;; parisc-*) cpu=hppa - os=linux + basic_os=linux ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 @@ -1081,7 +1084,7 @@ cpu=mipsisa64sb1el ;; sh5e[lb]-*) - cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'` + cpu=$(echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/') ;; spur-*) cpu=spur @@ -1099,13 +1102,16 @@ cpu=x86_64 ;; xscale-* | xscalee[bl]-*) - cpu=`echo "$cpu" | sed 's/^xscale/arm/'` + cpu=$(echo "$cpu" | sed 's/^xscale/arm/') ;; + arm64-*) + cpu=aarch64 + ;; # Recognize the canonical CPU Types that limit and/or modify the # company names they are paired with. cr16-*) - os=${os:-elf} + basic_os=${basic_os:-elf} ;; crisv32-* | etraxfs*-*) cpu=crisv32 @@ -1116,7 +1122,7 @@ vendor=axis ;; crx-*) - os=${os:-elf} + basic_os=${basic_os:-elf} ;; neo-tandem) cpu=neo @@ -1138,16 +1144,12 @@ cpu=nsx vendor=tandem ;; - s390-*) - cpu=s390 - vendor=ibm - ;; - s390x-*) - cpu=s390x - vendor=ibm + mipsallegrexel-sony) + cpu=mipsallegrexel + vendor=sony ;; tile*-*) - os=${os:-linux-gnu} + basic_os=${basic_os:-linux-gnu} ;; *) @@ -1163,8 +1165,8 @@ | alphapca5[67] | alpha64pca5[67] \ | am33_2.0 \ | amdgcn \ - | arc | arceb \ - | arm | arm[lb]e | arme[lb] | armv* \ + | arc | arceb | arc64 \ + | arm | arm[lb]e | arme[lb] | armv* \ | avr | avr32 \ | asmjs \ | ba \ @@ -1183,6 +1185,7 @@ | k1om \ | le32 | le64 \ | lm32 \ + | loongarch32 | loongarch64 | loongarchx32 \ | m32c | m32r | m32rle \ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ @@ -1201,9 +1204,13 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r3 | mipsisa32r3el \ + | mipsisa32r5 | mipsisa32r5el \ | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r3 | mipsisa64r3el \ + | mipsisa64r5 | mipsisa64r5el \ | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ @@ -1227,8 +1234,9 @@ | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ | pru \ | pyramid \ - | riscv | riscv32 | riscv64 \ + | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ | rl78 | romp | rs6000 | rx \ + | s390 | s390x \ | score \ | sh | shl \ | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ @@ -1238,6 +1246,7 @@ | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ | spu \ | tahoe \ + | thumbv7* \ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ | tron \ | ubicom32 \ @@ -1275,8 +1284,47 @@ # Decode manufacturer-specific aliases for certain operating systems. -if [ x$os != x ] +if test x$basic_os != x then + +# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just +# set os. +case $basic_os in + gnu/linux*) + kernel=linux + os=$(echo $basic_os | sed -e 's|gnu/linux|gnu|') + ;; + os2-emx) + kernel=os2 + os=$(echo $basic_os | sed -e 's|os2-emx|emx|') + ;; + nto-qnx*) + kernel=nto + os=$(echo $basic_os | sed -e 's|nto-qnx|qnx|') + ;; + *-*) + # shellcheck disable=SC2162 + IFS="-" read kernel os <&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1528,6 +1503,7 @@ # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. +kernel= case $cpu-$vendor in score-*) os=elf @@ -1539,7 +1515,8 @@ os=riscix1.2 ;; arm*-rebel) - os=linux + kernel=linux + os=gnu ;; arm*-semi) os=aout @@ -1705,84 +1682,178 @@ os=none ;; esac + fi +# Now, validate our (potentially fixed-up) OS. +case $os in + # Sometimes we do "kernel-libc", so those need to count as OSes. + musl* | newlib* | uclibc*) + ;; + # Likewise for "kernel-abi" + eabi* | gnueabi*) + ;; + # VxWorks passes extra cpu info in the 4th filed. + simlinux | simwindows | spe) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* | serenity* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + none) + ;; + *) + echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os in + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) + ;; + uclinux-uclibc* ) + ;; + -dietlibc* | -newlib* | -musl* | -uclibc* ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + kfreebsd*-gnu* | kopensolaris*-gnu*) + ;; + vxworks-simlinux | vxworks-simwindows | vxworks-spe) + ;; + nto-qnx*) + ;; + os2-emx) + ;; + *-eabi* | *-gnueabi*) + ;; + -*) + # Blank kernel with real OS is always fine. + ;; + *-*) + echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. case $vendor in unknown) - case $os in - riscix*) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - sunos*) + *-sunos*) vendor=sun ;; - cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - beos*) + *-beos*) vendor=be ;; - hpux*) + *-hpux*) vendor=hp ;; - mpeix*) + *-mpeix*) vendor=hp ;; - hiux*) + *-hiux*) vendor=hitachi ;; - unos*) + *-unos*) vendor=crds ;; - dgux*) + *-dgux*) vendor=dg ;; - luna*) + *-luna*) vendor=omron ;; - genix*) + *-genix*) vendor=ns ;; - clix*) + *-clix*) vendor=intergraph ;; - mvs* | opened*) + *-mvs* | *-opened*) vendor=ibm ;; - os400*) + *-os400*) vendor=ibm ;; - ptx*) + s390-* | s390x-*) + vendor=ibm + ;; + *-ptx*) vendor=sequent ;; - tpf*) + *-tpf*) vendor=ibm ;; - vxsim* | vxworks* | windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - aux*) + *-aux*) vendor=apple ;; - hms*) + *-hms*) vendor=hitachi ;; - mpw* | macos*) + *-mpw* | *-macos*) vendor=apple ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - vos*) + *-vos*) vendor=stratus ;; esac ;; esac -echo "$cpu-$vendor-$os" +echo "$cpu-$vendor-${kernel:+$kernel-}$os" exit # Local variables: diff --git a/configure b/configure --- a/configure +++ b/configure @@ -637,18 +637,6 @@ LDFLAGS CFLAGS CC -target_os -target_vendor -target_cpu -target -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build target_alias host_alias build_alias @@ -1300,11 +1288,6 @@ _ACEOF cat <<\_ACEOF - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] - --target=TARGET configure for building compilers for TARGET [HOST] _ACEOF fi @@ -2410,146 +2393,6 @@ ac_config_headers="$ac_config_headers include/HsBaseConfig.h include/EventConfig.h" -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 -$as_echo_n "checking target system type... " >&6; } -if ${ac_cv_target+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$target_alias" = x; then - ac_cv_target=$ac_cv_host -else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 -$as_echo "$ac_cv_target" >&6; } -case $ac_cv_target in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; -esac -target=$ac_cv_target -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_target -shift -target_cpu=$1 -target_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -target_os=$* -IFS=$ac_save_IFS -case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac - - -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -test -n "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3801,7 +3644,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WINDOWS platform" >&5 $as_echo_n "checking for WINDOWS platform... " >&6; } -case $host in +case $host_alias in *mingw32*|*mingw64*|*cygwin*|*msys*) WINDOWS=YES;; *) @@ -3822,119 +3665,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - - # check for specific header (.h) files that we are interested in for ac_header in 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 do : @@ -4454,7 +4184,7 @@ # Check whether --with-iconv-includes was given. if test "${with_iconv_includes+set}" = set; then : - withval=$with_iconv_includes; ICONV_INCLUDE_DIRS=$withval; CPPFLAGS="-I$withval $CPPFLAGS" + withval=$with_iconv_includes; ICONV_INCLUDE_DIRS=$withval else ICONV_INCLUDE_DIRS= fi @@ -4557,7 +4287,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4713,7 +4442,6 @@ fptools_cv_htype_sup_char=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(char) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -4782,7 +4510,6 @@ fptools_cv_htype_sup_char=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(char) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -4851,7 +4578,6 @@ fptools_cv_htype_sup_char=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_char=Float @@ -4934,7 +4660,6 @@ fptools_cv_htype_sup_char=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(char) * 8" "HTYPE_SIZE" " #include #include @@ -5003,7 +4728,6 @@ fptools_cv_htype_sup_char=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_char="Word$HTYPE_SIZE" @@ -5118,7 +4842,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5274,7 +4997,6 @@ fptools_cv_htype_sup_signed_char=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(signed char) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -5343,7 +5065,6 @@ fptools_cv_htype_sup_signed_char=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(signed char) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -5412,7 +5133,6 @@ fptools_cv_htype_sup_signed_char=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_signed_char=Float @@ -5495,7 +5215,6 @@ fptools_cv_htype_sup_signed_char=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(signed char) * 8" "HTYPE_SIZE" " #include #include @@ -5564,7 +5283,6 @@ fptools_cv_htype_sup_signed_char=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_signed_char="Word$HTYPE_SIZE" @@ -5679,7 +5397,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5835,7 +5552,6 @@ fptools_cv_htype_sup_unsigned_char=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(unsigned char) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -5904,7 +5620,6 @@ fptools_cv_htype_sup_unsigned_char=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(unsigned char) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -5973,7 +5688,6 @@ fptools_cv_htype_sup_unsigned_char=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_unsigned_char=Float @@ -6056,7 +5770,6 @@ fptools_cv_htype_sup_unsigned_char=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(unsigned char) * 8" "HTYPE_SIZE" " #include #include @@ -6125,7 +5838,6 @@ fptools_cv_htype_sup_unsigned_char=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_unsigned_char="Word$HTYPE_SIZE" @@ -6240,7 +5952,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6396,7 +6107,6 @@ fptools_cv_htype_sup_short=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(short) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -6465,7 +6175,6 @@ fptools_cv_htype_sup_short=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(short) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -6534,7 +6243,6 @@ fptools_cv_htype_sup_short=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_short=Float @@ -6617,7 +6325,6 @@ fptools_cv_htype_sup_short=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(short) * 8" "HTYPE_SIZE" " #include #include @@ -6686,7 +6393,6 @@ fptools_cv_htype_sup_short=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_short="Word$HTYPE_SIZE" @@ -6801,7 +6507,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6957,7 +6662,6 @@ fptools_cv_htype_sup_unsigned_short=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(unsigned short) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -7026,7 +6730,6 @@ fptools_cv_htype_sup_unsigned_short=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(unsigned short) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -7095,7 +6798,6 @@ fptools_cv_htype_sup_unsigned_short=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_unsigned_short=Float @@ -7178,7 +6880,6 @@ fptools_cv_htype_sup_unsigned_short=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(unsigned short) * 8" "HTYPE_SIZE" " #include #include @@ -7247,7 +6948,6 @@ fptools_cv_htype_sup_unsigned_short=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_unsigned_short="Word$HTYPE_SIZE" @@ -7362,7 +7062,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7518,7 +7217,6 @@ fptools_cv_htype_sup_int=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(int) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -7587,7 +7285,6 @@ fptools_cv_htype_sup_int=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(int) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -7656,7 +7353,6 @@ fptools_cv_htype_sup_int=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_int=Float @@ -7739,7 +7435,6 @@ fptools_cv_htype_sup_int=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(int) * 8" "HTYPE_SIZE" " #include #include @@ -7808,7 +7503,6 @@ fptools_cv_htype_sup_int=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_int="Word$HTYPE_SIZE" @@ -7923,7 +7617,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8079,7 +7772,6 @@ fptools_cv_htype_sup_unsigned_int=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(unsigned int) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -8148,7 +7840,6 @@ fptools_cv_htype_sup_unsigned_int=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(unsigned int) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -8217,7 +7908,6 @@ fptools_cv_htype_sup_unsigned_int=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_unsigned_int=Float @@ -8300,7 +7990,6 @@ fptools_cv_htype_sup_unsigned_int=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(unsigned int) * 8" "HTYPE_SIZE" " #include #include @@ -8369,7 +8058,6 @@ fptools_cv_htype_sup_unsigned_int=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_unsigned_int="Word$HTYPE_SIZE" @@ -8484,7 +8172,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8640,7 +8327,6 @@ fptools_cv_htype_sup_long=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(long) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -8709,7 +8395,6 @@ fptools_cv_htype_sup_long=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(long) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -8778,7 +8463,6 @@ fptools_cv_htype_sup_long=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_long=Float @@ -8861,7 +8545,6 @@ fptools_cv_htype_sup_long=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(long) * 8" "HTYPE_SIZE" " #include #include @@ -8930,7 +8613,6 @@ fptools_cv_htype_sup_long=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_long="Word$HTYPE_SIZE" @@ -9045,7 +8727,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9201,7 +8882,6 @@ fptools_cv_htype_sup_unsigned_long=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(unsigned long) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -9270,7 +8950,6 @@ fptools_cv_htype_sup_unsigned_long=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(unsigned long) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -9339,7 +9018,6 @@ fptools_cv_htype_sup_unsigned_long=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_unsigned_long=Float @@ -9422,7 +9100,6 @@ fptools_cv_htype_sup_unsigned_long=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(unsigned long) * 8" "HTYPE_SIZE" " #include #include @@ -9491,7 +9168,6 @@ fptools_cv_htype_sup_unsigned_long=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_unsigned_long="Word$HTYPE_SIZE" @@ -9607,7 +9283,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9763,7 +9438,6 @@ fptools_cv_htype_sup_long_long=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(long long) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -9832,7 +9506,6 @@ fptools_cv_htype_sup_long_long=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(long long) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -9901,7 +9574,6 @@ fptools_cv_htype_sup_long_long=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_long_long=Float @@ -9984,7 +9656,6 @@ fptools_cv_htype_sup_long_long=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(long long) * 8" "HTYPE_SIZE" " #include #include @@ -10053,7 +9724,6 @@ fptools_cv_htype_sup_long_long=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_long_long="Word$HTYPE_SIZE" @@ -10168,7 +9838,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10324,7 +9993,6 @@ fptools_cv_htype_sup_unsigned_long_long=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(unsigned long long) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -10393,7 +10061,6 @@ fptools_cv_htype_sup_unsigned_long_long=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(unsigned long long) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -10462,7 +10129,6 @@ fptools_cv_htype_sup_unsigned_long_long=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_unsigned_long_long=Float @@ -10545,7 +10211,6 @@ fptools_cv_htype_sup_unsigned_long_long=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(unsigned long long) * 8" "HTYPE_SIZE" " #include #include @@ -10614,7 +10279,6 @@ fptools_cv_htype_sup_unsigned_long_long=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_unsigned_long_long="Word$HTYPE_SIZE" @@ -10730,7 +10394,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10886,7 +10549,6 @@ fptools_cv_htype_sup_bool=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(bool) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -10955,7 +10617,6 @@ fptools_cv_htype_sup_bool=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(bool) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -11024,7 +10685,6 @@ fptools_cv_htype_sup_bool=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_bool=Float @@ -11107,7 +10767,6 @@ fptools_cv_htype_sup_bool=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(bool) * 8" "HTYPE_SIZE" " #include #include @@ -11176,7 +10835,6 @@ fptools_cv_htype_sup_bool=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_bool="Word$HTYPE_SIZE" @@ -11291,7 +10949,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11447,7 +11104,6 @@ fptools_cv_htype_sup_float=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(float) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -11516,7 +11172,6 @@ fptools_cv_htype_sup_float=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(float) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -11585,7 +11240,6 @@ fptools_cv_htype_sup_float=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_float=Float @@ -11668,7 +11322,6 @@ fptools_cv_htype_sup_float=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(float) * 8" "HTYPE_SIZE" " #include #include @@ -11737,7 +11390,6 @@ fptools_cv_htype_sup_float=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_float="Word$HTYPE_SIZE" @@ -11852,7 +11504,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12008,7 +11659,6 @@ fptools_cv_htype_sup_double=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(double) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -12077,7 +11727,6 @@ fptools_cv_htype_sup_double=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(double) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -12146,7 +11795,6 @@ fptools_cv_htype_sup_double=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_double=Float @@ -12229,7 +11877,6 @@ fptools_cv_htype_sup_double=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(double) * 8" "HTYPE_SIZE" " #include #include @@ -12298,7 +11945,6 @@ fptools_cv_htype_sup_double=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_double="Word$HTYPE_SIZE" @@ -12413,7 +12059,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12569,7 +12214,6 @@ fptools_cv_htype_sup_ptrdiff_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(ptrdiff_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -12638,7 +12282,6 @@ fptools_cv_htype_sup_ptrdiff_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(ptrdiff_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -12707,7 +12350,6 @@ fptools_cv_htype_sup_ptrdiff_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_ptrdiff_t=Float @@ -12790,7 +12432,6 @@ fptools_cv_htype_sup_ptrdiff_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(ptrdiff_t) * 8" "HTYPE_SIZE" " #include #include @@ -12859,7 +12500,6 @@ fptools_cv_htype_sup_ptrdiff_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_ptrdiff_t="Word$HTYPE_SIZE" @@ -12974,7 +12614,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13130,7 +12769,6 @@ fptools_cv_htype_sup_size_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(size_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -13199,7 +12837,6 @@ fptools_cv_htype_sup_size_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(size_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -13268,7 +12905,6 @@ fptools_cv_htype_sup_size_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_size_t=Float @@ -13351,7 +12987,6 @@ fptools_cv_htype_sup_size_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(size_t) * 8" "HTYPE_SIZE" " #include #include @@ -13420,7 +13055,6 @@ fptools_cv_htype_sup_size_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_size_t="Word$HTYPE_SIZE" @@ -13535,7 +13169,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13691,7 +13324,6 @@ fptools_cv_htype_sup_wchar_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(wchar_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -13760,7 +13392,6 @@ fptools_cv_htype_sup_wchar_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(wchar_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -13829,7 +13460,6 @@ fptools_cv_htype_sup_wchar_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_wchar_t=Float @@ -13912,7 +13542,6 @@ fptools_cv_htype_sup_wchar_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(wchar_t) * 8" "HTYPE_SIZE" " #include #include @@ -13981,7 +13610,6 @@ fptools_cv_htype_sup_wchar_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_wchar_t="Word$HTYPE_SIZE" @@ -14096,7 +13724,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14252,7 +13879,6 @@ fptools_cv_htype_sup_sig_atomic_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(sig_atomic_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -14321,7 +13947,6 @@ fptools_cv_htype_sup_sig_atomic_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(sig_atomic_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -14390,7 +14015,6 @@ fptools_cv_htype_sup_sig_atomic_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_sig_atomic_t=Float @@ -14473,7 +14097,6 @@ fptools_cv_htype_sup_sig_atomic_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(sig_atomic_t) * 8" "HTYPE_SIZE" " #include #include @@ -14542,7 +14165,6 @@ fptools_cv_htype_sup_sig_atomic_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_sig_atomic_t="Word$HTYPE_SIZE" @@ -14657,7 +14279,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14813,7 +14434,6 @@ fptools_cv_htype_sup_clock_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(clock_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -14882,7 +14502,6 @@ fptools_cv_htype_sup_clock_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(clock_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -14951,7 +14570,6 @@ fptools_cv_htype_sup_clock_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_clock_t=Float @@ -15034,7 +14652,6 @@ fptools_cv_htype_sup_clock_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(clock_t) * 8" "HTYPE_SIZE" " #include #include @@ -15103,7 +14720,6 @@ fptools_cv_htype_sup_clock_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_clock_t="Word$HTYPE_SIZE" @@ -15218,7 +14834,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15374,7 +14989,6 @@ fptools_cv_htype_sup_time_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(time_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -15443,7 +15057,6 @@ fptools_cv_htype_sup_time_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(time_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -15512,7 +15125,6 @@ fptools_cv_htype_sup_time_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_time_t=Float @@ -15595,7 +15207,6 @@ fptools_cv_htype_sup_time_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(time_t) * 8" "HTYPE_SIZE" " #include #include @@ -15664,7 +15275,6 @@ fptools_cv_htype_sup_time_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_time_t="Word$HTYPE_SIZE" @@ -15779,7 +15389,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -15935,7 +15544,6 @@ fptools_cv_htype_sup_useconds_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(useconds_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -16004,7 +15612,6 @@ fptools_cv_htype_sup_useconds_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(useconds_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -16073,7 +15680,6 @@ fptools_cv_htype_sup_useconds_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_useconds_t=Float @@ -16156,7 +15762,6 @@ fptools_cv_htype_sup_useconds_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(useconds_t) * 8" "HTYPE_SIZE" " #include #include @@ -16225,7 +15830,6 @@ fptools_cv_htype_sup_useconds_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_useconds_t="Word$HTYPE_SIZE" @@ -16339,7 +15943,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16495,7 +16098,6 @@ fptools_cv_htype_sup_suseconds_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(suseconds_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -16564,7 +16166,6 @@ fptools_cv_htype_sup_suseconds_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(suseconds_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -16633,7 +16234,6 @@ fptools_cv_htype_sup_suseconds_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_suseconds_t=Float @@ -16716,7 +16316,6 @@ fptools_cv_htype_sup_suseconds_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(suseconds_t) * 8" "HTYPE_SIZE" " #include #include @@ -16785,7 +16384,6 @@ fptools_cv_htype_sup_suseconds_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_suseconds_t="Word$HTYPE_SIZE" @@ -16901,7 +16499,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17057,7 +16654,6 @@ fptools_cv_htype_sup_dev_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(dev_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -17126,7 +16722,6 @@ fptools_cv_htype_sup_dev_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(dev_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -17195,7 +16790,6 @@ fptools_cv_htype_sup_dev_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_dev_t=Float @@ -17278,7 +16872,6 @@ fptools_cv_htype_sup_dev_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(dev_t) * 8" "HTYPE_SIZE" " #include #include @@ -17347,7 +16940,6 @@ fptools_cv_htype_sup_dev_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_dev_t="Word$HTYPE_SIZE" @@ -17462,7 +17054,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17618,7 +17209,6 @@ fptools_cv_htype_sup_ino_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(ino_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -17687,7 +17277,6 @@ fptools_cv_htype_sup_ino_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(ino_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -17756,7 +17345,6 @@ fptools_cv_htype_sup_ino_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_ino_t=Float @@ -17839,7 +17427,6 @@ fptools_cv_htype_sup_ino_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(ino_t) * 8" "HTYPE_SIZE" " #include #include @@ -17908,7 +17495,6 @@ fptools_cv_htype_sup_ino_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_ino_t="Word$HTYPE_SIZE" @@ -18023,7 +17609,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18179,7 +17764,6 @@ fptools_cv_htype_sup_mode_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(mode_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -18248,7 +17832,6 @@ fptools_cv_htype_sup_mode_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(mode_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -18317,7 +17900,6 @@ fptools_cv_htype_sup_mode_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_mode_t=Float @@ -18400,7 +17982,6 @@ fptools_cv_htype_sup_mode_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(mode_t) * 8" "HTYPE_SIZE" " #include #include @@ -18469,7 +18050,6 @@ fptools_cv_htype_sup_mode_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_mode_t="Word$HTYPE_SIZE" @@ -18584,7 +18164,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18740,7 +18319,6 @@ fptools_cv_htype_sup_off_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(off_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -18809,7 +18387,6 @@ fptools_cv_htype_sup_off_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(off_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -18878,7 +18455,6 @@ fptools_cv_htype_sup_off_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_off_t=Float @@ -18961,7 +18537,6 @@ fptools_cv_htype_sup_off_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(off_t) * 8" "HTYPE_SIZE" " #include #include @@ -19030,7 +18605,6 @@ fptools_cv_htype_sup_off_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_off_t="Word$HTYPE_SIZE" @@ -19145,7 +18719,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19301,7 +18874,6 @@ fptools_cv_htype_sup_pid_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(pid_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -19370,7 +18942,6 @@ fptools_cv_htype_sup_pid_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(pid_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -19439,7 +19010,6 @@ fptools_cv_htype_sup_pid_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_pid_t=Float @@ -19522,7 +19092,6 @@ fptools_cv_htype_sup_pid_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(pid_t) * 8" "HTYPE_SIZE" " #include #include @@ -19591,7 +19160,6 @@ fptools_cv_htype_sup_pid_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_pid_t="Word$HTYPE_SIZE" @@ -19706,7 +19274,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19862,7 +19429,6 @@ fptools_cv_htype_sup_gid_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(gid_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -19931,7 +19497,6 @@ fptools_cv_htype_sup_gid_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(gid_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -20000,7 +19565,6 @@ fptools_cv_htype_sup_gid_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_gid_t=Float @@ -20083,7 +19647,6 @@ fptools_cv_htype_sup_gid_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(gid_t) * 8" "HTYPE_SIZE" " #include #include @@ -20152,7 +19715,6 @@ fptools_cv_htype_sup_gid_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_gid_t="Word$HTYPE_SIZE" @@ -20267,7 +19829,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -20423,7 +19984,6 @@ fptools_cv_htype_sup_uid_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(uid_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -20492,7 +20052,6 @@ fptools_cv_htype_sup_uid_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(uid_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -20561,7 +20120,6 @@ fptools_cv_htype_sup_uid_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_uid_t=Float @@ -20644,7 +20202,6 @@ fptools_cv_htype_sup_uid_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(uid_t) * 8" "HTYPE_SIZE" " #include #include @@ -20713,7 +20270,6 @@ fptools_cv_htype_sup_uid_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_uid_t="Word$HTYPE_SIZE" @@ -20828,7 +20384,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -20984,7 +20539,6 @@ fptools_cv_htype_sup_cc_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(cc_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -21053,7 +20607,6 @@ fptools_cv_htype_sup_cc_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(cc_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -21122,7 +20675,6 @@ fptools_cv_htype_sup_cc_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_cc_t=Float @@ -21205,7 +20757,6 @@ fptools_cv_htype_sup_cc_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(cc_t) * 8" "HTYPE_SIZE" " #include #include @@ -21274,7 +20825,6 @@ fptools_cv_htype_sup_cc_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_cc_t="Word$HTYPE_SIZE" @@ -21389,7 +20939,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -21545,7 +21094,6 @@ fptools_cv_htype_sup_speed_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(speed_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -21614,7 +21162,6 @@ fptools_cv_htype_sup_speed_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(speed_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -21683,7 +21230,6 @@ fptools_cv_htype_sup_speed_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_speed_t=Float @@ -21766,7 +21312,6 @@ fptools_cv_htype_sup_speed_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(speed_t) * 8" "HTYPE_SIZE" " #include #include @@ -21835,7 +21380,6 @@ fptools_cv_htype_sup_speed_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_speed_t="Word$HTYPE_SIZE" @@ -21950,7 +21494,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -22106,7 +21649,6 @@ fptools_cv_htype_sup_tcflag_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(tcflag_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -22175,7 +21717,6 @@ fptools_cv_htype_sup_tcflag_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(tcflag_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -22244,7 +21785,6 @@ fptools_cv_htype_sup_tcflag_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_tcflag_t=Float @@ -22327,7 +21867,6 @@ fptools_cv_htype_sup_tcflag_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(tcflag_t) * 8" "HTYPE_SIZE" " #include #include @@ -22396,7 +21935,6 @@ fptools_cv_htype_sup_tcflag_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_tcflag_t="Word$HTYPE_SIZE" @@ -22511,7 +22049,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -22667,7 +22204,6 @@ fptools_cv_htype_sup_nlink_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(nlink_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -22736,7 +22272,6 @@ fptools_cv_htype_sup_nlink_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(nlink_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -22805,7 +22340,6 @@ fptools_cv_htype_sup_nlink_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_nlink_t=Float @@ -22888,7 +22422,6 @@ fptools_cv_htype_sup_nlink_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(nlink_t) * 8" "HTYPE_SIZE" " #include #include @@ -22957,7 +22490,6 @@ fptools_cv_htype_sup_nlink_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_nlink_t="Word$HTYPE_SIZE" @@ -23072,7 +22604,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -23228,7 +22759,6 @@ fptools_cv_htype_sup_ssize_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(ssize_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -23297,7 +22827,6 @@ fptools_cv_htype_sup_ssize_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(ssize_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -23366,7 +22895,6 @@ fptools_cv_htype_sup_ssize_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_ssize_t=Float @@ -23449,7 +22977,6 @@ fptools_cv_htype_sup_ssize_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(ssize_t) * 8" "HTYPE_SIZE" " #include #include @@ -23518,7 +23045,6 @@ fptools_cv_htype_sup_ssize_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_ssize_t="Word$HTYPE_SIZE" @@ -23633,7 +23159,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -23789,7 +23314,6 @@ fptools_cv_htype_sup_rlim_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(rlim_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -23858,7 +23382,6 @@ fptools_cv_htype_sup_rlim_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(rlim_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -23927,7 +23450,6 @@ fptools_cv_htype_sup_rlim_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_rlim_t=Float @@ -24010,7 +23532,6 @@ fptools_cv_htype_sup_rlim_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(rlim_t) * 8" "HTYPE_SIZE" " #include #include @@ -24079,7 +23600,6 @@ fptools_cv_htype_sup_rlim_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_rlim_t="Word$HTYPE_SIZE" @@ -24194,7 +23714,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -24350,7 +23869,6 @@ fptools_cv_htype_sup_blksize_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(blksize_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -24419,7 +23937,6 @@ fptools_cv_htype_sup_blksize_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(blksize_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -24488,7 +24005,6 @@ fptools_cv_htype_sup_blksize_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_blksize_t=Float @@ -24571,7 +24087,6 @@ fptools_cv_htype_sup_blksize_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(blksize_t) * 8" "HTYPE_SIZE" " #include #include @@ -24640,7 +24155,6 @@ fptools_cv_htype_sup_blksize_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_blksize_t="Word$HTYPE_SIZE" @@ -24755,7 +24269,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -24911,7 +24424,6 @@ fptools_cv_htype_sup_blkcnt_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(blkcnt_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -24980,7 +24492,6 @@ fptools_cv_htype_sup_blkcnt_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(blkcnt_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -25049,7 +24560,6 @@ fptools_cv_htype_sup_blkcnt_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_blkcnt_t=Float @@ -25132,7 +24642,6 @@ fptools_cv_htype_sup_blkcnt_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(blkcnt_t) * 8" "HTYPE_SIZE" " #include #include @@ -25201,7 +24710,6 @@ fptools_cv_htype_sup_blkcnt_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_blkcnt_t="Word$HTYPE_SIZE" @@ -25316,7 +24824,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -25472,7 +24979,6 @@ fptools_cv_htype_sup_clockid_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(clockid_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -25541,7 +25047,6 @@ fptools_cv_htype_sup_clockid_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(clockid_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -25610,7 +25115,6 @@ fptools_cv_htype_sup_clockid_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_clockid_t=Float @@ -25693,7 +25197,6 @@ fptools_cv_htype_sup_clockid_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(clockid_t) * 8" "HTYPE_SIZE" " #include #include @@ -25762,7 +25265,6 @@ fptools_cv_htype_sup_clockid_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_clockid_t="Word$HTYPE_SIZE" @@ -25877,7 +25379,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26033,7 +25534,6 @@ fptools_cv_htype_sup_fsblkcnt_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(fsblkcnt_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -26102,7 +25602,6 @@ fptools_cv_htype_sup_fsblkcnt_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(fsblkcnt_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -26171,7 +25670,6 @@ fptools_cv_htype_sup_fsblkcnt_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_fsblkcnt_t=Float @@ -26254,7 +25752,6 @@ fptools_cv_htype_sup_fsblkcnt_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(fsblkcnt_t) * 8" "HTYPE_SIZE" " #include #include @@ -26323,7 +25820,6 @@ fptools_cv_htype_sup_fsblkcnt_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_fsblkcnt_t="Word$HTYPE_SIZE" @@ -26438,7 +25934,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26594,7 +26089,6 @@ fptools_cv_htype_sup_fsfilcnt_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(fsfilcnt_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -26663,7 +26157,6 @@ fptools_cv_htype_sup_fsfilcnt_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(fsfilcnt_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -26732,7 +26225,6 @@ fptools_cv_htype_sup_fsfilcnt_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_fsfilcnt_t=Float @@ -26815,7 +26307,6 @@ fptools_cv_htype_sup_fsfilcnt_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(fsfilcnt_t) * 8" "HTYPE_SIZE" " #include #include @@ -26884,7 +26375,6 @@ fptools_cv_htype_sup_fsfilcnt_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_fsfilcnt_t="Word$HTYPE_SIZE" @@ -26999,7 +26489,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27155,7 +26644,6 @@ fptools_cv_htype_sup_id_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(id_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -27224,7 +26712,6 @@ fptools_cv_htype_sup_id_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(id_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -27293,7 +26780,6 @@ fptools_cv_htype_sup_id_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_id_t=Float @@ -27376,7 +26862,6 @@ fptools_cv_htype_sup_id_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(id_t) * 8" "HTYPE_SIZE" " #include #include @@ -27445,7 +26930,6 @@ fptools_cv_htype_sup_id_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_id_t="Word$HTYPE_SIZE" @@ -27560,7 +27044,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -27716,7 +27199,6 @@ fptools_cv_htype_sup_key_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(key_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -27785,7 +27267,6 @@ fptools_cv_htype_sup_key_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(key_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -27854,7 +27335,6 @@ fptools_cv_htype_sup_key_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_key_t=Float @@ -27937,7 +27417,6 @@ fptools_cv_htype_sup_key_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(key_t) * 8" "HTYPE_SIZE" " #include #include @@ -28006,7 +27485,6 @@ fptools_cv_htype_sup_key_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_key_t="Word$HTYPE_SIZE" @@ -28121,7 +27599,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -28277,7 +27754,6 @@ fptools_cv_htype_sup_timer_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(timer_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -28346,7 +27822,6 @@ fptools_cv_htype_sup_timer_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(timer_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -28415,7 +27890,6 @@ fptools_cv_htype_sup_timer_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_timer_t=Float @@ -28498,7 +27972,6 @@ fptools_cv_htype_sup_timer_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(timer_t) * 8" "HTYPE_SIZE" " #include #include @@ -28567,7 +28040,6 @@ fptools_cv_htype_sup_timer_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_timer_t="Word$HTYPE_SIZE" @@ -28682,7 +28154,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -28838,7 +28309,6 @@ fptools_cv_htype_sup_socklen_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(socklen_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -28907,7 +28377,6 @@ fptools_cv_htype_sup_socklen_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(socklen_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -28976,7 +28445,6 @@ fptools_cv_htype_sup_socklen_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_socklen_t=Float @@ -29059,7 +28527,6 @@ fptools_cv_htype_sup_socklen_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(socklen_t) * 8" "HTYPE_SIZE" " #include #include @@ -29128,7 +28595,6 @@ fptools_cv_htype_sup_socklen_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_socklen_t="Word$HTYPE_SIZE" @@ -29243,7 +28709,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -29399,7 +28864,6 @@ fptools_cv_htype_sup_nfds_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(nfds_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -29468,7 +28932,6 @@ fptools_cv_htype_sup_nfds_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(nfds_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -29537,7 +29000,6 @@ fptools_cv_htype_sup_nfds_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_nfds_t=Float @@ -29620,7 +29082,6 @@ fptools_cv_htype_sup_nfds_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(nfds_t) * 8" "HTYPE_SIZE" " #include #include @@ -29689,7 +29150,6 @@ fptools_cv_htype_sup_nfds_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_nfds_t="Word$HTYPE_SIZE" @@ -29805,7 +29265,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -29961,7 +29420,6 @@ fptools_cv_htype_sup_intptr_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(intptr_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -30030,7 +29488,6 @@ fptools_cv_htype_sup_intptr_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(intptr_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -30099,7 +29556,6 @@ fptools_cv_htype_sup_intptr_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_intptr_t=Float @@ -30182,7 +29638,6 @@ fptools_cv_htype_sup_intptr_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(intptr_t) * 8" "HTYPE_SIZE" " #include #include @@ -30251,7 +29706,6 @@ fptools_cv_htype_sup_intptr_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_intptr_t="Word$HTYPE_SIZE" @@ -30366,7 +29820,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -30522,7 +29975,6 @@ fptools_cv_htype_sup_uintptr_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(uintptr_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -30591,7 +30043,6 @@ fptools_cv_htype_sup_uintptr_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(uintptr_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -30660,7 +30111,6 @@ fptools_cv_htype_sup_uintptr_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_uintptr_t=Float @@ -30743,7 +30193,6 @@ fptools_cv_htype_sup_uintptr_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(uintptr_t) * 8" "HTYPE_SIZE" " #include #include @@ -30812,7 +30261,6 @@ fptools_cv_htype_sup_uintptr_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_uintptr_t="Word$HTYPE_SIZE" @@ -30927,7 +30375,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -31083,7 +30530,6 @@ fptools_cv_htype_sup_intmax_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(intmax_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -31152,7 +30598,6 @@ fptools_cv_htype_sup_intmax_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(intmax_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -31221,7 +30666,6 @@ fptools_cv_htype_sup_intmax_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_intmax_t=Float @@ -31304,7 +30748,6 @@ fptools_cv_htype_sup_intmax_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(intmax_t) * 8" "HTYPE_SIZE" " #include #include @@ -31373,7 +30816,6 @@ fptools_cv_htype_sup_intmax_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_intmax_t="Word$HTYPE_SIZE" @@ -31488,7 +30930,6 @@ fi - if test "$HTYPE_IS_INTEGRAL" -eq 0 then cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -31644,7 +31085,6 @@ fptools_cv_htype_sup_uintmax_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(uintmax_t) == sizeof(double)" "HTYPE_IS_DOUBLE" " #include #include @@ -31713,7 +31153,6 @@ fptools_cv_htype_sup_uintmax_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(uintmax_t) == sizeof(long double)" "HTYPE_IS_LDOUBLE" " #include #include @@ -31782,7 +31221,6 @@ fptools_cv_htype_sup_uintmax_t=no fi - if test "$HTYPE_IS_FLOAT" -eq 1 then fptools_cv_htype_uintmax_t=Float @@ -31865,7 +31303,6 @@ fptools_cv_htype_sup_uintmax_t=no fi - if ac_fn_c_compute_int "$LINENO" "sizeof(uintmax_t) * 8" "HTYPE_SIZE" " #include #include @@ -31934,7 +31371,6 @@ fptools_cv_htype_sup_uintmax_t=no fi - if test "$HTYPE_IS_SIGNED" -eq 0 then fptools_cv_htype_uintmax_t="Word$HTYPE_SIZE" @@ -31983,7 +31419,6 @@ fp_check_const_result='-1' fi - eval "$as_fp_Cache=\$fp_check_const_result" fi eval ac_res=\$$as_fp_Cache @@ -32015,7 +31450,6 @@ fp_check_const_result='-1' fi - eval "$as_fp_Cache=\$fp_check_const_result" fi eval ac_res=\$$as_fp_Cache @@ -32040,7 +31474,6 @@ fp_check_const_result=0 fi - fp_cv_const_O_BINARY=$fp_check_const_result fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fp_cv_const_O_BINARY" >&5 @@ -32193,7 +31626,7 @@ if test "x$ac_cv_type_struct_MD5Context" = xyes; then : else - : + as_fn_error $? "internal error" "$LINENO" 5 fi # The cast to long int works around a bug in the HP C Compiler diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -6,16 +6,12 @@ AC_CONFIG_HEADERS([include/HsBaseConfig.h include/EventConfig.h]) -AC_CANONICAL_BUILD -AC_CANONICAL_HOST -AC_CANONICAL_TARGET - AC_PROG_CC dnl make extensions visible to allow feature-tests to detect them lateron AC_USE_SYSTEM_EXTENSIONS AC_MSG_CHECKING(for WINDOWS platform) -case $host in +case $host_alias in *mingw32*|*mingw64*|*cygwin*|*msys*) WINDOWS=YES;; *) @@ -26,9 +22,6 @@ # do we have long longs? AC_CHECK_TYPES([long long]) -dnl ** check for full ANSI header (.h) files -AC_HEADER_STDC - # check for specific header (.h) files that we are interested in 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]) @@ -104,13 +97,13 @@ dnl-------------------------------------------------------------------- AC_ARG_WITH([iconv-includes], - [AC_HELP_STRING([--with-iconv-includes], + [AS_HELP_STRING([--with-iconv-includes], [directory containing iconv.h])], - [ICONV_INCLUDE_DIRS=$withval; CPPFLAGS="-I$withval $CPPFLAGS"], + [ICONV_INCLUDE_DIRS=$withval], [ICONV_INCLUDE_DIRS=]) AC_ARG_WITH([iconv-libraries], - [AC_HELP_STRING([--with-iconv-libraries], + [AS_HELP_STRING([--with-iconv-libraries], [directory containing iconv library])], [ICONV_LIB_DIRS=$withval; LDFLAGS="-L$withval $LDFLAGS"], [ICONV_LIB_DIRS=])