Skip to content

Commit

Permalink
modpost: remove self-definitions of R_ARM_* macros
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
masahir0y committed Jul 16, 2024
1 parent 5f99665 commit 3914cdd
Showing 1 changed file with 0 additions and 30 deletions.
30 changes: 0 additions & 30 deletions scripts/mod/modpost.c
Original file line number Diff line number Diff line change
Expand Up @@ -1168,39 +1168,9 @@ static Elf_Addr addend_386_rel(uint32_t *location, unsigned int r_type)
return (Elf_Addr)(-1);
}

#ifndef R_ARM_CALL
#define R_ARM_CALL 28
#endif
#ifndef R_ARM_JUMP24
#define R_ARM_JUMP24 29
#endif

#ifndef R_ARM_THM_CALL
#define R_ARM_THM_CALL 10
#endif
#ifndef R_ARM_THM_JUMP24
#define R_ARM_THM_JUMP24 30
#endif

#ifndef R_ARM_MOVW_ABS_NC
#define R_ARM_MOVW_ABS_NC 43
#endif

#ifndef R_ARM_MOVT_ABS
#define R_ARM_MOVT_ABS 44
#endif

#ifndef R_ARM_THM_MOVW_ABS_NC
#define R_ARM_THM_MOVW_ABS_NC 47
#endif

#ifndef R_ARM_THM_MOVT_ABS
#define R_ARM_THM_MOVT_ABS 48
#endif

#ifndef R_ARM_THM_JUMP19
#define R_ARM_THM_JUMP19 51
#endif

static int32_t sign_extend32(int32_t value, int index)
{
Expand Down

0 comments on commit 3914cdd

Please sign in to comment.