From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-ports-return-3928-listarch-libc-ports=sources.redhat.com@sourceware.org>
Received: (qmail 6150 invoked by alias); 15 Mar 2013 14:53:08 -0000
Received: (qmail 6142 invoked by uid 22791); 15 Mar 2013 14:53:06 -0000
X-SWARE-Spam-Status: No, hits=-5.7 required=5.0	tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,KHOP_RCVD_TRUST,KHOP_THREADED,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE
X-Spam-Check-By: sourceware.org
Received: from mail-oa0-f50.google.com (HELO mail-oa0-f50.google.com) (209.85.219.50)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 15 Mar 2013 14:52:51 +0000
Received: by mail-oa0-f50.google.com with SMTP id l20so3476172oag.37        for <libc-ports@sourceware.org>; Fri, 15 Mar 2013 07:52:50 -0700 (PDT)
MIME-Version: 1.0
X-Received: by 10.60.14.71 with SMTP id n7mr2911389oec.135.1363359170653; Fri, 15 Mar 2013 07:52:50 -0700 (PDT)
Received: by 10.60.155.205 with HTTP; Fri, 15 Mar 2013 07:52:50 -0700 (PDT)
In-Reply-To: <mvmd2v3o7om.fsf@hawking.suse.de>
References: <mvmd2v3o7om.fsf@hawking.suse.de>
Date: Fri, 15 Mar 2013 14:53:00 -0000
Message-ID: <CAFqB+PzMwhAQSc=nnA4cA6DQpnJsTv0=_s0e5w70pN9s6b8w0w@mail.gmail.com>
Subject: Re: [PATCH] aarch64: use lib64 as default lib and slib directory
From: Marcus Shawcroft <marcus.shawcroft@gmail.com>
To: Andreas Schwab <schwab@suse.de>
Cc: libc-ports@sourceware.org
Content-Type: text/plain; charset=ISO-8859-1
X-IsSubscribed: yes
Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-ports.sourceware.org>
List-Subscribe: <mailto:libc-ports-subscribe@sourceware.org>
List-Post: <mailto:libc-ports@sourceware.org>
List-Help: <mailto:libc-ports-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: libc-ports-owner@sourceware.org
X-SW-Source: 2013-03/txt/msg00140.txt.bz2

Hi,

This patch seems to have the effect of moving the dynamic linker to
/lib64, do we need some ldd-rewrite.sed foo hooked into
ports/sysdeps/unix/sysv/linux/aarch64/configure.in ?

/Marcus

On 13 March 2013 11:33, Andreas Schwab <schwab@suse.de> wrote:
> The default (s)libdir for aarch64 should be /lib64.
>
> Andreas.
>
>         * sysdeps/unix/sysv/linux/aarch64/configure.in: Set
>         libc_cv_slibdir, libdir and libc_cv_localedir.
>         * sysdeps/unix/sysv/linux/aarch64/configure.in: Regenerate.
>
> diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/configure b/ports/sysdeps/unix/sysv/linux/aarch64/configure
> index 5a22126..04b6c81 100644
> --- a/ports/sysdeps/unix/sysv/linux/aarch64/configure
> +++ b/ports/sysdeps/unix/sysv/linux/aarch64/configure
> @@ -1,3 +1,16 @@
>  # This file is generated from configure.in by Autoconf.  DO NOT EDIT!
> + # Local configure fragment for sysdeps/unix/sysv/linux/aarch64.
>
>  arch_minimum_kernel=3.7.0
> +
> +test -n "$libc_cv_slibdir" ||
> +case "$prefix" in
> +  /usr | /usr/)
> +    libc_cv_slibdir="/lib64"
> +    if test "$libdir" = '${exec_prefix}/lib'; then
> +      libdir='${exec_prefix}/lib64';
> +      # Locale data can be shared between 32bit and 64bit libraries
> +      libc_cv_localedir='${exec_prefix}/lib/locale'
> +    fi
> +    ;;
> +esac
> diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/configure.in b/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
> index d1995d4..6596a15 100644
> --- a/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
> +++ b/ports/sysdeps/unix/sysv/linux/aarch64/configure.in
> @@ -2,3 +2,15 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
>  # Local configure fragment for sysdeps/unix/sysv/linux/aarch64.
>
>  arch_minimum_kernel=3.7.0
> +
> +test -n "$libc_cv_slibdir" ||
> +case "$prefix" in
> +  /usr | /usr/)
> +    libc_cv_slibdir="/lib64"
> +    if test "$libdir" = '${exec_prefix}/lib'; then
> +      libdir='${exec_prefix}/lib64';
> +      # Locale data can be shared between 32bit and 64bit libraries
> +      libc_cv_localedir='${exec_prefix}/lib/locale'
> +    fi
> +    ;;
> +esac
> --
> 1.8.1.5
>
> --
> Andreas Schwab, SUSE Labs, schwab@suse.de
> GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
> "And now for something completely different."