[tip: objtool/core] objtool: Fix 32bit cross builds

From: tip-bot2 for Peter Zijlstra
Date: Thu Apr 23 2020 - 03:50:10 EST


The following commit has been merged into the objtool/core branch of tip:

Commit-ID: 963d5669171adcd59b45cad58fab81bbd599c3c8
Gitweb: https://git.kernel.org/tip/963d5669171adcd59b45cad58fab81bbd599c3c8
Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
AuthorDate: Mon, 20 Apr 2020 10:33:32 +02:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Wed, 22 Apr 2020 10:53:49 +02:00

objtool: Fix 32bit cross builds

Apparently there's people doing 64bit builds on 32bit machines.

Fixes: 74b873e49d92 ("objtool: Optimize find_rela_by_dest_range()")
Reported-by: youling257@xxxxxxxxx
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
tools/objtool/elf.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/objtool/elf.h b/tools/objtool/elf.h
index ebbb10c..0b79c23 100644
--- a/tools/objtool/elf.h
+++ b/tools/objtool/elf.h
@@ -99,7 +99,7 @@ static inline u32 sec_offset_hash(struct section *sec, unsigned long offset)
offset &= OFFSET_STRIDE_MASK;

ol = offset;
- oh = offset >> 32;
+ oh = (offset >> 16) >> 16;

__jhash_mix(ol, oh, idx);