Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC
Commits:
ebf66f67 by Cheng Shao at 2026-01-17T13:16:50-05:00
Update autoconf scripts
Scripts taken from autoconf a2287c3041a3f2a204eb942e09c015eab00dc7dd
- - - - -
598624b9 by Andreas Klebinger at 2026-01-17T13:17:32-05:00
CString.hs: Update incorrect comment.
Fixes #26322
- - - - -
d045440d by Cheng Shao at 2026-01-17T13:48:55-05:00
rts: remove unused .def files from rts/win32
This patch removes unused .def files from `rts/win32`, given we don't
build .dll files for rts/ghc-internal/ghc-prim at all. Even when we
resurrect win32 dll support at some point in the future, these .def
files still contain incorrect symbols anyway and won't be of any use.
- - - - -
ca0b66ae by Cheng Shao at 2026-01-17T13:48:56-05:00
.gitmodules: use gitlab mirror for the libffi-clib submodule
This patch fixes .gitmodules to use the gitlab mirror for the
libffi-clib submodule, to make it coherent with other submodules that
allow ghc developers to experiment with wip branches in submodules for
ghc patches. Fixes #26783.
- - - - -
7 changed files:
- .gitmodules
- config.guess
- config.sub
- libraries/ghc-internal/src/GHC/Internal/CString.hs
- − rts/win32/libHSffi.def
- − rts/win32/libHSghc-internal.def
- − rts/win32/libHSghc-prim.def
Changes:
=====================================
.gitmodules
=====================================
@@ -122,4 +122,4 @@
url = https://gitlab.haskell.org/ghc/template-haskell-quasiquoter.git
[submodule "libraries/libffi-clib"]
path = libraries/libffi-clib
- url = https://github.com/stable-haskell/libffi-clib.git
+ url = https://gitlab.haskell.org/ghc/libffi-clib.git
=====================================
config.guess
=====================================
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2024 Free Software Foundation, Inc.
+# Copyright 1992-2025 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2024-01-01'
+timestamp='2025-07-10'
# 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
@@ -60,7 +60,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2024 Free Software Foundation, Inc.
+Copyright 1992-2025 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."
@@ -123,7 +123,7 @@ set_cc_for_build() {
dummy=$tmp/dummy
case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
,,) echo "int x;" > "$dummy.c"
- for driver in cc gcc c89 c99 ; do
+ for driver in cc gcc c17 c99 c89 ; do
if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
CC_FOR_BUILD=$driver
break
@@ -634,7 +634,8 @@ EOF
sed 's/^ //' << EOF > "$dummy.c"
#include
- main()
+ int
+ main ()
{
if (!__power_pc())
exit(1);
@@ -718,7 +719,8 @@ EOF
#include
#include
- int main ()
+ int
+ main ()
{
#if defined(_SC_KERNEL_BITS)
long bits = sysconf(_SC_KERNEL_BITS);
@@ -1595,8 +1597,11 @@ EOF
*:Unleashed:*:*)
GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
;;
- *:Ironclad:*:*)
- GUESS=$UNAME_MACHINE-unknown-ironclad
+ x86_64:[Ii]ronclad:*:*|i?86:[Ii]ronclad:*:*)
+ GUESS=$UNAME_MACHINE-pc-ironclad-mlibc
+ ;;
+ *:[Ii]ronclad:*:*)
+ GUESS=$UNAME_MACHINE-unknown-ironclad-mlibc
;;
esac
@@ -1621,6 +1626,7 @@ cat > "$dummy.c" <."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2024 Free Software Foundation, Inc.
+Copyright 1992-2025 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."
@@ -120,7 +120,6 @@ case $# in
esac
# Split fields of configuration type
-# shellcheck disable=SC2162
saved_IFS=$IFS
IFS="-" read field1 field2 field3 field4 <https://oldskool.silicium.org/stations/bull_dpx20.htm
+ # https://www.feb-patrimoine.com/english/bull_dpx2.htm
+ # https://www.feb-patrimoine.com/english/unix_and_bull.htm
+ dpx2 | dpx2[23]00 | dpx2[23]xx)
cpu=m68k
vendor=bull
- basic_os=sysv3
+ ;;
+ dpx2100 | dpx21xx)
+ cpu=i386
+ vendor=bull
+ ;;
+ dpx20)
+ cpu=rs6000
+ vendor=bull
;;
encore | umax | mmax)
cpu=ns32k
@@ -837,18 +901,6 @@ case $basic_machine in
next | m*-next)
cpu=m68k
vendor=next
- case $basic_os in
- openstep*)
- ;;
- nextstep*)
- ;;
- ns2*)
- basic_os=nextstep2
- ;;
- *)
- basic_os=nextstep3
- ;;
- esac
;;
np1)
cpu=np1
@@ -937,7 +989,6 @@ case $basic_machine in
;;
*-*)
- # shellcheck disable=SC2162
saved_IFS=$IFS
IFS="-" read cpu vendor <&2
exit 1
;;
- kfreebsd*-gnu*- | kopensolaris*-gnu*-)
+ kfreebsd*-gnu*- | knetbsd*-gnu*- | netbsd*-gnu*- | kopensolaris*-gnu*-)
;;
vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
;;
@@ -1864,8 +2253,12 @@ case $kernel-$os-$obj in
;;
os2-emx-)
;;
+ rtmk-nova-)
+ ;;
*-eabi*- | *-gnueabi*-)
;;
+ ios*-simulator- | tvos*-simulator- | watchos*-simulator- )
+ ;;
none--*)
# None (no kernel, i.e. freestanding / bare metal),
# can be paired with an machine code file format
@@ -1890,7 +2283,7 @@ case $vendor in
*-riscix*)
vendor=acorn
;;
- *-sunos*)
+ *-sunos* | *-solaris*)
vendor=sun
;;
*-cnk* | *-aix*)
@@ -1964,8 +2357,8 @@ echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}"
exit
# Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp nil t)
# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-format: "%Y-%02m-%02d"
# time-stamp-end: "'"
# End:
=====================================
libraries/ghc-internal/src/GHC/Internal/CString.hs
=====================================
@@ -79,13 +79,12 @@ summarises the moving parts.
bindings, breaking out usual rule. See GHC.Core
Note [Core top-level string literals]
-* TODO: There is work on a special code-gen path for top-level boxed strings
+* There is a special code-gen path for top-level boxed strings
+
str :: [Char]
str = unpackCString# "foo"#
- so that they can all share a common code pointer
-
- There is a WIP MR on gitlab for this: !3012
+ It's document in Note [unpack_cstring closures].
-}
-----------------------------------------------------------------------------
=====================================
rts/win32/libHSffi.def deleted
=====================================
@@ -1,19 +0,0 @@
-
-LIBRARY "libHSffi-ghc@ProjectVersion@.dll"
-
-EXPORTS
-
- ffi_prep_cif
- ffi_call
- ffi_type_void
- ffi_type_float
- ffi_type_double
- ffi_type_sint64
- ffi_type_uint64
- ffi_type_sint32
- ffi_type_uint32
- ffi_type_sint16
- ffi_type_uint16
- ffi_type_sint8
- ffi_type_uint8
- ffi_type_pointer
=====================================
rts/win32/libHSghc-internal.def deleted
=====================================
@@ -1,49 +0,0 @@
-
-LIBRARY "libHSghc-internal-@LibVersion@-ghc@ProjectVersion@.dll"
-
-EXPORTS
- ghczminternal_GHCziInternalziInt_I8zh_con_info
- ghczminternal_GHCziInternalziInt_I16zh_con_info
- ghczminternal_GHCziInternalziInt_I32zh_con_info
- ghczminternal_GHCziInternalziInt_I64zh_con_info
-
- ghczminternal_GHCziInternalziWord_W8zh_con_info
- ghczminternal_GHCziInternalziWord_W16zh_con_info
- ghczminternal_GHCziInternalziWord_W32zh_con_info
- ghczminternal_GHCziInternalziWord_W64zh_con_info
-
- ghczminternal_GHCziInternalziStable_StablePtr_con_info
-
- ghczminternal_GHCziInternalziPack_unpackCString_closure
-
- ghczminternal_GHCziInternalziTopHandler_runIO_closure
- ghczminternal_GHCziInternalziTopHandler_runNonIO_closure
-
- ghczminternal_GHCziInternalziIOziException_stackOverflow_closure
- ghczminternal_GHCziInternalziIOziException_heapOverflow_closure
-
- ghczminternal_GHCziInternalziPtr_Ptr_con_info
- ghczminternal_GHCziInternalziPtr_FunPtr_con_info
-
- ghczminternal_GHCziInternalziConcziIO_ensureIOManagerIsRunning_closure
- ghczminternal_GHCziInternalziConcziIO_interruptIOManager_closure
- ghczminternal_GHCziInternalziConcziIO_ioManagerCapabilitiesChanged_closure
- ghczminternal_GHCziInternalziConcziSync_runSparks_closure
- ghczminternal_GHCziInternalziEventziWindows_processRemoteCompletion_closure
-
- ghczminternal_GHCziInternalziTopHandler_flushStdHandles_closure
-
- ghczminternal_GHCziInternalziWeakziFinalizze_runFinalizzerBatch_closure
- ghczminternal_GHCziInternalziPack_unpackCString_closure
- ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnMVar_closure
- ghczminternal_GHCziInternalziIOziException_blockedIndefinitelyOnSTM_closure
- ghczminternal_GHCziInternalziIOziException_allocationLimitExceeded_closure
- ghczminternal_GHCziInternalziIOziException_stackOverflow_closure
- ghczminternal_GHCziInternalziIOziException_cannotCompactFunction_closure
- ghczminternal_GHCziInternalziIOziException_cannotCompactPinned_closure
- ghczminternal_GHCziInternalziIOziException_cannotCompactMutable_closure
- ghczminternal_GHCziInternalziControlziExceptionziBase_nonTermination_closure
- ghczminternal_GHCziInternalziControlziExceptionziBase_nestedAtomically_closure
- ghczminternal_GHCziInternalziExceptionziType_divZZeroException_closure
- ghczminternal_GHCziInternalziExceptionziType_underflowException_closure
- ghczminternal_GHCziInternalziExceptionziType_overflowException_closure
=====================================
rts/win32/libHSghc-prim.def deleted
=====================================
@@ -1,14 +0,0 @@
-
-LIBRARY "libHSghc-internal-@LibVersion@-ghc@ProjectVersion@.dll"
-
-EXPORTS
-
- ghczminternal_GHCziInternalziTypes_True_closure
- ghczminternal_GHCziInternalziTypes_False_closure
- ghczminternal_GHCziInternalziTypes_Czh_con_info
- ghczminternal_GHCziInternalziTypes_Izh_con_info
- ghczminternal_GHCziInternalziTypes_Fzh_con_info
- ghczminternal_GHCziInternalziTypes_Dzh_con_info
- ghczminternal_GHCziInternalziTypes_Wzh_con_info
- ghczminternal_GHCziInternalziTypes_Czh_static_info
- ghczminternal_GHCziInternalziTypes_Izh_static_info
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/04d7d21fc0a53c85cf0dd16114aea31...
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/04d7d21fc0a53c85cf0dd16114aea31...
You're receiving this email because of your account on gitlab.haskell.org.
