diff options
author | Andrew Waterman <andrew@sifive.com> | 2016-12-18 22:53:47 -0800 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2016-12-20 12:26:33 +1030 |
commit | 1d65abb5e2cb1624b358dda27a53a070bec685cc (patch) | |
tree | fc2595c0626c5c415fe596dd9c1b98ca5aecf26a /bfd | |
parent | 96b0927de3ebdb302d8d571c43da3db5ec23847e (diff) | |
download | gdb-1d65abb5e2cb1624b358dda27a53a070bec685cc.zip gdb-1d65abb5e2cb1624b358dda27a53a070bec685cc.tar.gz gdb-1d65abb5e2cb1624b358dda27a53a070bec685cc.tar.bz2 |
Formatting changes for RISC-V
This is a mixed bag of format changes:
* Replacing constants with macros (0xffffffff with MINUS_ONE, for
example). There's one technically functional change in here (some
MINUS_ONEs are changed to 0), but it only changes the behavior of an
otherwise-unused field.
* Using 0 instead of 0x0 in the relocation table.
* There were some missing spaces before parens, the spaces have been
added.
* A handful of comments are now more descriptive.
* A bunch of whitespace-only changes, mostly alignment and brace
newlines.
bfd/
* elfnn-riscv.c: Formatting and comment fixes throughout.
* elfxx-riscv.c: Likewise.
(howto_table): Change the src_mask field from MINUS_ONE to 0 for
R_RISCV_TLS_DTPMOD32, R_RISCV_TLS_DTPMOD64, R_RISCV_TLS_DTPREL32,
R_RISCV_TLS_DTPREL64, R_RISCV_TLS_TPREL32, R_RISCV_TLS_TPREL64.
opcodes/
* riscv-opc.c: Formatting fixes.
gas/
* config/tc-riscv.c: Formatting and comment fixes throughout.
Diffstat (limited to 'bfd')
-rw-r--r-- | bfd/ChangeLog | 8 | ||||
-rw-r--r-- | bfd/elfnn-riscv.c | 4 | ||||
-rw-r--r-- | bfd/elfxx-riscv.c | 38 |
3 files changed, 26 insertions, 24 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 8e0269c..500003d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2016-12-20 Andrew Waterman <andrew@sifive.com> + + * elfnn-riscv.c: Formatting and comment fixes throughout. + * elfxx-riscv.c: Likewise. + (howto_table): Change the src_mask field from MINUS_ONE to 0 for + R_RISCV_TLS_DTPMOD32, R_RISCV_TLS_DTPMOD64, R_RISCV_TLS_DTPREL32, + R_RISCV_TLS_DTPREL64, R_RISCV_TLS_TPREL32, R_RISCV_TLS_TPREL64. + 2016-12-20 Palmer Dabbelt <palmer@dabbelt.com> * elfnn-riscv.c (_bfd_riscv_elf_merge_private_bfd_data): Improve diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c index 1ab97b9..f9b3e2c 100644 --- a/bfd/elfnn-riscv.c +++ b/bfd/elfnn-riscv.c @@ -220,7 +220,7 @@ riscv_make_plt_entry (bfd_vma got, bfd_vma addr, uint32_t *entry) nop */ entry[0] = RISCV_UTYPE (AUIPC, X_T3, RISCV_PCREL_HIGH_PART (got, addr)); - entry[1] = RISCV_ITYPE (LREG, X_T3, X_T3, RISCV_PCREL_LOW_PART(got, addr)); + entry[1] = RISCV_ITYPE (LREG, X_T3, X_T3, RISCV_PCREL_LOW_PART (got, addr)); entry[2] = RISCV_ITYPE (JALR, X_T1, X_T3, 0); entry[3] = RISCV_NOP; } @@ -2329,7 +2329,7 @@ riscv_elf_finish_dynamic_symbol (bfd *output_bfd, } if (h->got.offset != (bfd_vma) -1 - && !(riscv_elf_hash_entry(h)->tls_type & (GOT_TLS_GD | GOT_TLS_IE))) + && !(riscv_elf_hash_entry (h)->tls_type & (GOT_TLS_GD | GOT_TLS_IE))) { asection *sgot; asection *srela; diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index c1f28f7..0fb250d 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -63,7 +63,7 @@ static reloc_howto_type howto_table[] = "R_RISCV_32", /* name */ FALSE, /* partial_inplace */ 0, /* src_mask */ - 0xffffffff, /* dst_mask */ + MINUS_ONE, /* dst_mask */ FALSE), /* pcrel_offset */ /* 64 bit relocation. */ @@ -93,7 +93,7 @@ static reloc_howto_type howto_table[] = "R_RISCV_RELATIVE", /* name */ FALSE, /* partial_inplace */ 0, /* src_mask */ - 0xffffffff, /* dst_mask */ + MINUS_ONE, /* dst_mask */ FALSE), /* pcrel_offset */ HOWTO (R_RISCV_COPY, /* type */ @@ -106,8 +106,8 @@ static reloc_howto_type howto_table[] = bfd_elf_generic_reloc, /* special_function */ "R_RISCV_COPY", /* name */ FALSE, /* partial_inplace */ - 0x0, /* src_mask */ - 0x0, /* dst_mask */ + 0, /* src_mask */ + 0, /* dst_mask */ FALSE), /* pcrel_offset */ HOWTO (R_RISCV_JUMP_SLOT, /* type */ @@ -120,8 +120,8 @@ static reloc_howto_type howto_table[] = bfd_elf_generic_reloc, /* special_function */ "R_RISCV_JUMP_SLOT", /* name */ FALSE, /* partial_inplace */ - 0x0, /* src_mask */ - 0x0, /* dst_mask */ + 0, /* src_mask */ + 0, /* dst_mask */ FALSE), /* pcrel_offset */ /* Dynamic TLS relocations. */ @@ -135,7 +135,7 @@ static reloc_howto_type howto_table[] = bfd_elf_generic_reloc, /* special_function */ "R_RISCV_TLS_DTPMOD32", /* name */ FALSE, /* partial_inplace */ - MINUS_ONE, /* src_mask */ + 0, /* src_mask */ MINUS_ONE, /* dst_mask */ FALSE), /* pcrel_offset */ @@ -149,7 +149,7 @@ static reloc_howto_type howto_table[] = bfd_elf_generic_reloc, /* special_function */ "R_RISCV_TLS_DTPMOD64", /* name */ FALSE, /* partial_inplace */ - MINUS_ONE, /* src_mask */ + 0, /* src_mask */ MINUS_ONE, /* dst_mask */ FALSE), /* pcrel_offset */ @@ -163,7 +163,7 @@ static reloc_howto_type howto_table[] = bfd_elf_generic_reloc, /* special_function */ "R_RISCV_TLS_DTPREL32", /* name */ TRUE, /* partial_inplace */ - MINUS_ONE, /* src_mask */ + 0, /* src_mask */ MINUS_ONE, /* dst_mask */ FALSE), /* pcrel_offset */ @@ -177,7 +177,7 @@ static reloc_howto_type howto_table[] = bfd_elf_generic_reloc, /* special_function */ "R_RISCV_TLS_DTPREL64", /* name */ TRUE, /* partial_inplace */ - MINUS_ONE, /* src_mask */ + 0, /* src_mask */ MINUS_ONE, /* dst_mask */ FALSE), /* pcrel_offset */ @@ -191,7 +191,7 @@ static reloc_howto_type howto_table[] = bfd_elf_generic_reloc, /* special_function */ "R_RISCV_TLS_TPREL32", /* name */ FALSE, /* partial_inplace */ - MINUS_ONE, /* src_mask */ + 0, /* src_mask */ MINUS_ONE, /* dst_mask */ FALSE), /* pcrel_offset */ @@ -205,7 +205,7 @@ static reloc_howto_type howto_table[] = bfd_elf_generic_reloc, /* special_function */ "R_RISCV_TLS_TPREL64", /* name */ FALSE, /* partial_inplace */ - MINUS_ONE, /* src_mask */ + 0, /* src_mask */ MINUS_ONE, /* dst_mask */ FALSE), /* pcrel_offset */ @@ -238,9 +238,6 @@ static reloc_howto_type howto_table[] = TRUE, /* pc_relative */ 0, /* bitpos */ complain_overflow_dont, /* complain_on_overflow */ - /* This needs complex overflow - detection, because the upper 36 - bits must match the PC + 4. */ bfd_elf_generic_reloc, /* special_function */ "R_RISCV_JAL", /* name */ FALSE, /* partial_inplace */ @@ -264,7 +261,7 @@ static reloc_howto_type howto_table[] = /* dst_mask */ TRUE), /* pcrel_offset */ - /* 32-bit PC-relative function call (AUIPC/JALR). */ + /* Like R_RISCV_CALL, but not locally binding. */ HOWTO (R_RISCV_CALL_PLT, /* type */ 0, /* rightshift */ 2, /* size */ @@ -460,7 +457,7 @@ static reloc_howto_type howto_table[] = ENCODE_STYPE_IMM (-1U), /* dst_mask */ FALSE), /* pcrel_offset */ - /* TLS LE thread pointer usage. */ + /* TLS LE thread pointer usage. May be relaxed. */ HOWTO (R_RISCV_TPREL_ADD, /* type */ 0, /* rightshift */ 2, /* size */ @@ -665,9 +662,6 @@ static reloc_howto_type howto_table[] = TRUE, /* pc_relative */ 0, /* bitpos */ complain_overflow_dont, /* complain_on_overflow */ - /* This needs complex overflow - detection, because the upper 36 - bits must match the PC + 4. */ bfd_elf_generic_reloc, /* special_function */ "R_RISCV_RVC_JUMP", /* name */ FALSE, /* partial_inplace */ @@ -690,7 +684,7 @@ static reloc_howto_type howto_table[] = ENCODE_RVC_IMM (-1U), /* dst_mask */ FALSE), /* pcrel_offset */ - /* High 12 bits of 32-bit load or add. */ + /* GP-relative load. */ HOWTO (R_RISCV_GPREL_I, /* type */ 0, /* rightshift */ 2, /* size */ @@ -705,7 +699,7 @@ static reloc_howto_type howto_table[] = ENCODE_ITYPE_IMM (-1U), /* dst_mask */ FALSE), /* pcrel_offset */ - /* High 12 bits of 32-bit store. */ + /* GP-relative store. */ HOWTO (R_RISCV_GPREL_S, /* type */ 0, /* rightshift */ 2, /* size */ |