From patchwork Sat Jan 6 07:32:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 25247 Received: (qmail 76362 invoked by alias); 6 Jan 2018 07:32:49 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 76164 invoked by uid 89); 6 Jan 2018 07:32:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1421 X-HELO: mail-pf0-f176.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:message-id:in-reply-to:references :cc:from:to; bh=gQrF0Rhk6em7uLaPMYyL2yrARhzg8Cx6XbyE1jSkRmM=; b=r7/qGk+QG6bRZSwrgkZ6zsbjS+uSFgW6yiM14Egvk4+QvSFk/1m1OZ2rqls0/QfNhn 7Dqy9a6GzYvXdlio8PvOySyDzlEjEoY5ZQcf7ly4puixfbwV+po7yag4ms4YeEHvEwgr lVKfCeSxn7LiK88aRx05Mmknl6FEAxPPkmKRy0zzbxf29XlwADWfFT/8cZBBN4sOL1He gAjLmsK0Vky8N3O0MSQwD3uZqF0W3l0rgJf90QmUkAKkglbECjOvPZE/kiv/CbRXFQRD 9AN+KcYe+P/MRE6+E24LfdVY0Cy2F9L97NaXK1hsJcPZl4z/obnqlfpLWegcTcAtEZ35 ITWg== X-Gm-Message-State: AKGB3mKD9pAf7nt5fhKbxsUc41nHx6wbjGhdLntQKqH5RFS70C9GV1Gz J2z9g4LPIr8omhO/iNXlIFmc1Q== X-Google-Smtp-Source: ACJfBouCGOjzQgFTG6ySse7SzPAkt0JlvoqF8b9MbboPsFS79etSTZbUGMbkLED/gnFRJBAsdw/3yg== X-Received: by 10.99.170.66 with SMTP id x2mr4602433pgo.24.1515223961784; Fri, 05 Jan 2018 23:32:41 -0800 (PST) Subject: [PATCH 2/4] Allow make-link-multidir to make subdirectories Date: Fri, 5 Jan 2018 23:32:29 -0800 Message-Id: <20180106073231.20491-3-palmer@dabbelt.com> In-Reply-To: <20180106073231.20491-1-palmer@dabbelt.com> References: <20180106073231.20491-1-palmer@dabbelt.com> Cc: patches@groups.riscv.org, Palmer Dabbelt From: Palmer Dabbelt To: libc-alpha@sourceware.org, joseph@codesourcery.com, schwab@linux-m68k.org The RISC-V Linux ABI doesn't define any libraries that go directly in lib, instead they go into lib/ilp32 or lib/lp64. This casuse make-link-multidir to fail when attempting to make library directories when building a static libc on multilib RISC-V systems. This patch uses scripts/mkinstalldirs to make the base directory of the target symlink of make-link-multidir. --- ChangeLog | 4 +++- Makerules | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d0e02b0b1f43..aeab82520a1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2018-01-05 Palmer Dabbelt +2018-01-06 Palmer Dabbelt * elf/elf.h (R_RISCV_NONE): New define. (R_RISCV_32): Likewise. @@ -12,6 +12,8 @@ (R_RISCV_TLS_DTPREL64): Likewise. (R_RISCV_TLS_TPREL32): Likewise. (R_RISCV_TLS_TPREL64): Likewise. + * Makerules (make-link-multidir): Make directories before linking into + them. 2018-01-06 Samuel Thibault diff --git a/Makerules b/Makerules index d94e4ca0c18f..ef6abeac6d9d 100644 --- a/Makerules +++ b/Makerules @@ -1081,6 +1081,7 @@ mv -f $@.new $@ endef define make-link-multidir $(patsubst %/,cd %,$(objpfx)); \ + $(addprefix $(abspath $(..)scripts/mkinstalldirs) ,$(dir $(multidir))); \ $(LN_S) . $(multidir) 2> /dev/null; \ test -L $(multidir) endef