From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
Cc: npiggin@gmail.com, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, yamada.masahiro@socionext.com,
amodra@gmail.com
Subject: Re: linux-next: build failure after merge of most trees
Date: Fri, 23 Jun 2017 16:43:23 +1000 [thread overview]
Message-ID: <20170623164323.2ff81b19@canb.auug.org.au> (raw)
In-Reply-To: <20170622.105648.1780325804771154563.davem@davemloft.net>
Hi all,
On Thu, 22 Jun 2017 10:56:48 -0400 (EDT) David Miller <davem@davemloft.net> wrote:
>
> Feel free to merge it into your series:
>
> ====================
> sparc64: Use indirect calls in hamming weight stubs.
>
> Otherwise, depending upon link order, the branch relocation
> limits could be exceeded.
>
> Signed-off-by: David S. Miller <davem@davemloft.net>
>
> diff --git a/arch/sparc/lib/hweight.S b/arch/sparc/lib/hweight.S
> index f9985f1..d21cf20 100644
> --- a/arch/sparc/lib/hweight.S
> +++ b/arch/sparc/lib/hweight.S
> @@ -4,9 +4,9 @@
> .text
> .align 32
> ENTRY(__arch_hweight8)
> - ba,pt %xcc, __sw_hweight8
> + sethi %hi(__sw_hweight8), %g1
> + jmpl %g1 + %lo(__sw_hweight8), %g0
> nop
> - nop
> ENDPROC(__arch_hweight8)
> EXPORT_SYMBOL(__arch_hweight8)
> .section .popc_3insn_patch, "ax"
> @@ -17,9 +17,9 @@ EXPORT_SYMBOL(__arch_hweight8)
> .previous
>
> ENTRY(__arch_hweight16)
> - ba,pt %xcc, __sw_hweight16
> + sethi %hi(__sw_hweight16), %g1
> + jmpl %g1 + %lo(__sw_hweight16), %g0
> nop
> - nop
> ENDPROC(__arch_hweight16)
> EXPORT_SYMBOL(__arch_hweight16)
> .section .popc_3insn_patch, "ax"
> @@ -30,9 +30,9 @@ EXPORT_SYMBOL(__arch_hweight16)
> .previous
>
> ENTRY(__arch_hweight32)
> - ba,pt %xcc, __sw_hweight32
> + sethi %hi(__sw_hweight32), %g1
> + jmpl %g1 + %lo(__sw_hweight32), %g0
> nop
> - nop
> ENDPROC(__arch_hweight32)
> EXPORT_SYMBOL(__arch_hweight32)
> .section .popc_3insn_patch, "ax"
> @@ -43,9 +43,9 @@ EXPORT_SYMBOL(__arch_hweight32)
> .previous
>
> ENTRY(__arch_hweight64)
> - ba,pt %xcc, __sw_hweight64
> + sethi %hi(__sw_hweight16), %g1
> + jmpl %g1 + %lo(__sw_hweight16), %g0
> nop
> - nop
> ENDPROC(__arch_hweight64)
> EXPORT_SYMBOL(__arch_hweight64)
> .section .popc_3insn_patch, "ax"
I added that to linux-next today and it fixed the build problem.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-06-23 6:43 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-22 5:24 linux-next: build failure after merge of most trees Stephen Rothwell
2017-06-22 5:49 ` Nicholas Piggin
2017-06-22 6:20 ` Stephen Rothwell
2017-06-22 6:23 ` Stephen Rothwell
2017-06-22 8:41 ` Nicholas Piggin
2017-06-22 14:13 ` David Miller
2017-06-22 14:29 ` David Miller
2017-06-23 3:40 ` Nicholas Piggin
2017-06-22 14:33 ` Nicholas Piggin
2017-06-22 14:56 ` David Miller
2017-06-23 3:34 ` Nicholas Piggin
2017-06-23 6:43 ` Stephen Rothwell [this message]
2017-06-23 6:46 ` yamada.masahiro
2017-06-23 6:46 ` yamada.masahiro
2017-06-23 7:04 ` Stephen Rothwell
2017-06-23 7:04 ` Stephen Rothwell
2017-06-23 15:13 ` David Miller
2017-06-22 14:13 ` Alan Modra
2017-06-22 14:43 ` Nicholas Piggin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170623164323.2ff81b19@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=amodra@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=npiggin@gmail.com \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.