From patchwork Wed Aug 12 14:41:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 40255 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 8CB4F384B009; Wed, 12 Aug 2020 14:51:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8CB4F384B009 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1597243877; bh=OI3MK0HRH144ve+NbFkbU4L5hao6kR8wxADyEhpFP4g=; 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=PWdpeiGq7E+JksClw9tb6CgwH0wWbm4gjGz5wi4+ntUGgulJW9JIBOxkZJUX4T8ac 4no/CCleV4j1NkLYI7FSIq72yOUaEJpfpnCL/8nFkHgO+mo0ETmvB7ligoC+E9cSCe GuTFLreCl9y/HfZwzYqi9DgWMzB3ON6W7AywByrU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa1.hgst.iphmx.com (esa1.hgst.iphmx.com [68.232.141.245]) by sourceware.org (Postfix) with ESMTPS id A97633857C40 for ; Wed, 12 Aug 2020 14:51:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A97633857C40 IronPort-SDR: 22fsg8REE6d86AB6OMYXqCzCr9vCgxwJFBZJrcb3poSfo5OoILoASAa9b0VAvjhAFAzr3sAntT kkgoJTCUMlPFAFc/aOjONFijbmlvc9MTM+Z5RdmilaTPecnKk5sAUSPC+WV+CLjzesAv7ZycNg 8rrc+KZHEitMDFv0kvO22mev3Un6bfUUltpe5tJZ0hXTI1v1POWvDDW+klDolRwZJPh+J+dHWK yewP1asCI/+mq1/51c9V/jbkKWqM2yhysFARLdHE9xbjAjLT8Di4h26vO+4HH3H0RZE6mSAbPm /sc= X-IronPort-AV: E=Sophos;i="5.76,304,1592841600"; d="scan'208";a="254163228" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 12 Aug 2020 22:51:14 +0800 IronPort-SDR: mNnMFvrzXE94S3ifTLCK40nONdPm6Jlxu+7r0VUUDaE6FBA7qGCrqO8SSpij7CYV6raXFYd6n+ 9ReLyN85HKvw== 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 Aug 2020 07:38:23 -0700 IronPort-SDR: Ob6enxTMfVh4S6dV+xYkJ1EVNVUgipnTW+dCOb2ekffRbgURwni3/FIGfveGXoC0gcll45xQv+ uJcunNlOdzig== WDCIronportException: Internal Received: from jbfyk72.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.59.14]) by uls-op-cesaip01.wdc.com with ESMTP; 12 Aug 2020 07:51:13 -0700 To: libc-alpha@sourceware.org Subject: [PATCH v4 07/18] sysv/linux: riscv: Fix dl-cache.h indentation Date: Wed, 12 Aug 2020 07:41:14 -0700 Message-Id: <0afac7b4aa891fae06fccdef5f85d676747e7fa8.1597243100.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=-14.3 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: macro@wdc.com, alistair.francis@wdc.com Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Signed-off-by: Alistair Francis --- sysdeps/unix/sysv/linux/riscv/dl-cache.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sysdeps/unix/sysv/linux/riscv/dl-cache.h b/sysdeps/unix/sysv/linux/riscv/dl-cache.h index 331e6015f4..d2adfbc301 100644 --- a/sysdeps/unix/sysv/linux/riscv/dl-cache.h +++ b/sysdeps/unix/sysv/linux/riscv/dl-cache.h @@ -31,7 +31,7 @@ ((flags) == _DL_CACHE_DEFAULT_ID) /* If given a path to one of our library directories, adds every library - directory via add_dir (), otherwise just adds the giver directory. On + directory via add_dir (), otherwise just adds the given directory. On RISC-V, libraries can be found in paths ending in: - /lib64/lp64d - /lib64/lp64 @@ -41,15 +41,16 @@ 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. */ + 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 \ + do \ { \ static const char* lib_dirs[] = { \ "/lib64/lp64d", \