From owner-svn-src-head@freebsd.org  Wed Jan  6 16:10:57 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D80A3A6238D;
 Wed,  6 Jan 2016 16:10:57 +0000 (UTC)
 (envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 568901C06;
 Wed,  6 Jan 2016 16:10:57 +0000 (UTC)
 (envelope-from kostikbel@gmail.com)
Received: from tom.home (kostik@localhost [127.0.0.1])
 by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id u06GAkiV018633
 (version=TLSv1 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO);
 Wed, 6 Jan 2016 18:10:47 +0200 (EET)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua u06GAkiV018633
Received: (from kostik@localhost)
 by tom.home (8.15.2/8.15.2/Submit) id u06GAkhf018632;
 Wed, 6 Jan 2016 18:10:46 +0200 (EET)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Wed, 6 Jan 2016 18:10:46 +0200
From: Konstantin Belousov <kostikbel@gmail.com>
To: Warner Losh <imp@FreeBSD.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: Re: svn commit: r293226 - head/libexec/rtld-elf
Message-ID: <20160106161046.GP3625@kib.kiev.ua>
References: <201601052120.u05LKkvv074874@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201601052120.u05LKkvv074874@repo.freebsd.org>
User-Agent: Mutt/1.5.24 (2015-08-30)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
 autolearn_force=no version=3.4.1
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Jan 2016 16:10:57 -0000

On Tue, Jan 05, 2016 at 09:20:46PM +0000, Warner Losh wrote:
> Author: imp
> Date: Tue Jan  5 21:20:46 2016
> New Revision: 293226
> URL: https://svnweb.freebsd.org/changeset/base/293226
> 
> Log:
>   Disable abi variant hook until strangeness with packages can be sorted
>   out.
> 
> Modified:
>   head/libexec/rtld-elf/rtld.c
> 
> Modified: head/libexec/rtld-elf/rtld.c
> ==============================================================================
> --- head/libexec/rtld-elf/rtld.c	Tue Jan  5 21:12:49 2016	(r293225)
> +++ head/libexec/rtld-elf/rtld.c	Tue Jan  5 21:20:46 2016	(r293226)
> @@ -435,7 +435,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_
>  
>      trust = !issetugid();
>  
> -    md_abi_variant_hook(aux_info);
> +/*  md_abi_variant_hook(aux_info); */
>  
>      ld_bind_now = getenv(_LD("BIND_NOW"));
>      /* 
The ARM hook resets the default paths to the libsoft variants.  It cannot
work while /lib, /usr/lib and /usr/local/lib are populated with soft-fp
libraries.  I thought that you are going to switch the default target_arch
to armv6hf immediately after the commit to rtld.

And then, looking into the issue, IMO the way forward is to leave softfp
libraries where they are, but install v6hf somewhere in /lib/armv6hf etc.