<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en" style='--code-editor-font: var(--default-mono-font, "GitLab Mono"), JetBrains Mono, Menlo, DejaVu Sans Mono, Liberation Mono, Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, monospace;'>
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style data-premailer="ignore" type="text/css">
a { color: #1068bf; }
</style>
<style>img {
max-width: 100%; height: auto;
}
body {
font-size: 0.875rem;
}
body {
-webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px;
}
body {
font-family: var(--default-regular-font, "GitLab Sans"),-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; font-size: inherit;
}
</style>
</head>
<body style='font-size: inherit; -webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px; font-family: var(--default-regular-font, "GitLab Sans"),-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";'>
<div class="content">
<h3 style="margin-top: 20px; margin-bottom: 10px;">
Marge Bot pushed to branch master at <a href="https://gitlab.haskell.org/ghc/ghc">Glasgow Haskell Compiler / GHC</a>
</h3>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
Commits:
</h4>
<ul>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/4d59abf295cd371448f22c1724b955dce4974302">4d59abf2</a></strong>
<div>
<span> by Arsen Arsenović </span> <i> at 2024-05-07T14:40:24-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>Add the cmm_cpp_is_gcc predicate to the testsuite
A future C-- test called T24474-cmm-override-g0 relies on the
GCC-specific behaviour of -g3 implying -dD, which, in turn, leads to it
emitting #defines past the preprocessing stage. Clang, at least, does
not do this, so the test would fail if ran on Clang.
As the behaviour here being tested is ``-optCmmP-g3'' undoing effects of
the workaround we apply as a fix for bug #24474, and the workaround was
for GCC-specific behaviour, the test needs to be marked as fragile on
other compilers.
</pre>
</li>
<li>
<strong style="font-weight: bold;"><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/25b0b40467d0a12601497117c0ad14e1fcab0b74">25b0b404</a></strong>
<div>
<span> by Arsen Arsenović </span> <i> at 2024-05-07T14:40:24-04:00 </i>
</div>
<pre class="commit-message" style='white-space: pre-wrap; display: block; font-size: 14px; color: #333238; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; border-radius: 2px; margin: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>Split out the C-- preprocessor, and make it pass -g0
Previously, C-- was processed with the C preprocessor program. This
means that it inherited flags passed via -optc. A flag that is somewhat
often passed through -optc is -g. At certain -g levels (>=2), GCC
starts emitting defines *after* preprocessing, for the purposes of
debug info generation. This is not useful for the C-- compiler, and, in
fact, causes lexer errors. We can suppress this effect (safely, if
supported) via -g0.
As a workaround, in older versions of GCC (<=10), GCC only emitted
defines if a certain set of -g*3 flags was passed. Newer versions check
the debug level. For the former, we filter out those -g*3 flags and,
for the latter, we specify -g0 on top of that.
As a compatible and effective solution, this change adds a C--
preprocessor distinct from the C compiler and preprocessor, but that
keeps its flags. The command line produced for C-- preprocessing now
looks like:
$pgmCmmP $optCs_without_g3 $g0_if_supported $optCmmP
Closes: https://gitlab.haskell.org/ghc/ghc/-/issues/24474
</pre>
</li>
</ul>
<h4 style="margin-top: 10px; margin-bottom: 10px;">
30 changed files:
</h4>
<ul>
<li class="file-stats">
<a href="#64e68d52c0898049455e20b0d001ffe1dd07ff83">
compiler/GHC/Driver/Pipeline/Execute.hs
</a>
</li>
<li class="file-stats">
<a href="#774d88050336ef660c7a219fb06c480c2fc639bc">
compiler/GHC/Driver/Session.hs
</a>
</li>
<li class="file-stats">
<a href="#0b4bc77723e1f22f50d70e89a81f6d92c3904408">
compiler/GHC/Iface/Recomp/Flags.hs
</a>
</li>
<li class="file-stats">
<a href="#906f88b2ba5bce224c8a08c72cea531fdb95ca55">
compiler/GHC/Settings.hs
</a>
</li>
<li class="file-stats">
<a href="#6740fa77d6598a0ef908509264d676d65ab31fd1">
compiler/GHC/Settings/IO.hs
</a>
</li>
<li class="file-stats">
<a href="#1d9db80eb96ba810823e994df91686a927f469d9">
compiler/GHC/SysTools/Cpp.hs
</a>
</li>
<li class="file-stats">
<a href="#44b98437cdd35d6836caab46e32906e669708388">
compiler/GHC/SysTools/Tasks.hs
</a>
</li>
<li class="file-stats">
<a href="#87db583be5c13c1f7b3c958b10e03d67b6a2ca06">
configure.ac
</a>
</li>
<li class="file-stats">
<a href="#1e2eab751970e05b4edec9b2fe1a0549ae3f411f">
distrib/configure.ac.in
</a>
</li>
<li class="file-stats">
<a href="#12f1226bde7e9f48203d34d8d857513f2f1f4d75">
docs/users_guide/phases.rst
</a>
</li>
<li class="file-stats">
<a href="#9e40ce816c93f9c0eeee92bd3c4e5b3701e7679a">
hadrian/bindist/Makefile
</a>
</li>
<li class="file-stats">
<a href="#e6a8994540f65f02ba0c011043c2c97f0e43720c">
hadrian/bindist/config.mk.in
</a>
</li>
<li class="file-stats">
<a href="#e19c45aee6e0862e9904ef302afce9e2f3ae20c7">
hadrian/cfg/default.host.target.in
</a>
</li>
<li class="file-stats">
<a href="#6eadcb95c1586fce3d2b5686f585abf118ff0007">
hadrian/cfg/default.target.in
</a>
</li>
<li class="file-stats">
<a href="#2d11d70063aa1378e9323caad80c7d9116ef4520">
hadrian/src/Rules/Generate.hs
</a>
</li>
<li class="file-stats">
<a href="#462d660db6cad914e0f710fcb16982031dd052e2">
<span class="new-file">
+
m4/fp_cmm_cpp_cmd_with_args.m4
</span>
</a>
</li>
<li class="file-stats">
<a href="#3169bd84b322b6c4846a90cdab9859fa7ec5f3f4">
m4/fp_settings.m4
</a>
</li>
<li class="file-stats">
<a href="#6305a4fe35ba11b3a836bb1c2fde42c820bfbe6e">
m4/fp_setup_windows_toolchain.m4
</a>
</li>
<li class="file-stats">
<a href="#01fadb9181d5b3b61364cb25b1b0b51590f726c3">
m4/ghc_toolchain.m4
</a>
</li>
<li class="file-stats">
<a href="#76feb14f1a8e44e90548ccec8156c5f186ce70d8">
m4/prep_target_file.m4
</a>
</li>
<li class="file-stats">
<a href="#0318d7198b933e41e458fd7073d9bd9dee267e7d">
testsuite/config/ghc
</a>
</li>
<li class="file-stats">
<a href="#19a3a16fa9d768a2005142b6cc4b642f0f88713f">
testsuite/driver/testglobals.py
</a>
</li>
<li class="file-stats">
<a href="#c591f85f122007bac88228c5ff6fd76b40e6a811">
testsuite/driver/testlib.py
</a>
</li>
<li class="file-stats">
<a href="#ee4f7b6d9939b03127b25a00592025ecb8e18c23">
<span class="new-file">
+
testsuite/tests/cmm/should_compile/T24474-cmm-gets-c-opts.cmm
</span>
</a>
</li>
<li class="file-stats">
<a href="#bbf66bb6cf2280fa05af837a38afe22e67790135">
<span class="new-file">
+
testsuite/tests/cmm/should_compile/T24474-cmm-opt-order.cmm
</span>
</a>
</li>
<li class="file-stats">
<a href="#5725059965ee85969403f68b58c31b545e7f4fd8">
<span class="new-file">
+
testsuite/tests/cmm/should_compile/T24474.cmm
</span>
</a>
</li>
<li class="file-stats">
<a href="#4fb9625e4710882d22edb9e41c9c325e048ebb47">
testsuite/tests/cmm/should_compile/all.T
</a>
</li>
<li class="file-stats">
<a href="#fffcab40a7fd072c54f92f6ba3ac1767c5ec0831">
<span class="new-file">
+
testsuite/tests/cmm/should_fail/T24474-cmm-override-g0.cmm
</span>
</a>
</li>
<li class="file-stats">
<a href="#8842c42537f4370280a0b50ebee084044defafce">
<span class="new-file">
+
testsuite/tests/cmm/should_fail/T24474-cmm-override-g0.stderr
</span>
</a>
</li>
<li class="file-stats">
<a href="#756d102df57747fe050d5c7cd5b7d59bce166e04">
<span class="new-file">
+
testsuite/tests/cmm/should_fail/all.T
</span>
</a>
</li>
</ul>
<h5 style="margin-top: 10px; margin-bottom: 10px; font-size: 0.875rem;">
The diff was not included because it is too large.
</h5>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #737278;">
—
<br>
<a href="https://gitlab.haskell.org/ghc/ghc/-/compare/3b51995c158fe19d48839b92cf1ff78ce7825ce4...25b0b40467d0a12601497117c0ad14e1fcab0b74">View it on GitLab</a>.
<br>
You're receiving this email because of your account on <a target="_blank" rel="noopener noreferrer" href="https://gitlab.haskell.org">gitlab.haskell.org</a>. <a href="https://gitlab.haskell.org/-/profile/notifications" target="_blank" rel="noopener noreferrer" class="mng-notif-link">Manage all notifications</a> · <a href="https://gitlab.haskell.org/help" target="_blank" rel="noopener noreferrer" class="help-link">Help</a>
</p>
</div>
</body>
</html>