From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from xry111.site (xry111.site [89.208.246.23]) by sourceware.org (Postfix) with ESMTPS id 8B3EA3858D28 for ; Sat, 20 Aug 2022 08:43:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8B3EA3858D28 Received: from localhost.localdomain (xry111.site [IPv6:2001:470:683e::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature ECDSA (P-384)) (Client did not present a certificate) (Authenticated sender: xry111@xry111.site) by xry111.site (Postfix) with ESMTPSA id 655DB669EE; Sat, 20 Aug 2022 04:43:23 -0400 (EDT) Message-ID: <8ce256e286c01177b8082543ea5cd9064805b4be.camel@xry111.site> Subject: Re: [PATCH] LoongArch: Fix dl-machine.h code formatting From: Xi Ruoyao To: libc-alpha@sourceware.org Cc: caiyinyu , Adhemerval Zanella Netto , Joseph Myers , Wang Xuerui Date: Sat, 20 Aug 2022 16:43:22 +0800 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.45.2 MIME-Version: 1.0 X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00, BODY_8BITS, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FROM_SUSPICIOUS_NTLD, GIT_PATCH_0, LIKELY_SPAM_FROM, PDS_OTHER_BAD_TLD, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Aug 2022 08:43:38 -0000 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).=C2=A0 Fix them manually. >=20 > No functional change. >=20 > Signed-off-by: Xi Ruoyao > --- > =C2=A0sysdeps/loongarch/dl-machine.h | 12 ++++-------- > =C2=A01 file changed, 4 insertions(+), 8 deletions(-) >=20 > 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[], > =C2=A0=C2=A0=C2=A0=C2=A0 { > =C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0 case R_LARCH_JUMP_SLOT: > -=C2=A0=C2=A0=C2=A0 case __WORDSIZE =3D=3D 64 ? R_LARCH_64: > -=C2=A0=C2=A0=C2=A0 R_LARCH_32: > +=C2=A0=C2=A0=C2=A0 case __WORDSIZE =3D=3D 64 ? R_LARCH_64 : R_LARCH_32: > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 *addr_field =3D value; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 break; > =C2=A0 > @@ -175,18 +174,15 @@ elf_machine_rela (struct link_map *map, struct > r_scope_elem *scope[], > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 break; > =C2=A0 > =C2=A0#ifndef RTLD_BOOTSTRAP > -=C2=A0=C2=A0=C2=A0 case __WORDSIZE =3D=3D 64 ? R_LARCH_TLS_DTPMOD64: > -=C2=A0=C2=A0=C2=A0 R_LARCH_TLS_DTPMOD32: > +=C2=A0=C2=A0=C2=A0 case __WORDSIZE =3D=3D 64 ? R_LARCH_TLS_DTPMOD64 : > R_LARCH_TLS_DTPMOD32: > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 *addr_field =3D sym_map->l_tls_modid= ; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 break; > =C2=A0 > -=C2=A0=C2=A0=C2=A0 case __WORDSIZE =3D=3D 64 ? R_LARCH_TLS_DTPREL64: > -=C2=A0=C2=A0=C2=A0 R_LARCH_TLS_DTPREL32: > +=C2=A0=C2=A0=C2=A0 case __WORDSIZE =3D=3D 64 ? R_LARCH_TLS_DTPREL64 : > R_LARCH_TLS_DTPREL32: > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 *addr_field =3D TLS_DTPREL_VALUE (sy= m) + reloc->r_addend; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 break; > =C2=A0 > -=C2=A0=C2=A0=C2=A0 case __WORDSIZE =3D=3D 64 ? R_LARCH_TLS_TPREL64: > -=C2=A0=C2=A0=C2=A0 R_LARCH_TLS_TPREL32: > +=C2=A0=C2=A0=C2=A0 case __WORDSIZE =3D=3D 64 ? R_LARCH_TLS_TPREL64 : > R_LARCH_TLS_TPREL32: > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 CHECK_STATIC_TLS (map, sym_map); > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 *addr_field =3D TLS_TPREL_VALUE (sym= _map, sym) + reloc->r_addend; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 break; --=20 Xi Ruoyao School of Aerospace Science and Technology, Xidian University