| Message ID | f37d8223fb1875aefa4c74e54afd7a86ebfc1e7f.camel@xry111.site |
|---|---|
| State | New |
| Headers | show |
| Series | LoongArch: Fix dl-machine.h code formatting | expand |
Discarded. My mail client was not configured properly. Will resend. On Sat, 2022-08-20 at 16:40 +0800, Xi Ruoyao wrote: > The case labels with conditional operator is bad formatted (they seem > caused by a bug of clang-format). Fix them manually. > > No functional change. > > Signed-off-by: Xi Ruoyao <xry111@xry111.site> > --- > sysdeps/loongarch/dl-machine.h | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/sysdeps/loongarch/dl-machine.h b/sysdeps/loongarch/dl- > machine.h > index c69c72d0ff..c5286041c0 100644 > --- a/sysdeps/loongarch/dl-machine.h > +++ b/sysdeps/loongarch/dl-machine.h > @@ -166,8 +166,7 @@ elf_machine_rela (struct link_map *map, struct > r_scope_elem *scope[], > { > > case R_LARCH_JUMP_SLOT: > - case __WORDSIZE == 64 ? R_LARCH_64: > - R_LARCH_32: > + case __WORDSIZE == 64 ? R_LARCH_64 : R_LARCH_32: > *addr_field = value; > break; > > @@ -175,18 +174,15 @@ elf_machine_rela (struct link_map *map, struct > r_scope_elem *scope[], > break; > > #ifndef RTLD_BOOTSTRAP > - case __WORDSIZE == 64 ? R_LARCH_TLS_DTPMOD64: > - R_LARCH_TLS_DTPMOD32: > + case __WORDSIZE == 64 ? R_LARCH_TLS_DTPMOD64 : > R_LARCH_TLS_DTPMOD32: > *addr_field = sym_map->l_tls_modid; > break; > > - case __WORDSIZE == 64 ? R_LARCH_TLS_DTPREL64: > - R_LARCH_TLS_DTPREL32: > + case __WORDSIZE == 64 ? R_LARCH_TLS_DTPREL64 : > R_LARCH_TLS_DTPREL32: > *addr_field = TLS_DTPREL_VALUE (sym) + reloc->r_addend; > break; > > - case __WORDSIZE == 64 ? R_LARCH_TLS_TPREL64: > - R_LARCH_TLS_TPREL32: > + case __WORDSIZE == 64 ? R_LARCH_TLS_TPREL64 : > R_LARCH_TLS_TPREL32: > CHECK_STATIC_TLS (map, sym_map); > *addr_field = TLS_TPREL_VALUE (sym_map, sym) + reloc->r_addend; > break;
diff --git a/sysdeps/loongarch/dl-machine.h b/sysdeps/loongarch/dl- machine.h index c69c72d0ff..c5286041c0 100644 --- a/sysdeps/loongarch/dl-machine.h +++ b/sysdeps/loongarch/dl-machine.h @@ -166,8 +166,7 @@ elf_machine_rela (struct link_map *map, struct r_scope_elem *scope[], { case R_LARCH_JUMP_SLOT: - case __WORDSIZE == 64 ? R_LARCH_64: - R_LARCH_32: + case __WORDSIZE == 64 ? R_LARCH_64 : R_LARCH_32: *addr_field = value; break;
The case labels with conditional operator is bad formatted (they seem caused by a bug of clang-format). Fix them manually. No functional change. Signed-off-by: Xi Ruoyao <xry111@xry111.site> --- sysdeps/loongarch/dl-machine.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) @@ -175,18 +174,15 @@ elf_machine_rela (struct link_map *map, struct r_scope_elem *scope[], break; #ifndef RTLD_BOOTSTRAP - case __WORDSIZE == 64 ? R_LARCH_TLS_DTPMOD64: - R_LARCH_TLS_DTPMOD32: + case __WORDSIZE == 64 ? R_LARCH_TLS_DTPMOD64 : R_LARCH_TLS_DTPMOD32: *addr_field = sym_map->l_tls_modid; break; - case __WORDSIZE == 64 ? R_LARCH_TLS_DTPREL64: - R_LARCH_TLS_DTPREL32: + case __WORDSIZE == 64 ? R_LARCH_TLS_DTPREL64 : R_LARCH_TLS_DTPREL32: *addr_field = TLS_DTPREL_VALUE (sym) + reloc->r_addend; break; - case __WORDSIZE == 64 ? R_LARCH_TLS_TPREL64: - R_LARCH_TLS_TPREL32: + case __WORDSIZE == 64 ? R_LARCH_TLS_TPREL64 : R_LARCH_TLS_TPREL32: CHECK_STATIC_TLS (map, sym_map); *addr_field = TLS_TPREL_VALUE (sym_map, sym) + reloc->r_addend; break;