From owner-svn-src-head@FreeBSD.ORG  Wed Jul 28 11:01:07 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EEA6E106566B;
	Wed, 28 Jul 2010 11:01:07 +0000 (UTC)
	(envelope-from kaiw@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DE0DF8FC1F;
	Wed, 28 Jul 2010 11:01:07 +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 o6SB17Ng096557;
	Wed, 28 Jul 2010 11:01:07 GMT (envelope-from kaiw@svn.freebsd.org)
Received: (from kaiw@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6SB1771096555;
	Wed, 28 Jul 2010 11:01:07 GMT (envelope-from kaiw@svn.freebsd.org)
Message-Id: <201007281101.o6SB1771096555@svn.freebsd.org>
From: Kai Wang <kaiw@FreeBSD.org>
Date: Wed, 28 Jul 2010 11:01:07 +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: r210559 - head/lib/libelf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jul 2010 11:01:08 -0000

Author: kaiw
Date: Wed Jul 28 11:01:07 2010
New Revision: 210559
URL: http://svn.freebsd.org/changeset/base/210559

Log:
  Protect GNUHASH translation functions with #ifdef; unbreak cross
  toolchain build.
  
  Reported by:	jchandra
  MFC after:	1 month

Modified:
  head/lib/libelf/libelf_convert.m4

Modified: head/lib/libelf/libelf_convert.m4
==============================================================================
--- head/lib/libelf/libelf_convert.m4	Wed Jul 28 09:17:42 2010	(r210558)
+++ head/lib/libelf/libelf_convert.m4	Wed Jul 28 11:01:07 2010	(r210559)
@@ -507,6 +507,7 @@ libelf_cvt_BYTE_tox(char *dst, size_t ds
 
 MAKE_TYPE_CONVERTERS(ELF_TYPE_LIST)
 
+#if	__FreeBSD_version >= 800062
 /*
  * Sections of type ELF_T_GNUHASH start with a header containing 4 32-bit
  * words.  Bloom filter data comes next, followed by hash buckets and the
@@ -700,6 +701,7 @@ libelf_cvt64_GNUHASH_tof(char *dst, size
 
 	return (1);
 }
+#endif
 
 /*
  * Elf_Note structures comprise a fixed size header followed by variable
@@ -873,12 +875,14 @@ CONVERTER_NAMES(ELF_TYPE_LIST)
 		.tom64 = libelf_cvt_BYTE_tox
 	},
 
+#if	__FreeBSD_version >= 800062
 	[ELF_T_GNUHASH] = {
 		.tof32 = libelf_cvt32_GNUHASH_tof,
 		.tom32 = libelf_cvt32_GNUHASH_tom,
 		.tof64 = libelf_cvt64_GNUHASH_tof,
 		.tom64 = libelf_cvt64_GNUHASH_tom
 	},
+#endif
 
 	[ELF_T_NOTE] = {
 		.tof32 = libelf_cvt_NOTE_tof,