diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2017-10-24 20:35:55 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2017-10-24 20:35:55 +0000 |
| commit | 2394b8cc83b8d7a81c7c4ffc7e4215363ae7a38e (patch) | |
| tree | dbfa2790613a5386498248b6b2654daae796b3e7 /libexec/ld.so | |
| parent | cc92a49c1d2dd362b9d0502347afdbd9836bcf9b (diff) | |
R_AARCH64_NONE should be zero, not 256. The latter was a deprecated
assignment and isn't used by clang/lld.
ok jsg@
Diffstat (limited to 'libexec/ld.so')
| -rw-r--r-- | libexec/ld.so/aarch64/rtld_machine.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libexec/ld.so/aarch64/rtld_machine.c b/libexec/ld.so/aarch64/rtld_machine.c index 9546590a79f..2316b0a9179 100644 --- a/libexec/ld.so/aarch64/rtld_machine.c +++ b/libexec/ld.so/aarch64/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.3 2017/01/24 07:48:37 guenther Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.4 2017/10/24 20:35:54 guenther Exp $ */ /* * Copyright (c) 2004 Dale Rahn @@ -54,7 +54,7 @@ Elf_Addr _dl_bind(elf_object_t *object, int index); #define _RF_SZ(s) (((s) & 0xff) << 8) /* memory target size */ #define _RF_RS(s) ((s) & 0xff) /* right shift */ static int reloc_target_flags[] = { - 0, /* 0 NONE */ + [ R_AARCH64_NONE ] = 0, [ R_AARCH64_ABS64 ] = _RF_V|_RF_S|_RF_A| _RF_SZ(64) | _RF_RS(0), /* ABS64 */ [ R_AARCH64_GLOB_DAT ] = @@ -81,7 +81,7 @@ static int reloc_target_flags[] = { #define RELOC_VALUE_RIGHTSHIFT(t) (reloc_target_flags[t] & 0xff) static Elf_Addr reloc_target_bitmask[] = { #define _BM(x) (~(Elf_Addr)0 >> ((8*sizeof(reloc_target_bitmask[0])) - (x))) - 0, /* 0 NONE */ + [ R_AARCH64_NONE ] = 0, [ R_AARCH64_ABS64 ] = _BM(64), [ R_AARCH64_GLOB_DAT ] = _BM(64), [ R_AARCH64_JUMP_SLOT ] = _BM(64), |