From c94cb026628b831ef63e3455a66328749ff8a415 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 7 Jun 2022 22:43:20 +0930 Subject: HOWTO size encoding This changes the HOWTO macro to encode the howto.size field from a value given in bytes. This of course requires editing all target uses of HOWTO, a major pain, but makes it a little nicer to specify new target HOWTOs. Object files before/after this patch are unchanged in .data and .rodata. bfd/ * reloc.c (HOWTO_RSIZE): Encode size in bytes. (EMPTY_HOWTO): Adjust to keep it all zero. * aout-ns32k.c, * aoutx.h, * coff-alpha.c, * coff-arm.c, * coff-i386.c, * coff-mcore.c, * coff-mips.c, * coff-rs6000.c, * coff-sh.c, * coff-tic30.c, * coff-tic4x.c, * coff-tic54x.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c, * coff64-rs6000.c, * elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c, * elf32-cris.c, * elf32-crx.c, * elf32-csky.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c, * elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c, * elf32-gen.c, * elf32-h8300.c, * elf32-i386.c, * elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c, * elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68k.c, * elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c, * elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c, * elf32-ppc.c, * elf32-pru.c, * elf32-rl78.c, * elf32-rx.c, * elf32-s12z.c, * elf32-s390.c, * elf32-score.c, * elf32-score7.c, * elf32-sh-relocs.h, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c, * elf32-v850.c, * elf32-vax.c, * elf32-visium.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c, * elf32-xstormy16.c, * elf32-xtensa.c, * elf32-z80.c, * elf64-alpha.c, * elf64-bpf.c, * elf64-gen.c, * elf64-mips.c, * elf64-mmix.c, * elf64-nfp.c, * elf64-ppc.c, * elf64-s390.c, * elf64-x86-64.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfxx-ia64.c, * elfxx-loongarch.c, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c, * elfxx-tilegx.c, * mach-o-aarch64.c, * mach-o-arm.c, * mach-o-i386.c, * mach-o-x86-64.c, * pdp11.c, * reloc.c, * som.c, * vms-alpha.c: Adjust all uses of HOWTO. * bfd-in2.h: Regenerate. include/ * elf/arc-reloc.def: Adjust all uses of HOWTO. --- bfd/elf64-bpf.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'bfd/elf64-bpf.c') diff --git a/bfd/elf64-bpf.c b/bfd/elf64-bpf.c index 6cec7ac..e7c2754 100644 --- a/bfd/elf64-bpf.c +++ b/bfd/elf64-bpf.c @@ -40,7 +40,7 @@ static reloc_howto_type bpf_elf_howto_table [] = /* This reloc does nothing. */ HOWTO (R_BPF_NONE, /* type */ 0, /* rightshift */ - 3, /* size (0 = byte, 1 = short, 2 = long) */ + 0, /* size */ 0, /* bitsize */ false, /* pc_relative */ 0, /* bitpos */ @@ -55,7 +55,7 @@ static reloc_howto_type bpf_elf_howto_table [] = /* 64-immediate in LDDW instruction. */ HOWTO (R_BPF_INSN_64, /* type */ 0, /* rightshift */ - 4, /* size (0 = byte, 1 = short, 2 = long) */ + 8, /* size */ 64, /* bitsize */ false, /* pc_relative */ 32, /* bitpos */ @@ -70,7 +70,7 @@ static reloc_howto_type bpf_elf_howto_table [] = /* 32-immediate in many instructions. */ HOWTO (R_BPF_INSN_32, /* type */ 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ + 4, /* size */ 32, /* bitsize */ false, /* pc_relative */ 32, /* bitpos */ @@ -85,7 +85,7 @@ static reloc_howto_type bpf_elf_howto_table [] = /* 16-bit offsets in instructions. */ HOWTO (R_BPF_INSN_16, /* type */ 0, /* rightshift */ - 1, /* size (0 = byte, 1 = short, 2 = long) */ + 2, /* size */ 16, /* bitsize */ false, /* pc_relative */ 16, /* bitpos */ @@ -100,7 +100,7 @@ static reloc_howto_type bpf_elf_howto_table [] = /* 16-bit PC-relative address in jump instructions. */ HOWTO (R_BPF_INSN_DISP16, /* type */ 0, /* rightshift */ - 1, /* size (0 = byte, 1 = short, 2 = long) */ + 2, /* size */ 16, /* bitsize */ true, /* pc_relative */ 16, /* bitpos */ @@ -114,7 +114,7 @@ static reloc_howto_type bpf_elf_howto_table [] = HOWTO (R_BPF_DATA_8_PCREL, 0, /* rightshift */ - 0, /* size (0 = byte, 1 = short, 2 = long) */ + 1, /* size */ 8, /* bitsize */ true, /* pc_relative */ 0, /* bitpos */ @@ -128,7 +128,7 @@ static reloc_howto_type bpf_elf_howto_table [] = HOWTO (R_BPF_DATA_16_PCREL, 0, /* rightshift */ - 1, /* size (0 = byte, 1 = short, 2 = long) */ + 2, /* size */ 16, /* bitsize */ true, /* pc_relative */ 0, /* bitpos */ @@ -142,7 +142,7 @@ static reloc_howto_type bpf_elf_howto_table [] = HOWTO (R_BPF_DATA_32_PCREL, 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ + 4, /* size */ 32, /* bitsize */ true, /* pc_relative */ 0, /* bitpos */ @@ -156,7 +156,7 @@ static reloc_howto_type bpf_elf_howto_table [] = HOWTO (R_BPF_DATA_8, 0, /* rightshift */ - 0, /* size (0 = byte, 1 = short, 2 = long) */ + 1, /* size */ 8, /* bitsize */ false, /* pc_relative */ 0, /* bitpos */ @@ -170,7 +170,7 @@ static reloc_howto_type bpf_elf_howto_table [] = HOWTO (R_BPF_DATA_16, 0, /* rightshift */ - 1, /* size (0 = byte, 1 = short, 2 = long) */ + 2, /* size */ 16, /* bitsize */ false, /* pc_relative */ 0, /* bitpos */ @@ -185,7 +185,7 @@ static reloc_howto_type bpf_elf_howto_table [] = /* 32-bit PC-relative address in call instructions. */ HOWTO (R_BPF_INSN_DISP32, /* type */ 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ + 4, /* size */ 32, /* bitsize */ true, /* pc_relative */ 32, /* bitpos */ @@ -200,7 +200,7 @@ static reloc_howto_type bpf_elf_howto_table [] = /* 32-bit data. */ HOWTO (R_BPF_DATA_32, /* type */ 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ + 4, /* size */ 32, /* bitsize */ false, /* pc_relative */ 0, /* bitpos */ @@ -215,7 +215,7 @@ static reloc_howto_type bpf_elf_howto_table [] = /* 64-bit data. */ HOWTO (R_BPF_DATA_64, /* type */ 0, /* rightshift */ - 4, /* size (0 = byte, 1 = short, 2 = long) */ + 8, /* size */ 64, /* bitsize */ false, /* pc_relative */ 0, /* bitpos */ @@ -229,7 +229,7 @@ static reloc_howto_type bpf_elf_howto_table [] = HOWTO (R_BPF_DATA_64_PCREL, 0, /* rightshift */ - 4, /* size (0 = byte, 1 = short, 2 = long) */ + 8, /* size */ 64, /* bitsize */ true, /* pc_relative */ 0, /* bitpos */ -- cgit v1.1