Commit f5983dab0ead ("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
Unified · Split
| @@ -1168,39 +1168,9 @@ static Elf_Addr addend_386_rel(uint32_t *location, unsigned int r_type) · 1167 unmodified lines | |||
| 1168 | return (Elf_Addr)(-1); | 1168 | return (Elf_Addr)(-1); |
| 1169 | } | 1169 | } |
| 1170 | 1170 | ||
| 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 | |||
| 1178 | #ifndef R_ARM_THM_CALL | 1171 | #ifndef R_ARM_THM_CALL |
| 1179 | #define R_ARM_THM_CALL 10 | 1172 | #define R_ARM_THM_CALL 10 |
| 1180 | #endif | 1173 | #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 | ||
| 1204 | 1174 | ||
| 1205 | static int32_t sign_extend32(int32_t value, int index) | 1175 | static int32_t sign_extend32(int32_t value, int index) |
| 1206 | { | 1176 | { |