From: David Miller <davem@davemloft•net>
To: npiggin@gmail•com
Cc: sfr@canb•auug.org.au, 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: Thu, 22 Jun 2017 10:56:48 -0400 (EDT) [thread overview]
Message-ID: <20170622.105648.1780325804771154563.davem@davemloft.net> (raw)
In-Reply-To: <20170623003339.11cbc062@roar.ozlabs.ibm.com>
From: Nicholas Piggin <npiggin@gmail•com>
Date: Fri, 23 Jun 2017 00:33:39 +1000
> On Thu, 22 Jun 2017 10:13:06 -0400 (EDT)
> David Miller <davem@davemloft•net> wrote:
>
>> From: Nicholas Piggin <npiggin@gmail•com>
>> Date: Thu, 22 Jun 2017 18:41:16 +1000
>>
>> > Is there any way for the linker to place the inputs to avoid unresolvable
>> > relocations where possible?
>>
>> I don't think so.
>>
>> > A way to work around this is to make arch/sparc/lib/hweight.o an obj-y
>> > rather than lib-y. That's a hack because it just serves to move the
>> > input location, but not really any more of a hack than the current code
>> > that also only works because of input locations...
>>
>> I could adjust those branches in the sparc code into indirect calls
>> but it's going to perform a bit poorly on older cpus.
>
> The build succeeds with your patch. That should solve it properly
> so it won't come back to bite again.
>
> If you can tolerate the slowdown on old CPUs I'd be grateful if
> we could merge it for linux-next to get this thin archives tree
> unblocked.
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"
next prev parent reply other threads:[~2017-06-22 14:56 UTC|newest]
Thread overview: 17+ 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 [this message]
2017-06-23 3:34 ` Nicholas Piggin
2017-06-23 6:43 ` Stephen Rothwell
2017-06-23 6:46 ` yamada.masahiro
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=20170622.105648.1780325804771154563.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=amodra@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=npiggin@gmail$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=yamada.masahiro@socionext$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox