Skip to content

Commit 3914cdd

Browse files
committed
modpost: remove self-definitions of R_ARM_* macros
Commit f5983da ("modpost: define more R_ARM_* for old distributions") added self-definitions for the R_ARM_* macros to fix build errors on CentOS 7. RHEL/CentOS 7 were retired at the end of June. Remove all the R_ARM_* definitions (except for R_ARM_THM_CALL), which should be available in recent distributions. glibc and musl added most of R_ARM_* macros in 2013. [1] [2] [1]: https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=08cbd996d33114ca50644d060fbe3a08260430fb [2]: https://git.musl-libc.org/cgit/musl/commit/?id=268375c1c017c0bdefeed1a330811e433c4dfaef Signed-off-by: Masahiro Yamada <[email protected]> Reviewed-by: Nathan Chancellor <[email protected]>
1 parent 5f99665 commit 3914cdd

File tree

1 file changed

+0
-30
lines changed

1 file changed

+0
-30
lines changed

scripts/mod/modpost.c

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1168,39 +1168,9 @@ static Elf_Addr addend_386_rel(uint32_t *location, unsigned int r_type)
11681168
return (Elf_Addr)(-1);
11691169
}
11701170

1171-
#ifndef R_ARM_CALL
1172-
#define R_ARM_CALL 28
1173-
#endif
1174-
#ifndef R_ARM_JUMP24
1175-
#define R_ARM_JUMP24 29
1176-
#endif
1177-
11781171
#ifndef R_ARM_THM_CALL
11791172
#define R_ARM_THM_CALL 10
11801173
#endif
1181-
#ifndef R_ARM_THM_JUMP24
1182-
#define R_ARM_THM_JUMP24 30
1183-
#endif
1184-
1185-
#ifndef R_ARM_MOVW_ABS_NC
1186-
#define R_ARM_MOVW_ABS_NC 43
1187-
#endif
1188-
1189-
#ifndef R_ARM_MOVT_ABS
1190-
#define R_ARM_MOVT_ABS 44
1191-
#endif
1192-
1193-
#ifndef R_ARM_THM_MOVW_ABS_NC
1194-
#define R_ARM_THM_MOVW_ABS_NC 47
1195-
#endif
1196-
1197-
#ifndef R_ARM_THM_MOVT_ABS
1198-
#define R_ARM_THM_MOVT_ABS 48
1199-
#endif
1200-
1201-
#ifndef R_ARM_THM_JUMP19
1202-
#define R_ARM_THM_JUMP19 51
1203-
#endif
12041174

12051175
static int32_t sign_extend32(int32_t value, int index)
12061176
{

0 commit comments

Comments
 (0)