From patchwork Mon Oct 27 07:59:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 39581 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 16F1F2118A for ; Mon, 27 Oct 2014 08:03:26 +0000 (UTC) Received: by mail-wg0-f69.google.com with SMTP id b13sf2571932wgh.8 for ; Mon, 27 Oct 2014 01:03:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:mailing-list :precedence:list-id:list-unsubscribe:list-subscribe:list-archive :list-post:list-help:sender:delivered-to:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results; bh=WBIheIU55NODj+VZq/vQ6a4QZWVBXjl/cG1qSiMFWcE=; b=IKBB6qHxTtCtSuAAArqAjA/Mbec8ygJom1Uo0DSEyLrpCBwppdHvtFBUR3uMbqlBKy EldTg6LDf0tobOgrfEYt2GumbCbs4ecccqtRKQsS5RkuDZV0pZv9kapKsMx4A7M4J5/C SpODOH6eQnIyWx1dcwIjqTpad5/RZLgIt/bqZJ6EVRHz74ILXcZJOr54aJ7by2KqdaW3 2xiUp1ryytJbr7a6ZTu4rqpHP+BDyWhLPccJkD8+VC1ZNSLvJncmmgY3AO/mNh24UNc+ 2303m+PsnnduuwQbixGzLFfyAzhpl7FfYHxtn4UOq4xqA7WTsYgdCKWrnXjRpAZxDbyU tN8Q== X-Gm-Message-State: ALoCoQnzfmNwr+iQJqpFpnYeYUkrLKxSLz+8GHMnT959uzJ7vCz990aFyJcZocR1RbcfC9ZZbHR6 X-Received: by 10.180.19.198 with SMTP id h6mr3584605wie.5.1414397005155; Mon, 27 Oct 2014 01:03:25 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.25.165 with SMTP id d5ls668103lag.1.gmail; Mon, 27 Oct 2014 01:03:24 -0700 (PDT) X-Received: by 10.112.148.199 with SMTP id tu7mr21928498lbb.7.1414397004526; Mon, 27 Oct 2014 01:03:24 -0700 (PDT) Received: from mail-lb0-x22f.google.com (mail-lb0-x22f.google.com. [2a00:1450:4010:c04::22f]) by mx.google.com with ESMTPS id lc1si6966766lab.14.2014.10.27.01.03.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 27 Oct 2014 01:03:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::22f as permitted sender) client-ip=2a00:1450:4010:c04::22f; Received: by mail-lb0-f175.google.com with SMTP id u10so5311562lbd.34 for ; Mon, 27 Oct 2014 01:03:24 -0700 (PDT) X-Received: by 10.112.14.69 with SMTP id n5mr21652134lbc.34.1414397004303; Mon, 27 Oct 2014 01:03:24 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp247576lbz; Mon, 27 Oct 2014 01:03:23 -0700 (PDT) X-Received: by 10.69.31.11 with SMTP id ki11mr13522256pbd.125.1414397002750; Mon, 27 Oct 2014 01:03:22 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id sr5si9822368pbc.182.2014.10.27.01.03.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Oct 2014 01:03:22 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-53813-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 16208 invoked by alias); 27 Oct 2014 08:00:19 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list 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 15522 invoked by uid 89); 27 Oct 2014 08:00:03 -0000 X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 X-HELO: mail-ie0-f179.google.com X-Received: by 10.50.143.65 with SMTP id sc1mr20582292igb.27.1414396800217; Mon, 27 Oct 2014 01:00:00 -0700 (PDT) From: Andrew Pinski To: libc-alpha@sourceware.org Cc: Andrew Pinski Subject: [PATCH 24/29] [AARCH64] Add ldd-rewrite.sed so that ilp32 ld.so can be found Date: Mon, 27 Oct 2014 00:59:48 -0700 Message-Id: <1414396793-9005-25-git-send-email-apinski@cavium.com> In-Reply-To: <1414396793-9005-1-git-send-email-apinski@cavium.com> References: <1414396793-9005-1-git-send-email-apinski@cavium.com> X-Original-Sender: apinski@cavium.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::22f as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@sourceware.org X-Google-Group-Id: 836684582541 To be support multi-lib with ldd, we need to add a ldd-rewrite.sed file to rewrite RTLDLIST to include both ld.so's. * sysdeps/unix/sysv/linux/aarch64/configure.ac (ldd_rewrite_script): Set. * sysdeps/unix/sysv/linux/aarch64/configure: Regenerate. * sysdeps/unix/sysv/linux/aarch64/ldd-rewrite.sed: New file. --- sysdeps/unix/sysv/linux/aarch64/configure | 2 ++ sysdeps/unix/sysv/linux/aarch64/configure.ac | 2 ++ sysdeps/unix/sysv/linux/aarch64/ldd-rewrite.sed | 1 + 3 files changed, 5 insertions(+), 0 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/aarch64/ldd-rewrite.sed diff --git a/sysdeps/unix/sysv/linux/aarch64/configure b/sysdeps/unix/sysv/linux/aarch64/configure index 59372d2..faef1dd 100755 --- a/sysdeps/unix/sysv/linux/aarch64/configure +++ b/sysdeps/unix/sysv/linux/aarch64/configure @@ -31,3 +31,5 @@ case "$prefix" in esac fi +ldd_rewrite_script=$dir/ldd-rewrite.sed + diff --git a/sysdeps/unix/sysv/linux/aarch64/configure.ac b/sysdeps/unix/sysv/linux/aarch64/configure.ac index 6526816..3ca8ed1 100644 --- a/sysdeps/unix/sysv/linux/aarch64/configure.ac +++ b/sysdeps/unix/sysv/linux/aarch64/configure.ac @@ -9,3 +9,5 @@ else LIBC_SLIBDIR_RTLDDIR([lib64], [lib]) fi +ldd_rewrite_script=$dir/ldd-rewrite.sed + diff --git a/sysdeps/unix/sysv/linux/aarch64/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/aarch64/ldd-rewrite.sed new file mode 100644 index 0000000..2f3bbb9 --- /dev/null +++ b/sysdeps/unix/sysv/linux/aarch64/ldd-rewrite.sed @@ -0,0 +1 @@ +s_^\(RTLDLIST=\)\(.*lib/\)\([^/]*\)\(-aarch64\)\(\|\_be\)\(\|\_ilp32\)\(.so\.[0-9.]*\)$_\1"\2\3-aarch64\5\7 \2\3-aarch64\5\_ilp32\7"_