From owner-svn-src-all@FreeBSD.ORG  Sat Jun 26 22:04:52 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BA493106566B;
	Sat, 26 Jun 2010 22:04:52 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A891A8FC17;
	Sat, 26 Jun 2010 22:04:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5QM4qJs083141;
	Sat, 26 Jun 2010 22:04:52 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5QM4qLD083139;
	Sat, 26 Jun 2010 22:04:52 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201006262204.o5QM4qLD083139@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 26 Jun 2010 22:04:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209544 - head/libexec/rtld-elf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Jun 2010 22:04:52 -0000

Author: nwhitehorn
Date: Sat Jun 26 22:04:52 2010
New Revision: 209544
URL: http://svn.freebsd.org/changeset/base/209544

Log:
  Ignore versioned dependencies on shared objects to which we do not link.
  This fixes an error with files like this created by GNU ld under certain
  circumstances.

Modified:
  head/libexec/rtld-elf/rtld.c

Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c	Sat Jun 26 21:44:45 2010	(r209543)
+++ head/libexec/rtld-elf/rtld.c	Sat Jun 26 22:04:52 2010	(r209544)
@@ -3443,9 +3443,13 @@ locate_dependency(const Obj_Entry *obj, 
 	if (object_match_name(needed->obj, name))
 	    return needed->obj;
     }
-    _rtld_error("%s: Unexpected inconsistency: dependency %s not found",
-	obj->path, name);
-    die();
+
+    /*
+     * GNU LD sometimes refers to version dependencies on objects to which 
+     * it does not actually link. Treat this as a non-fatal error, and
+     * ignore this dependency.
+     */
+    return NULL;
 }
 
 static int
@@ -3567,6 +3571,9 @@ rtld_verify_object_versions(Obj_Entry *o
     vn = obj->verneed;
     while (vn != NULL) {
 	depobj = locate_dependency(obj, obj->strtab + vn->vn_file);
+	if (depobj == NULL)
+	    break;
+
 	vna = (const Elf_Vernaux *) ((char *)vn + vn->vn_aux);
 	for (;;) {
 	    if (check_object_provided_version(obj, depobj, vna))