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,
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
