Skip to content

Commit 3dc0c28

Browse files
committed
riscv64: breaking change for psABI
This PR is a breaking change to m4b#507. Signed-off-by: Jvle <[email protected]>
1 parent 499e308 commit 3dc0c28

File tree

1 file changed

+3
-21
lines changed

1 file changed

+3
-21
lines changed

src/elf/constants_relocation.rs

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -872,26 +872,14 @@ pub const R_RISCV_SUB16: u32 = 38;
872872
pub const R_RISCV_SUB32: u32 = 39;
873873
/// 64-bit label subtraction: word64 = S - A
874874
pub const R_RISCV_SUB64: u32 = 40;
875-
/// GNU C++ vtable hierarchy
876-
pub const R_RISCV_GNU_VTINHERIT: u32 = 41;
877-
/// GNU C++ vtable member usage
878-
pub const R_RISCV_GNU_VTENTRY: u32 = 42;
875+
/// 32-bit PC-relative relocation to a GOT entry
876+
pub const R_RISCV_GOT32_PCREL: u32 = 41;
879877
/// Alignment statement
880878
pub const R_RISCV_ALIGN: u32 = 43;
881879
/// PC-relative branch offset (CB-Type)
882880
pub const R_RISCV_RVC_BRANCH: u32 = 44;
883881
/// PC-relative jump offset (CJ-Type)
884882
pub const R_RISCV_RVC_JUMP: u32 = 45;
885-
/// Absolute address (CI-Type)
886-
pub const R_RISCV_RVC_LUI: u32 = 46;
887-
/// GP-relative reference (I-Type)
888-
pub const R_RISCV_GPREL_I: u32 = 47;
889-
/// GP-relative reference (S-Type)
890-
pub const R_RISCV_GPREL_S: u32 = 48;
891-
/// TP-relative TLS LE load (I-Type)
892-
pub const R_RISCV_TPREL_I: u32 = 49;
893-
/// TP-relative TLS LE store (S-Type)
894-
pub const R_RISCV_TPREL_S: u32 = 50;
895883
/// Instruction pair can be relaxed
896884
pub const R_RISCV_RELAX: u32 = 51;
897885
/// Local label subtraction
@@ -1829,16 +1817,10 @@ pub fn r_to_str(typ: u32, machine: u16) -> &'static str {
18291817
R_RISCV_SUB16 => "R_RISCV_SUB16",
18301818
R_RISCV_SUB32 => "R_RISCV_SUB32",
18311819
R_RISCV_SUB64 => "R_RISCV_SUB64",
1832-
R_RISCV_GNU_VTINHERIT => "R_RISCV_GNU_VTINHERIT",
1833-
R_RISCV_GNU_VTENTRY => "R_RISCV_GNU_VTENTRY",
1820+
R_RISCV_GOT32_PCREL => "R_RISCV_GOT32_PCREL",
18341821
R_RISCV_ALIGN => "R_RISCV_ALIGN",
18351822
R_RISCV_RVC_BRANCH => "R_RISCV_RVC_BRANCH",
18361823
R_RISCV_RVC_JUMP => "R_RISCV_RVC_JUMP",
1837-
R_RISCV_RVC_LUI => "R_RISCV_RVC_LUI",
1838-
R_RISCV_GPREL_I => "R_RISCV_GPREL_I",
1839-
R_RISCV_GPREL_S => "R_RISCV_GPREL_S",
1840-
R_RISCV_TPREL_I => "R_RISCV_TPREL_I",
1841-
R_RISCV_TPREL_S => "R_RISCV_TPREL_S",
18421824
R_RISCV_RELAX => "R_RISCV_RELAX",
18431825
R_RISCV_SUB6 => "R_RISCV_SUB6",
18441826
R_RISCV_SET6 => "R_RISCV_SET6",

0 commit comments

Comments
 (0)