From owner-svn-src-all@FreeBSD.ORG  Mon Mar 12 11:04:48 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E96F91065670;
	Mon, 12 Mar 2012 11:04:48 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D8F8F8FC0C;
	Mon, 12 Mar 2012 11:04:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2CB4mYN058834;
	Mon, 12 Mar 2012 11:04:48 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2CB4mN2058832;
	Mon, 12 Mar 2012 11:04:48 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201203121104.q2CB4mN2058832@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 12 Mar 2012 11:04:48 +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: r232857 - 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: Mon, 12 Mar 2012 11:04:49 -0000

Author: dim
Date: Mon Mar 12 11:04:48 2012
New Revision: 232857
URL: http://svn.freebsd.org/changeset/base/232857

Log:
  Fix the following warning/error with clang:
  
  libexec/rtld-elf/rtld.c:1898:22: error: comparison between pointer and integer ('Elf_Addr *' (aka 'unsigned int *') and 'Elf_Addr' (aka 'unsigned int')) [-Werror]
      if (preinit_addr == (Elf_Addr)NULL)
          ~~~~~~~~~~~~ ^  ~~~~~~~~~~~~~~
  libexec/rtld-elf/rtld.c:2039:16: error: comparison between pointer and integer ('Elf_Addr *' (aka 'unsigned int *') and 'Elf_Addr' (aka 'unsigned int')) [-Werror]
          if (init_addr != (Elf_Addr)NULL) {
              ~~~~~~~~~ ^  ~~~~~~~~~~~~~~
  
  Reviewed by:	kib

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

Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c	Mon Mar 12 10:36:03 2012	(r232856)
+++ head/libexec/rtld-elf/rtld.c	Mon Mar 12 11:04:48 2012	(r232857)
@@ -1895,7 +1895,7 @@ preinit_main(void)
     int index;
 
     preinit_addr = (Elf_Addr *)obj_main->preinit_array;
-    if (preinit_addr == (Elf_Addr)NULL)
+    if (preinit_addr == (Elf_Addr *)NULL)
 	return;
 
     for (index = 0; index < obj_main->preinit_array_num; index++) {
@@ -2036,7 +2036,7 @@ objlist_call_init(Objlist *list, RtldLoc
 	    call_initfini_pointer(elm->obj, elm->obj->init);
 	}
 	init_addr = (Elf_Addr *)elm->obj->init_array;
-	if (init_addr != (Elf_Addr)NULL) {
+	if (init_addr != (Elf_Addr *)NULL) {
 	    for (index = 0; index < elm->obj->init_array_num; index++) {
 		if (init_addr[index] != 0 && init_addr[index] != 1) {
 		    dbg("calling init function for %s at %p", elm->obj->path,