diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2024-07-04 22:47:57 +0900 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2024-07-16 16:07:14 +0900 |
| commit | f58437aba0a35825dc14dbbf7a1e452662ef797d (patch) | |
| tree | d2959f43c7e22be8b64ec7b120fa0d7b5585b746 /scripts | |
| parent | 3914cdde89c29b681e73e507a04ca50f147482a3 (diff) | |
| download | linux-stable-f58437aba0a35825dc14dbbf7a1e452662ef797d.tar.gz linux-stable-f58437aba0a35825dc14dbbf7a1e452662ef797d.tar.bz2 linux-stable-f58437aba0a35825dc14dbbf7a1e452662ef797d.zip | |
modpost: rename R_ARM_THM_CALL to R_ARM_THM_PC22
/usr/include/elf.h, which originates from the glibc/musl, defines
R_ARM_THM_PC22 instead of R_ARM_THM_CALL.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mod/modpost.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index e9aae1b7ff77..3e5313ed6065 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1168,10 +1168,6 @@ static Elf_Addr addend_386_rel(uint32_t *location, unsigned int r_type) return (Elf_Addr)(-1); } -#ifndef R_ARM_THM_CALL -#define R_ARM_THM_CALL 10 -#endif - static int32_t sign_extend32(int32_t value, int index) { uint8_t shift = 31 - index; @@ -1232,7 +1228,7 @@ static Elf_Addr addend_arm_rel(void *loc, Elf_Sym *sym, unsigned int r_type) ((lower & 0x07ff) << 1), 20); return offset + sym->st_value + 4; - case R_ARM_THM_CALL: + case R_ARM_THM_PC22: case R_ARM_THM_JUMP24: /* * Encoding T4: |