<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Marge Bot pushed to branch master
at <a href="https://gitlab.haskell.org/ghc/ghc">Glasgow Haskell Compiler / GHC</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/761dcb84cd4c50c6fbb361eb26fb429af87392a3">761dcb84</a></strong>
<div>
<span>by Moritz Angermann</span>
<i>at 2020-06-15T13:10:36-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Load .lo as well.
Some archives contain so called linker objects, with the affectionate
.lo suffic. For example the musl libc.a will come in that form. We
still want to load those objects, hence we should not discard them and
look for .lo as well. Ultimately we might want to fix this proerly by
looking at the file magic.
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#c13531a3a86ee59ab6d8d4bd01fbea1ad9646bdb">
rts/linker/LoadArchive.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="c13531a3a86ee59ab6d8d4bd01fbea1ad9646bdb">
<a href="https://gitlab.haskell.org/ghc/ghc/-/commit/761dcb84cd4c50c6fbb361eb26fb429af87392a3#c13531a3a86ee59ab6d8d4bd01fbea1ad9646bdb"><strong>rts/linker/LoadArchive.c</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="461" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="461" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -461,6 +461,7 @@ static HsInt loadArchive_ (pathchar *path)</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="461" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
461
</td>
<td class="diff-line-num new_line" data-linenumber="461" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
461
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC461" class="line" lang="c"> <span class="cm" style="color: #998; font-style: italic;">/* TODO: Stop relying on file extensions to determine input formats.</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="462" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
462
</td>
<td class="diff-line-num new_line" data-linenumber="462" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
462
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC462" class="line" lang="c"><span class="cm" style="color: #998; font-style: italic;"> Instead try to match file headers. See #13103. */</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="463" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
463
</td>
<td class="diff-line-num new_line" data-linenumber="463" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
463
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC463" class="line" lang="c"> <span class="n" style="color: #333;">isObject</span> <span class="o" style="font-weight: 600;">=</span> <span class="p">(</span><span class="n" style="color: #333;">thisFileNameSize</span> <span class="o" style="font-weight: 600;">>=</span> <span class="mi" style="color: #099;">2</span> <span class="o" style="font-weight: 600;">&&</span> <span class="n" style="color: #333;">strncmp</span><span class="p">(</span><span class="n" style="color: #333;">fileName</span> <span class="o" style="font-weight: 600;">+</span> <span class="n" style="color: #333;">thisFileNameSize</span> <span class="o" style="font-weight: 600;">-</span> <span class="mi" style="color: #099;">2</span><span class="p">,</span> <span class="s" style="color: #d14;">".o"</span> <span class="p">,</span> <span class="mi" style="color: #099;">2</span><span class="p">)</span> <span class="o" style="font-weight: 600;">==</span> <span class="mi" style="color: #099;">0</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="464" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="464" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
464
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC464" class="line" lang="c"> <span class="o" style="font-weight: 600;">||</span> <span class="p">(</span><span class="n" style="color: #333;">thisFileNameSize</span> <span class="o" style="font-weight: 600;">>=</span> <span class="mi" style="color: #099;">3</span> <span class="o" style="font-weight: 600;">&&</span> <span class="n" style="color: #333;">strncmp</span><span class="p">(</span><span class="n" style="color: #333;">fileName</span> <span class="o" style="font-weight: 600;">+</span> <span class="n" style="color: #333;">thisFileNameSize</span> <span class="o" style="font-weight: 600;">-</span> <span class="mi" style="color: #099;">3</span><span class="p">,</span> <span class="s" style="color: #d14;">".lo"</span> <span class="p">,</span> <span class="mi" style="color: #099;">3</span><span class="p">)</span> <span class="o" style="font-weight: 600;">==</span> <span class="mi" style="color: #099;">0</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="464" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
464
</td>
<td class="diff-line-num new_line" data-linenumber="465" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
465
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC465" class="line" lang="c"> <span class="o" style="font-weight: 600;">||</span> <span class="p">(</span><span class="n" style="color: #333;">thisFileNameSize</span> <span class="o" style="font-weight: 600;">>=</span> <span class="mi" style="color: #099;">4</span> <span class="o" style="font-weight: 600;">&&</span> <span class="n" style="color: #333;">strncmp</span><span class="p">(</span><span class="n" style="color: #333;">fileName</span> <span class="o" style="font-weight: 600;">+</span> <span class="n" style="color: #333;">thisFileNameSize</span> <span class="o" style="font-weight: 600;">-</span> <span class="mi" style="color: #099;">4</span><span class="p">,</span> <span class="s" style="color: #d14;">".p_o"</span><span class="p">,</span> <span class="mi" style="color: #099;">4</span><span class="p">)</span> <span class="o" style="font-weight: 600;">==</span> <span class="mi" style="color: #099;">0</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="465" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
465
</td>
<td class="diff-line-num new_line" data-linenumber="466" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
466
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC466" class="line" lang="c"> <span class="o" style="font-weight: 600;">||</span> <span class="p">(</span><span class="n" style="color: #333;">thisFileNameSize</span> <span class="o" style="font-weight: 600;">>=</span> <span class="mi" style="color: #099;">4</span> <span class="o" style="font-weight: 600;">&&</span> <span class="n" style="color: #333;">strncmp</span><span class="p">(</span><span class="n" style="color: #333;">fileName</span> <span class="o" style="font-weight: 600;">+</span> <span class="n" style="color: #333;">thisFileNameSize</span> <span class="o" style="font-weight: 600;">-</span> <span class="mi" style="color: #099;">4</span><span class="p">,</span> <span class="s" style="color: #d14;">".obj"</span><span class="p">,</span> <span class="mi" style="color: #099;">4</span><span class="p">)</span> <span class="o" style="font-weight: 600;">==</span> <span class="mi" style="color: #099;">0</span><span class="p">);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="466" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
466
</td>
<td class="diff-line-num new_line" data-linenumber="467" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
467
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC467" class="line" lang="c"></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777;">
—
<br>
<a href="https://gitlab.haskell.org/ghc/ghc/-/commit/761dcb84cd4c50c6fbb361eb26fb429af87392a3">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.haskell.org.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.haskell.org/ghc/ghc/-/commit/761dcb84cd4c50c6fbb361eb26fb429af87392a3"}}</script>
</p>
</div>
</body>
</html>