<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28363">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/crossgcc: Update fls function name for binutils nds32 patch<br><br>When building the toolchain in FreeBSD, the function fls conflicts<br>with the native fls function.  Just rename this one since it's only<br>used within the single file in the patch.<br><br>Change-Id: Iff2019bf4fce2e07e4f78605411bb3fc4f324de7<br>Signed-off-by: Martin Roth <martinr@coreboot.org><br>---<br>M util/crossgcc/patches/binutils-2.30_nds32.patch<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/63/28363/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/crossgcc/patches/binutils-2.30_nds32.patch b/util/crossgcc/patches/binutils-2.30_nds32.patch</span><br><span>index 9608265..88252c4 100644</span><br><span>--- a/util/crossgcc/patches/binutils-2.30_nds32.patch</span><br><span>+++ b/util/crossgcc/patches/binutils-2.30_nds32.patch</span><br><span>@@ -5839,7 +5839,7 @@</span><br><span> +}</span><br><span> +</span><br><span> +static unsigned int</span><br><span style="color: hsl(0, 100%, 40%);">-+fls (register unsigned int x)</span><br><span style="color: hsl(120, 100%, 40%);">++fls_ (register unsigned int x)</span><br><span> +{</span><br><span> +  return ffs (x & (-x));</span><br><span> +}</span><br><span>@@ -6698,14 +6698,14 @@</span><br><span> -       break;</span><br><span> +           if (1 < ones32 (tls_type))</span><br><span> +        {</span><br><span style="color: hsl(0, 100%, 40%);">-+                eff_tls_type = 1 << (fls (tls_type) - 1);</span><br><span style="color: hsl(120, 100%, 40%);">++              eff_tls_type = 1 << (fls_ (tls_type) - 1);</span><br><span> +           /* TLS model shall be handled in nds32_elf_unify_tls_model ()  */</span><br><span> +</span><br><span> +             /* TLS model X -> LE is not implement yet!</span><br><span> +               * workaround here!  */</span><br><span> +            if (eff_tls_type == GOT_TLS_LE)</span><br><span> +              {</span><br><span style="color: hsl(0, 100%, 40%);">-+                eff_tls_type = 1 << (fls (tls_type ^ eff_tls_type) - 1);</span><br><span style="color: hsl(120, 100%, 40%);">++               eff_tls_type = 1 << (fls_ (tls_type ^ eff_tls_type) - 1);</span><br><span> +                  }</span><br><span> +              }</span><br><span>  </span><br><span>@@ -11865,7 +11865,7 @@</span><br><span>               }</span><br><span> -        irel_ptr = irel_ptr->next;</span><br><span> +</span><br><span style="color: hsl(0, 100%, 40%);">-+             eff_tls_type = 1 << (fls (tls_type) - 1);</span><br><span style="color: hsl(120, 100%, 40%);">++              eff_tls_type = 1 << (fls_ (tls_type) - 1);</span><br><span> +           sethi_rt = N32_RT5(bfd_getb32 (contents + irel->r_offset));</span><br><span>             }</span><br><span>  </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28363">change 28363</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/28363"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Iff2019bf4fce2e07e4f78605411bb3fc4f324de7 </div>
<div style="display:none"> Gerrit-Change-Number: 28363 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>