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: 403428 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 274ED140081 for ; Mon, 27 Oct 2014 19:03:17 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=U/4VqY1U6g1t14gTBSPceeJtApqq+8Q 3NVA2iHnYfzAjKnXwW7Uuu324zSxQc4+CwKcki6zmTaCjQs1WHZA3Tc4Z2Thi6R8 z3lGv0N72Tj7ki1uveh6mAOUWvRXFgS8cLuRxxSa2KWdI75qAR0SBdSMYspngk3k 1cE5YZRZBK3g= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=dF6483LkZxcIazGorpvqzH2/FVs=; b=QNKIt vECSmblYtjJ0K3pV8/ZsDqfk2KTBseEk5Wjp5KEODOUFhGXdNbLLmE7JTLpgwh99 F4EehGQnz2HrBpMF3NwYZAUoPOvre7z1ObRaWDUS+C0jGz1d3rduALlm7ZWBtuQj FHuBBCmkA0jNzVfZY2uqxCuzqgVlZ+jtb3cI6o= Received: (qmail 16208 invoked by alias); 27 Oct 2014 08:00:19 -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 15522 invoked by uid 89); 27 Oct 2014 08:00:03 -0000 Authentication-Results: sourceware.org; auth=none 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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WBIheIU55NODj+VZq/vQ6a4QZWVBXjl/cG1qSiMFWcE=; b=D3MfP0oXL4a7f+t1ava/gA2fF4i+8ug3T8GLj018PdxW3gU+K4Et/cv7rKHdcTmoKj x3MSVCE0HReB5k3WaO/N4fUc7bnpfNTfFNkjFKOgVkOMxXjxz7Bc80BZWw7yBIPxMkQi r1COTuAX1ODLgIJZnfOGTQYemWc/VZEl/59S/mrQbD9+Fb+UZ6BuMa4YKRkCw1ZjETsy 3Nh+8SpNuiuTadIt2PeCyz2T6o1KccaKRSvyN8H28MqRrBPpVYljW9fFrCS6vAezmiYe MGGmq3U5Pa1SHIh5Wg8V4+NjU+vGyrp2CbOINBunAnLYUSqs1GnONu8DAFneZSbTwQQo OocQ== X-Gm-Message-State: ALoCoQkZhOuID49e/7hhhoAF90GySjHTXjdBEG92WGVsIkFUvmcy307y1iYx4vdJINWa4QSnq/LI 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> 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"_