]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
modpost: rename R_ARM_THM_CALL to R_ARM_THM_PC22
authorMasahiro Yamada <masahiroy@kernel.org>
Thu, 4 Jul 2024 13:47:57 +0000 (22:47 +0900)
committerMasahiro Yamada <masahiroy@kernel.org>
Tue, 16 Jul 2024 07:07:14 +0000 (16:07 +0900)
/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>
scripts/mod/modpost.c

index e9aae1b7ff77b4e1ca565913b094542879c7fcc2..3e5313ed6065f98a58f27f9a30158d791dcb564b 100644 (file)
@@ -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: