Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC

Commits:

9 changed files:

Changes:

  • compiler/GHC/Builtin/Names.hs
    ... ... @@ -339,8 +339,7 @@ basicKnownKeyNames
    339 339 
             getFieldName, setFieldName,
    340 340
    341 341 
             -- List operations
    342 
    -        concatName, filterName, mapName,
    343 
    -        zipName, foldrName, buildName, augmentName, appendName,
    342 
    +        mapName, foldrName, buildName, augmentName,
    344 343
    345 344 
             -- FFI primitive types that are not wired-in.
    346 345 
             stablePtrTyConName, ptrTyConName, funPtrTyConName, constPtrConName,
    ... ... @@ -694,9 +693,8 @@ ltTag_RDR = nameRdrName ordLTDataConName
    694 693 
     eqTag_RDR               = nameRdrName  ordEQDataConName
    695 694 
     gtTag_RDR               = nameRdrName  ordGTDataConName
    696 695
    697 
    -map_RDR, append_RDR :: RdrName
    696 
    +map_RDR :: RdrName
    698 697 
     map_RDR                 = nameRdrName mapName
    699 
    -append_RDR              = nameRdrName appendName
    700 698
    701 699 
     foldr_RDR, build_RDR, returnM_RDR, bindM_RDR, failM_RDR
    702 700 
         :: RdrName
    ... ... @@ -1068,7 +1066,7 @@ considerAccessibleName = varQual gHC_INTERNAL_EXTS (fsLit "considerAccessible")
    1068 1066
    1069 1067 
     -- Random GHC.Internal.Base functions
    1070 1068 
     fromStringName, otherwiseIdName, foldrName, buildName, augmentName,
    1071 
    -    mapName, appendName, assertName,
    1069 
    +    mapName, assertName,
    1072 1070 
         dollarName :: Name
    1073 1071 
     dollarName        = varQual gHC_INTERNAL_BASE (fsLit "$")          dollarIdKey
    1074 1072 
     otherwiseIdName   = varQual gHC_INTERNAL_BASE (fsLit "otherwise")  otherwiseIdKey
    ... ... @@ -1076,7 +1074,6 @@ foldrName = varQual gHC_INTERNAL_BASE (fsLit "foldr") foldrIdKey
    1076 1074 
     buildName         = varQual gHC_INTERNAL_BASE (fsLit "build")      buildIdKey
    1077 1075 
     augmentName       = varQual gHC_INTERNAL_BASE (fsLit "augment")    augmentIdKey
    1078 1076 
     mapName           = varQual gHC_INTERNAL_BASE (fsLit "map")        mapIdKey
    1079 
    -appendName        = varQual gHC_INTERNAL_BASE (fsLit "++")         appendIdKey
    1080 1077 
     assertName        = varQual gHC_INTERNAL_BASE (fsLit "assert")     assertIdKey
    1081 1078 
     fromStringName    = varQual gHC_INTERNAL_DATA_STRING (fsLit "fromString") fromStringClassOpKey
    1082 1079
    ... ... @@ -1409,12 +1406,6 @@ enumFromThenName = varQual gHC_INTERNAL_ENUM (fsLit "enumFromThen") enumFrom
    1409 1406 
     enumFromThenToName = varQual gHC_INTERNAL_ENUM (fsLit "enumFromThenTo") enumFromThenToClassOpKey
    1410 1407 
     boundedClassName   = clsQual gHC_INTERNAL_ENUM (fsLit "Bounded")        boundedClassKey
    1411 1408
    1412 
    --- List functions
    1413 
    -concatName, filterName, zipName :: Name
    1414 
    -concatName        = varQual gHC_INTERNAL_LIST (fsLit "concat") concatIdKey
    1415 
    -filterName        = varQual gHC_INTERNAL_LIST (fsLit "filter") filterIdKey
    1416 
    -zipName           = varQual gHC_INTERNAL_LIST (fsLit "zip")    zipIdKey
    1417 
    -
    1418 1409 
     -- Overloaded lists
    1419 1410 
     isListClassName, fromListName, fromListNName, toListName :: Name
    1420 1411 
     isListClassName = clsQual gHC_INTERNAL_IS_LIST (fsLit "IsList")    isListClassKey
    ... ... @@ -2201,7 +2192,7 @@ naturalNBDataConKey = mkPreludeDataConUnique 124
    2201 2192 
     ************************************************************************
    2202 2193 
     -}
    2203 2194
    2204 
    -wildCardKey, absentErrorIdKey, absentConstraintErrorIdKey, augmentIdKey, appendIdKey,
    2195 
    +wildCardKey, absentErrorIdKey, absentConstraintErrorIdKey, augmentIdKey,
    2205 2196 
         buildIdKey, foldrIdKey, recSelErrorIdKey,
    2206 2197 
         seqIdKey, eqStringIdKey,
    2207 2198 
         noMethodBindingErrorIdKey, nonExhaustiveGuardsErrorIdKey,
    ... ... @@ -2218,7 +2209,6 @@ wildCardKey = mkPreludeMiscIdUnique 0 -- See Note [WildCard
    2218 2209 
     absentErrorIdKey               = mkPreludeMiscIdUnique  1
    2219 2210 
     absentConstraintErrorIdKey     = mkPreludeMiscIdUnique  2
    2220 2211 
     augmentIdKey                   = mkPreludeMiscIdUnique  3
    2221 
    -appendIdKey                    = mkPreludeMiscIdUnique  4
    2222 2212 
     buildIdKey                     = mkPreludeMiscIdUnique  5
    2223 2213 
     foldrIdKey                     = mkPreludeMiscIdUnique  6
    2224 2214 
     recSelErrorIdKey               = mkPreludeMiscIdUnique  7
    ... ... @@ -2247,13 +2237,9 @@ divIntIdKey = mkPreludeMiscIdUnique 26
    2247 2237 
     modIntIdKey                   = mkPreludeMiscIdUnique 27
    2248 2238 
     cstringLengthIdKey            = mkPreludeMiscIdUnique 28
    2249 2239
    2250 
    -concatIdKey, filterIdKey, zipIdKey,
    2251 
    -    bindIOIdKey, returnIOIdKey, newStablePtrIdKey,
    2240 
    +bindIOIdKey, returnIOIdKey, newStablePtrIdKey,
    2252 2241 
         printIdKey, nullAddrIdKey, voidArgIdKey,
    2253 2242 
         otherwiseIdKey, assertIdKey :: Unique
    2254 
    -concatIdKey                   = mkPreludeMiscIdUnique 31
    2255 
    -filterIdKey                   = mkPreludeMiscIdUnique 32
    2256 
    -zipIdKey                      = mkPreludeMiscIdUnique 33
    2257 2243 
     bindIOIdKey                   = mkPreludeMiscIdUnique 34
    2258 2244 
     returnIOIdKey                 = mkPreludeMiscIdUnique 35
    2259 2245 
     newStablePtrIdKey             = mkPreludeMiscIdUnique 36

  • configure.ac
    ... ... @@ -57,14 +57,10 @@ dnl ** which are needed by FP_SETUP_PROJECT_VERSION
    57 57
    58 58 
     dnl ** Find find command (for Win32's benefit)
    59 59 
     FP_PROG_FIND
    60 
    -FP_PROG_SORT
    61 60
    62 61 
     dnl ----------------------------------------------------------
    63 62 
     FP_SETUP_PROJECT_VERSION
    64 63
    65 
    -# Hmmm, we fix the RPM release number to 1 here... Is this convenient?
    66 
    -AC_SUBST([release], [1])
    67 
    -
    68 64 
     dnl * We require autoconf version 2.69 due to
    69 65 
     dnl   https://bugs.ruby-lang.org/issues/8179. Also see #14910.
    70 66 
     dnl * We need 2.50 due to the use of AC_SYS_LARGEFILE and AC_MSG_NOTICE.
    ... ... @@ -249,9 +245,6 @@ then
    249 245 
     fi
    250 246 
     AC_SUBST([WithGhc])
    251 247
    252 
    -dnl ** Without optimization some INLINE trickery fails for GHCi
    253 
    -SRC_CC_OPTS="-O"
    254 
    -
    255 248 
     dnl--------------------------------------------------------------------
    256 249 
     dnl * Choose host(/target/build) platform
    257 250 
     dnl--------------------------------------------------------------------
    ... ... @@ -753,10 +746,6 @@ AC_PROG_LN_S
    753 746 
     dnl ** Find the path to sed
    754 747 
     AC_PATH_PROGS(SedCmd,gsed sed,sed)
    755 748
    756 
    -
    757 
    -dnl ** check for time command
    758 
    -AC_PATH_PROG(TimeCmd,time)
    759 
    -
    760 749 
     dnl ** check for tar
    761 750 
     dnl   if GNU tar is named gtar, look for it first.
    762 751 
     AC_PATH_PROGS(TarCmd,gnutar gtar tar,tar)

  • libraries/ghc-internal/configure.ac
    ... ... @@ -23,7 +23,7 @@ AC_MSG_RESULT($WINDOWS)
    23 23 
     AC_CHECK_TYPES([long long])
    24 24
    25 25 
     # check for specific header (.h) files that we are interested in
    26 
    -AC_CHECK_HEADERS([ctype.h errno.h fcntl.h inttypes.h limits.h signal.h sys/file.h sys/resource.h sys/select.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/utsname.h sys/wait.h termios.h time.h unistd.h utime.h windows.h winsock.h langinfo.h poll.h sys/epoll.h sys/event.h sys/eventfd.h sys/socket.h])
    26 
    +AC_CHECK_HEADERS([ctype.h errno.h fcntl.h inttypes.h limits.h signal.h sys/resource.h sys/select.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/utsname.h sys/wait.h termios.h unistd.h utime.h windows.h winsock.h langinfo.h poll.h sys/epoll.h sys/event.h sys/eventfd.h sys/socket.h])
    27 27
    28 28 
     # Enable large file support. Do this before testing the types ino_t, off_t, and
    29 29 
     # rlim_t, because it will affect the result of that test.

  • m4/find_ghc_bootstrap_prog.m4 deleted
    1 
    -# FIND_GHC_BOOTSTRAP_PROG()
    2 
    -# --------------------------------
    3 
    -# Parse the bootstrap GHC's compiler settings file for the location of things
    4 
    -# like the `llc` and `opt` commands.
    5 
    -#
    6 
    -# $1 = the variable to set
    7 
    -# $2 = The bootstrap compiler.
    8 
    -# $3 = The string to grep for to find the correct line.
    9 
    -#
    10 
    -AC_DEFUN([FIND_GHC_BOOTSTRAP_PROG],[
    11 
    -    BootstrapTmpCmd=`grep $3 $($2 --print-libdir)/settings 2>/dev/null | sed 's/.*", "//;s/".*//'`
    12 
    -    if test -n "$BootstrapTmpCmd" && test `basename $BootstrapTmpCmd` = $BootstrapTmpCmd ; then
    13 
    -        AC_PATH_PROG([$1], [$BootstrapTmpCmd], "")
    14 
    -    else
    15 
    -        $1=$BootstrapTmpCmd
    16 
    -    fi
    17 
    -])

  • m4/fp_copy_shellvar.m4 deleted
    1 
    -# Helper for cloning a shell variable's state
    2 
    -AC_DEFUN([FP_COPY_SHELLVAR],
    3 
    -[if test -n "${$1+set}"; then $2="$$1"; else unset $2; fi ])

  • m4/fp_prog_ld_flag.m4 deleted
    1 
    -# FP_PROG_LD_FLAG
    2 
    -# ---------------
    3 
    -# Sets the output variable $2 to $1 if ld supports the $1 flag.
    4 
    -# Otherwise the variable's value is empty.
    5 
    -AC_DEFUN([FP_PROG_LD_FLAG],
    6 
    -[
    7 
    -AC_CACHE_CHECK([whether ld understands $1], [fp_cv_$2],
    8 
    -[echo 'int foo() { return 0; }' > conftest.c
    9 
    -${CC-cc} -c conftest.c
    10 
    -if $LD -r $1 -o conftest2.o conftest.o > /dev/null 2>&1; then
    11 
    -   fp_cv_$2=$1
    12 
    -else
    13 
    -   fp_cv_$2=
    14 
    -fi
    15 
    -rm -rf conftest*])
    16 
    -$2=$fp_cv_$2
    17 
    -])# FP_PROG_LD_FLAG

  • m4/fp_prog_sort.m4 deleted
    1 
    -# FP_PROG_SORT
    2 
    -# ------------
    3 
    -# Find a Unix-like sort
    4 
    -AC_DEFUN([FP_PROG_SORT],
    5 
    -[AC_PATH_PROG([fp_prog_sort], [sort])
    6 
    -echo conwip > conftest.txt
    7 
    -$fp_prog_sort -f conftest.txt > conftest.out 2>&1
    8 
    -if grep 'conwip' conftest.out > /dev/null 2>&1 ; then
    9 
    -  # The goods
    10 
    -  SortCmd="$fp_prog_sort"
    11 
    -else
    12 
    -  # Summink else..pick next one.
    13 
    -  AC_MSG_WARN([$fp_prog_sort looks like a non-*nix sort, ignoring it])
    14 
    -  FP_CHECK_PROG([SortCmd], [sort], [], [], [$fp_prog_sort])
    15 
    -fi
    16 
    -rm -f conftest.txt conftest.out
    17 
    -AC_SUBST([SortCmd])[]dnl
    18 
    -])# FP_PROG_SORT

  • m4/prep_target_file.m4
    ... ... @@ -229,5 +229,3 @@ AC_DEFUN([PREP_TARGET_FILE],[
    229 229 
         esac
    230 230 
         AC_SUBST([TargetEndianness])
    231 231 
     ])
    232 
    -
    233 
    -AC_DEFUN()

  • rts/configure.ac
    ... ... @@ -96,7 +96,7 @@ dnl off_t, because it will affect the result of that test.
    96 96 
     AC_SYS_LARGEFILE
    97 97
    98 98 
     dnl ** check for specific header (.h) files that we are interested in
    99 
    -AC_CHECK_HEADERS([ctype.h dirent.h dlfcn.h errno.h fcntl.h grp.h limits.h locale.h nlist.h pthread.h pwd.h signal.h sys/param.h sys/mman.h sys/resource.h sys/select.h sys/time.h sys/timeb.h sys/timerfd.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h utime.h windows.h winsock.h sched.h])
    99 
    +AC_CHECK_HEADERS([ctype.h dlfcn.h errno.h fcntl.h limits.h locale.h nlist.h pthread.h signal.h sys/param.h sys/mman.h sys/resource.h sys/select.h sys/time.h sys/timeb.h sys/timerfd.h sys/timers.h sys/times.h sys/utsname.h sys/wait.h termios.h utime.h windows.h winsock.h sched.h])
    100 100
    101 101 
     dnl sys/cpuset.h needs sys/param.h to be included first on FreeBSD 9.1; #7708
    102 102 
     AC_CHECK_HEADERS([sys/cpuset.h], [], [],
    ... ... @@ -148,7 +148,7 @@ FP_CHECK_FUNC([GetModuleFileName],
    148 148
    149 149 
     dnl ** check for more functions
    150 150 
     dnl ** The following have been verified to be used in ghc/, but might be used somewhere else, too.
    151 
    -AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer siginterrupt sysconf times ctime_r sched_setaffinity sched_getaffinity setlocale uselocale])
    151 
    +AC_CHECK_FUNCS([getclock getrusage gettimeofday sysconf times ctime_r sched_setaffinity sched_getaffinity uselocale])
    152 152
    153 153 
     dnl ** On OS X 10.4 (at least), time.h doesn't declare ctime_r if
    154 154 
     dnl ** _POSIX_C_SOURCE is defined
    ... ... @@ -488,5 +488,3 @@ cat ghcautoconf.h.autoconf | sed \
    488 488 
        >> include/ghcautoconf.h
    489 489 
     echo "#endif /* __GHCAUTOCONF_H__ */" >> include/ghcautoconf.h
    490 490 
     ]
    491 
    -
    492 
    -

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications · Help