Skip to content

Commit f58437a

Browse files
committed
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 <[email protected]> Reviewed-by: Nathan Chancellor <[email protected]>
1 parent 3914cdd commit f58437a

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

scripts/mod/modpost.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1168,10 +1168,6 @@ static Elf_Addr addend_386_rel(uint32_t *location, unsigned int r_type)
11681168
return (Elf_Addr)(-1);
11691169
}
11701170

1171-
#ifndef R_ARM_THM_CALL
1172-
#define R_ARM_THM_CALL 10
1173-
#endif
1174-
11751171
static int32_t sign_extend32(int32_t value, int index)
11761172
{
11771173
uint8_t shift = 31 - index;
@@ -1232,7 +1228,7 @@ static Elf_Addr addend_arm_rel(void *loc, Elf_Sym *sym, unsigned int r_type)
12321228
((lower & 0x07ff) << 1),
12331229
20);
12341230
return offset + sym->st_value + 4;
1235-
case R_ARM_THM_CALL:
1231+
case R_ARM_THM_PC22:
12361232
case R_ARM_THM_JUMP24:
12371233
/*
12381234
* Encoding T4:

0 commit comments

Comments
 (0)