1*053f45beSAndroid Build Coastguard WorkerFrom 356a6df12a0de67bdafb598dc998b3663f85cd8f Mon Sep 17 00:00:00 2001 2*053f45beSAndroid Build Coastguard WorkerFrom: Steve Muckle <[email protected]> 3*053f45beSAndroid Build Coastguard WorkerDate: Tue, 31 Oct 2017 13:50:22 -0700 4*053f45beSAndroid Build Coastguard WorkerSubject: [PATCH 10/20] vDSO/parse_vdso: fix build issues 5*053f45beSAndroid Build Coastguard Worker 6*053f45beSAndroid Build Coastguard WorkerFix a couple build issues in vdso_test. 7*053f45beSAndroid Build Coastguard Worker 8*053f45beSAndroid Build Coastguard Worker(cherry picked from commit 460c35540cb41d20e6c9383e35321995cbd645ca) 9*053f45beSAndroid Build Coastguard WorkerSigned-off-by: Steve Muckle <[email protected]> 10*053f45beSAndroid Build Coastguard Worker--- 11*053f45beSAndroid Build Coastguard Worker tools/testing/selftests/vDSO/parse_vdso.c | 7 +++++-- 12*053f45beSAndroid Build Coastguard Worker 1 file changed, 5 insertions(+), 2 deletions(-) 13*053f45beSAndroid Build Coastguard Worker 14*053f45beSAndroid Build Coastguard Workerdiff --git a/tools/testing/selftests/vDSO/parse_vdso.c b/tools/testing/selftests/vDSO/parse_vdso.c 15*053f45beSAndroid Build Coastguard Workerindex 413f75620a35..945d4e63296a 100644 16*053f45beSAndroid Build Coastguard Worker--- a/tools/testing/selftests/vDSO/parse_vdso.c 17*053f45beSAndroid Build Coastguard Worker+++ b/tools/testing/selftests/vDSO/parse_vdso.c 18*053f45beSAndroid Build Coastguard Worker@@ -56,13 +56,16 @@ static struct vdso_info 19*053f45beSAndroid Build Coastguard Worker } vdso_info; 20*053f45beSAndroid Build Coastguard Worker 21*053f45beSAndroid Build Coastguard Worker /* Straight from the ELF specification. */ 22*053f45beSAndroid Build Coastguard Worker-static unsigned long elf_hash(const unsigned char *name) 23*053f45beSAndroid Build Coastguard Worker+static unsigned long elf_hash(const char *s_name) 24*053f45beSAndroid Build Coastguard Worker { 25*053f45beSAndroid Build Coastguard Worker unsigned long h = 0, g; 26*053f45beSAndroid Build Coastguard Worker+ const unsigned char *name = (const unsigned char *)s_name; 27*053f45beSAndroid Build Coastguard Worker+ 28*053f45beSAndroid Build Coastguard Worker while (*name) 29*053f45beSAndroid Build Coastguard Worker { 30*053f45beSAndroid Build Coastguard Worker h = (h << 4) + *name++; 31*053f45beSAndroid Build Coastguard Worker- if (g = h & 0xf0000000) 32*053f45beSAndroid Build Coastguard Worker+ g = h & 0xf0000000; 33*053f45beSAndroid Build Coastguard Worker+ if (g) 34*053f45beSAndroid Build Coastguard Worker h ^= g >> 24; 35*053f45beSAndroid Build Coastguard Worker h &= ~g; 36*053f45beSAndroid Build Coastguard Worker } 37*053f45beSAndroid Build Coastguard Worker-- 38*053f45beSAndroid Build Coastguard Worker2.42.0.609.gbb76f46606-goog 39*053f45beSAndroid Build Coastguard Worker 40