| Message ID | 20240704134812.1511315-2-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] kbuild: raise the minimum GNU Make requirement to 4.0 | expand |
On Thu, Jul 04, 2024 at 10:47:56PM +0900, Masahiro Yamada wrote: > 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 added most of R_ARM_* macros in 2013. [1] > > [1]: https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=08cbd996d33114ca50644d060fbe3a08260430fb So did musl by virtue of a glibc elf.h update: https://git.musl-libc.org/cgit/musl/commit/?id=268375c1c017c0bdefeed1a330811e433c4dfaef > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> I can't imagine this will need to be reverted but in case it does, would it make sense to place patch 3 before this one (such that it is just renaming R_ARM_THM_CALL to R_ARM_THM_PC22) so that fix remains around and the revert can be easy? Regardless: Reviewed-by: Nathan Chancellor <nathan@kernel.org> > --- > > scripts/mod/modpost.c | 30 ------------------------------ > 1 file changed, 30 deletions(-) > > diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c > index 11731fc62140..e9aae1b7ff77 100644 > --- a/scripts/mod/modpost.c > +++ b/scripts/mod/modpost.c > @@ -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) > { > -- > 2.43.0 >
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 11731fc62140..e9aae1b7ff77 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -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) {
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 added most of R_ARM_* macros in 2013. [1] [1]: https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=08cbd996d33114ca50644d060fbe3a08260430fb Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- scripts/mod/modpost.c | 30 ------------------------------ 1 file changed, 30 deletions(-)