From patchwork Sun Jul 12 15:47:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 40046 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 453BA385DC17; Sun, 12 Jul 2020 15:57:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 453BA385DC17 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1594569430; bh=xwq5ljl8r5xJ3dPsHAnRUCfTPFoA9yPvk16PHZZ2Pek=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=X8IUP9XoAmOs9xeZX+73OsObuQuSAb1rIQe0Q9G96eiiv7sYAuLcoOttJRkjvSyCW G6UoDSXRwpPOYZgy7IIk2yXBjJ4h8eACVSGQFBOuyR8rW82Mg4aUntsF/o2H7izzKT 3CxcN7zk+hjw0ip630RUPHN9pawpPLB9WRjbKL0E= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa4.hgst.iphmx.com (esa4.hgst.iphmx.com [216.71.154.42]) by sourceware.org (Postfix) with ESMTPS id 5F209385703D for ; Sun, 12 Jul 2020 15:57:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5F209385703D IronPort-SDR: N49KVxPU1uv3K4DYbLeW1zT+PTqeNVUQzrqkuPga9HrPZ4AxzXQeaG5/qHUjvzhzAmzPOmvj4r wosgUeYko5l6AAyM+MBU4Kfja6DKhbag+Y0K8meXNr0bvqQ6VvJDGLrkGJsmhNhcVZPWCCiMUi zo8G9mXWOQ6DUAi0meJizatsUBEFbXZ+mGlqPSa0MAVpRYAsebw6IgEJsoj+gfl+m2CRAhNjir XmLne2qp99GAuma4VDkfiYsrJEIfd3Er7AP+a9ReKm3/92JYYbWfEj4xdi+tYmlUYvlYBz4fmF yeY= X-IronPort-AV: E=Sophos;i="5.75,344,1589212800"; d="scan'208";a="142250036" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 12 Jul 2020 23:57:07 +0800 IronPort-SDR: gvoKmhF4vkKH1oC20/+tcdq95HIJGiMX2xnrEWhdBTwgi2bbt+D0DcyWurJkm6lOc/6B8RXMRT YEQWQtKkGWr2YhkQVRBSrTNOl1MgnKCds= Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2020 08:45:04 -0700 IronPort-SDR: zUWCxh1mzzRRxOWPSopG7YmAsygU+MGhbwFkkDbYT6vahMz8tsE7Mb4KH8W4CkgvolsjZsXy8x zbUXU+dp4kpQ== WDCIronportException: Internal Received: from usa002626.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.57.178]) by uls-op-cesaip01.wdc.com with ESMTP; 12 Jul 2020 08:57:08 -0700 To: libc-alpha@sourceware.org Subject: [PATCH v3 06/19] sysv/linux: riscv: Fix dl-cache.h indentation Date: Sun, 12 Jul 2020 08:47:36 -0700 Message-Id: <780c989c666abbabca7e13123fe876a3eaa73aef.1594568655.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-15.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-Patchwork-Original-From: Alistair Francis via Libc-alpha From: Alistair Francis Reply-To: Alistair Francis Cc: alistair.francis@wdc.com Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Replace 8 spaces with a tabi and extend the line length in preperation for the next patch. No functional changes. --- sysdeps/unix/sysv/linux/riscv/dl-cache.h | 62 ++++++++++++------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/sysdeps/unix/sysv/linux/riscv/dl-cache.h b/sysdeps/unix/sysv/linux/riscv/dl-cache.h index c297dfe84f..b3cda4ef9f 100644 --- a/sysdeps/unix/sysv/linux/riscv/dl-cache.h +++ b/sysdeps/unix/sysv/linux/riscv/dl-cache.h @@ -38,37 +38,37 @@ so this will add all of those paths. According to Joseph Myers: - My reasoning for that would be: generic autoconf-configured (etc.) - software may only know about using the lib directory, so you want the - lib directory to be searched regardless of the ABI - but it's also - useful to be able to e.g. list /usr/local/lib in /etc/ld.so.conf for all - architectures and have that automatically imply /usr/local/lib64/lp64d - etc. so that libraries can be found that come from software that does - use the ABI-specific directories. */ -#define add_system_dir(dir) \ - do \ - { \ - size_t len = strlen (dir); \ - char path[len + 9]; \ - memcpy (path, dir, len + 1); \ - if (len >= 12 && ! memcmp(path + len - 12, "/lib64/lp64d", 12)) \ - { \ - len -= 8; \ - path[len] = '\0'; \ - } \ - if (len >= 11 && ! memcmp(path + len - 11, "/lib64/lp64", 11)) \ - { \ - len -= 7; \ - path[len] = '\0'; \ - } \ - add_dir (path); \ - if (len >= 4 && ! memcmp(path + len - 4, "/lib", 4)) \ - { \ - memcpy (path + len, "64/lp64d", 9); \ - add_dir (path); \ - memcpy (path + len, "64/lp64", 8); \ - add_dir (path); \ - } \ + My reasoning for that would be: generic autoconf-configured (etc.) + software may only know about using the lib directory, so you want the + lib directory to be searched regardless of the ABI - but it's also + useful to be able to e.g. list /usr/local/lib in /etc/ld.so.conf for all + architectures and have that automatically imply /usr/local/lib64/lp64d + etc. so that libraries can be found that come from software that does + use the ABI-specific directories. */ +#define add_system_dir(dir) \ + do \ + { \ + size_t len = strlen (dir); \ + char path[len + 9]; \ + memcpy (path, dir, len + 1); \ + if (len >= 12 && ! memcmp(path + len - 12, "/lib64/lp64d", 12)) \ + { \ + len -= 8; \ + path[len] = '\0'; \ + } \ + if (len >= 11 && ! memcmp(path + len - 11, "/lib64/lp64", 11)) \ + { \ + len -= 7; \ + path[len] = '\0'; \ + } \ + add_dir (path); \ + if (len >= 4 && ! memcmp(path + len - 4, "/lib", 4)) \ + { \ + memcpy (path + len, "64/lp64d", 9); \ + add_dir (path); \ + memcpy (path + len, "64/lp64", 8); \ + add_dir (path); \ + } \ } while (0)