Commit 1ee1313f authored by Samuel Holland's avatar Samuel Holland Committed by Alexandre Ghiti
Browse files

riscv: module: Allocate PLT entries for R_RISCV_PLT32 



apply_r_riscv_plt32_rela() may need to emit a PLT entry for the
referenced symbol, so there must be space allocated in the PLT.

Fixes: 8fd6c514 ("riscv: Add remaining module relocations")
Signed-off-by: default avatarSamuel Holland <samuel.holland@sifive.com>
Reviewed-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Link: https://lore.kernel.org/r/20250409171526.862481-2-samuel.holland@sifive.com


Signed-off-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
parent 0b4cce68

arch/riscv/kernel/module-sections.c

+7 −6
Original line number Diff line number Diff line
@@ -73,16 +73,17 @@ static bool duplicate_rela(const Elf_Rela *rela, int idx) 
static void count_max_entries(Elf_Rela *relas, int num,

			      unsigned int *plts, unsigned int *gots)

{

	unsigned int type, i;



	for (i = 0; i < num; i++) {

		type = ELF_RISCV_R_TYPE(relas[i].r_info);

		if (type == R_RISCV_CALL_PLT) {

	for (int i = 0; i < num; i++) {

		switch (ELF_R_TYPE(relas[i].r_info)) {

		case R_RISCV_CALL_PLT:

		case R_RISCV_PLT32:

			if (!duplicate_rela(relas, i))

				(*plts)++;

		} else if (type == R_RISCV_GOT_HI20) {

			break;

		case R_RISCV_GOT_HI20:

			if (!duplicate_rela(relas, i))

				(*gots)++;

			break;

		}

	}

}