d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Protect GNUHASH translation functions with #ifdef; unbreak cross

Browse Source 
toolchain build.

Reported by:	jchandra
MFC after:	1 month
This commit is contained in:
kaiw 2010-07-28 11:01:07 +00:00
parent 3287ae0230
commit 305e37b5f4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libelf/libelf_convert.m4
View File

@ -507,6 +507,7 @@ libelf_cvt_BYTE_tox(char *dst, size_t dsz, char *src, size_t count,
MAKE_TYPE_CONVERTERS(ELF_TYPE_LIST) MAKE_TYPE_CONVERTERS(ELF_TYPE_LIST)
#if __FreeBSD_version >= 800062
/* /*
* Sections of type ELF_T_GNUHASH start with a header containing 4 32-bit * 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 * 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); return (1);
} }
#endif
/* /*
* Elf_Note structures comprise a fixed size header followed by variable * 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 .tom64 = libelf_cvt_BYTE_tox
}, },
#if __FreeBSD_version >= 800062
[ELF_T_GNUHASH] = { [ELF_T_GNUHASH] = {
.tof32 = libelf_cvt32_GNUHASH_tof, .tof32 = libelf_cvt32_GNUHASH_tof,
.tom32 = libelf_cvt32_GNUHASH_tom, .tom32 = libelf_cvt32_GNUHASH_tom,
.tof64 = libelf_cvt64_GNUHASH_tof, .tof64 = libelf_cvt64_GNUHASH_tof,
.tom64 = libelf_cvt64_GNUHASH_tom .tom64 = libelf_cvt64_GNUHASH_tom
}, },
#endif
[ELF_T_NOTE] = { [ELF_T_NOTE] = {
.tof32 = libelf_cvt_NOTE_tof, .tof32 = libelf_cvt_NOTE_tof,