From owner-svn-src-stable@FreeBSD.ORG  Tue Mar  5 16:04:07 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A9E4B993;
 Tue,  5 Mar 2013 16:04:07 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 917F6AA8;
 Tue,  5 Mar 2013 16:04:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r25G47QJ035411;
 Tue, 5 Mar 2013 16:04:07 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r25G47Ad035410;
 Tue, 5 Mar 2013 16:04:07 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201303051604.r25G47Ad035410@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 5 Mar 2013 16:04:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r247846 - stable/9/libexec/rtld-elf
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Mar 2013 16:04:07 -0000

Author: tijl
Date: Tue Mar  5 16:04:07 2013
New Revision: 247846
URL: http://svnweb.freebsd.org/changeset/base/247846

Log:
  MFC r247396:
  
  Map libraries linked with -Ttext-segment=base_addr at base_addr.
  Normal libraries have base address 0 and are unaffected by this change.
  
  PR:		176216
  Submitted by:	Damjan Jovanovic <damjan.jov@gmail.com>
  Reviewed by:	kib

Modified:
  stable/9/libexec/rtld-elf/map_object.c
Directory Properties:
  stable/9/libexec/rtld-elf/   (props changed)

Modified: stable/9/libexec/rtld-elf/map_object.c
==============================================================================
--- stable/9/libexec/rtld-elf/map_object.c	Tue Mar  5 15:35:57 2013	(r247845)
+++ stable/9/libexec/rtld-elf/map_object.c	Tue Mar  5 16:04:07 2013	(r247846)
@@ -175,7 +175,7 @@ map_object(int fd, const char *path, con
     base_vaddr = trunc_page(segs[0]->p_vaddr);
     base_vlimit = round_page(segs[nsegs]->p_vaddr + segs[nsegs]->p_memsz);
     mapsize = base_vlimit - base_vaddr;
-    base_addr = hdr->e_type == ET_EXEC ? (caddr_t) base_vaddr : NULL;
+    base_addr = (caddr_t) base_vaddr;
 
     mapbase = mmap(base_addr, mapsize, PROT_NONE, MAP_ANON | MAP_PRIVATE |
       MAP_NOCORE, -1, 0);