From 41bc155d1f358094537f7cb595dab1183fdd533e Mon Sep 17 00:00:00 2001 From: Kai Wang Date: Wed, 28 Jul 2010 11:01:07 +0000 Subject: [PATCH] Protect GNUHASH translation functions with #ifdef; unbreak cross toolchain build. Reported by: jchandra MFC after: 1 month --- lib/libelf/libelf_convert.m4 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libelf/libelf_convert.m4 b/lib/libelf/libelf_convert.m4 index 6129bc8b3b57..15bb6d1e9d7d 100644 --- a/lib/libelf/libelf_convert.m4 +++ b/lib/libelf/libelf_convert.m4 @@ -507,6 +507,7 @@ libelf_cvt_BYTE_tox(char *dst, size_t dsz, char *src, size_t count, 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_t dsz, char *src, size_t srcsz, 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,