MahnoKropotkinvich/tinycc
1
0
Fork 0
mirror of git://repo.or.cz/tinycc.git synced 2026-07-01 09:08:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tccasm: extend .reloc directive for RISCV64 relocation types

Browse Source 
Previously, .reloc unconditionally errored on RISCV64 — only ARM64
had permission to use R_AARCH64_CALL26.  Now supports common RISCV64
relocations: R_RISCV_CALL, CALL_PLT, BRANCH, JAL, PCREL_HI20,
PCREL_LO12_I/S, 32_PCREL, 32, 64.

Restructured to use string-to-reloc-type mapping, shared across all
targets.
This commit is contained in:
Meng Zhuo 2026-05-03 00:29:09 +08:00
parent 3257afa160
commit 2a33daedca
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tccasm.c
View File

@ -1014,17 +1014,41 @@ static void asm_parse_directive(TCCState *s1, int global)
case TOK_ASMDIR_reloc: case TOK_ASMDIR_reloc:
{ {
ExprValue e; ExprValue e;
const char *reloc_name;
int reloc_type = -1;
next(); next();
asm_expr(s1, &e); asm_expr(s1, &e);
skip(','); skip(',');
reloc_name = get_tok_str(tok, NULL);
#if defined(TCC_TARGET_ARM64) #if defined(TCC_TARGET_ARM64)
if (strcmp(get_tok_str(tok, NULL), "R_AARCH64_CALL26")) if (!strcmp(reloc_name, "R_AARCH64_CALL26"))
reloc_type = R_AARCH64_CALL26;
#elif defined(TCC_TARGET_RISCV64)
if (!strcmp(reloc_name, "R_RISCV_CALL") || !strcmp(reloc_name, "R_RISCV_CALL_PLT"))
reloc_type = R_RISCV_CALL;
else if (!strcmp(reloc_name, "R_RISCV_BRANCH"))
reloc_type = R_RISCV_BRANCH;
else if (!strcmp(reloc_name, "R_RISCV_JAL"))
reloc_type = R_RISCV_JAL;
else if (!strcmp(reloc_name, "R_RISCV_PCREL_HI20"))
reloc_type = R_RISCV_PCREL_HI20;
else if (!strcmp(reloc_name, "R_RISCV_PCREL_LO12_I"))
reloc_type = R_RISCV_PCREL_LO12_I;
else if (!strcmp(reloc_name, "R_RISCV_PCREL_LO12_S"))
reloc_type = R_RISCV_PCREL_LO12_S;
else if (!strcmp(reloc_name, "R_RISCV_32_PCREL"))
reloc_type = R_RISCV_32_PCREL;
else if (!strcmp(reloc_name, "R_RISCV_32"))
reloc_type = R_RISCV_32;
else if (!strcmp(reloc_name, "R_RISCV_64"))
reloc_type = R_RISCV_64;
#endif #endif
tcc_error("unimp: reloc '%s' unknown", get_tok_str(tok, NULL)); if (reloc_type < 0)
tcc_error("unimp: reloc '%s' unknown", reloc_name);
next(); next();
skip(','); skip(',');
greloca(cur_text_section, get_asm_sym(tok, NULL), e.v, R_AARCH64_CALL26, 0); greloca(cur_text_section, get_asm_sym(tok, NULL), e.v, reloc_type, 0);
next(); next();
} }
break; break;