From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Masahiro Yamada <masahiroy@kernel.org>,
Nathan Chancellor <nathan@kernel.org>,
Nicolas Schier <nicolas@fjasle.eu>
Subject: [PATCH 3/3] modpost: rename R_ARM_THM_CALL to R_ARM_THM_PC22
Date: Thu, 4 Jul 2024 22:47:57 +0900 [thread overview]
Message-ID: <20240704134812.1511315-3-masahiroy@kernel.org> (raw)
In-Reply-To: <20240704134812.1511315-1-masahiroy@kernel.org>
R_ARM_THM_CALL does not exist in /usr/include/elf.h, which originates
from the Glibc project.
Instead, the following line exists:
#define R_ARM_THM_PC22 10 /* PC relative 24 bit (Thumb32 BL). */
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/mod/modpost.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index e9aae1b7ff77..3e5313ed6065 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1168,10 +1168,6 @@ static Elf_Addr addend_386_rel(uint32_t *location, unsigned int r_type)
return (Elf_Addr)(-1);
}
-#ifndef R_ARM_THM_CALL
-#define R_ARM_THM_CALL 10
-#endif
-
static int32_t sign_extend32(int32_t value, int index)
{
uint8_t shift = 31 - index;
@@ -1232,7 +1228,7 @@ static Elf_Addr addend_arm_rel(void *loc, Elf_Sym *sym, unsigned int r_type)
((lower & 0x07ff) << 1),
20);
return offset + sym->st_value + 4;
- case R_ARM_THM_CALL:
+ case R_ARM_THM_PC22:
case R_ARM_THM_JUMP24:
/*
* Encoding T4:
--
2.43.0
next prev parent reply other threads:[~2024-07-04 13:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-04 13:47 [PATCH 1/3] kbuild: raise the minimum GNU Make requirement to 4.0 Masahiro Yamada
2024-07-04 13:47 ` [PATCH 2/3] modpost: remove self-definitions of R_ARM_* macros Masahiro Yamada
2024-07-05 16:58 ` Nathan Chancellor
2024-07-04 13:47 ` Masahiro Yamada [this message]
2024-07-05 17:00 ` [PATCH 3/3] modpost: rename R_ARM_THM_CALL to R_ARM_THM_PC22 Nathan Chancellor
2024-07-05 16:52 ` [PATCH 1/3] kbuild: raise the minimum GNU Make requirement to 4.0 Nathan Chancellor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240704134812.1511315-3-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nathan@kernel.org \
--cc=nicolas@fjasle.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox