diff options
| author | jkoshy <jkoshy@FreeBSD.org> | 2006-12-18 05:36:23 +0000 |
|---|---|---|
| committer | jkoshy <jkoshy@FreeBSD.org> | 2006-12-18 05:36:23 +0000 |
| commit | fdbeae7cd48d220f22f51d00a1b3c7c6525973ee (patch) | |
| tree | c12f1f8dd657363e3fd759efe9a7b349a0ed6e08 /lib/libelf | |
| parent | d77d3157df850828b072cae49795fbbb825204d3 (diff) | |
| download | FreeBSD-src-fdbeae7cd48d220f22f51d00a1b3c7c6525973ee.zip FreeBSD-src-fdbeae7cd48d220f22f51d00a1b3c7c6525973ee.tar.gz | |
Use the correct value of __FreeBSD_version.
Diffstat (limited to 'lib/libelf')
| -rw-r--r-- | lib/libelf/libelf_align.c | 16 | ||||
| -rw-r--r-- | lib/libelf/libelf_data.c | 3 |
2 files changed, 9 insertions, 10 deletions
diff --git a/lib/libelf/libelf_align.c b/lib/libelf/libelf_align.c index 4d37255..525c258 100644 --- a/lib/libelf/libelf_align.c +++ b/lib/libelf/libelf_align.c @@ -62,18 +62,18 @@ struct align { static struct align malign[ELF_T_NUM] = { [ELF_T_ADDR] = MALIGN(Addr), [ELF_T_BYTE] = { .a32 = 1, .a64 = 1 }, -#if __FreeBSD_version >= 700009 +#if __FreeBSD_version >= 700025 [ELF_T_CAP] = MALIGN(Cap), #endif [ELF_T_DYN] = MALIGN(Dyn), [ELF_T_EHDR] = MALIGN(Ehdr), [ELF_T_HALF] = MALIGN(Half), -#if __FreeBSD_version >= 700009 +#if __FreeBSD_version >= 700025 [ELF_T_LWORD] = MALIGN(Lword), [ELF_T_MOVE] = MALIGN(Move), #endif [ELF_T_MOVEP] = UNSUPPORTED(), -#if __FreeBSD_version >= 700009 +#if __FreeBSD_version >= 700025 [ELF_T_NOTE] = MALIGN(Nhdr), #endif [ELF_T_OFF] = MALIGN(Off), @@ -84,7 +84,7 @@ static struct align malign[ELF_T_NUM] = { [ELF_T_SWORD] = MALIGN(Sword), [ELF_T_SXWORD] = MALIGN64(Sxword), [ELF_T_SYM] = MALIGN(Sym), -#if __FreeBSD_version >= 700009 +#if __FreeBSD_version >= 700025 [ELF_T_SYMINFO] = MALIGN(Syminfo), #endif #if __FreeBSD_version >= 700009 @@ -110,18 +110,18 @@ _libelf_malign(Elf_Type t, int elfclass) static struct align falign[ELF_T_NUM] = { [ELF_T_ADDR] = FALIGN(4,8), [ELF_T_BYTE] = FALIGN(1,1), -#if __FreeBSD_version >= 700009 +#if __FreeBSD_version >= 700025 [ELF_T_CAP] = FALIGN(4,8), #endif [ELF_T_DYN] = FALIGN(4,8), [ELF_T_EHDR] = FALIGN(4,8), [ELF_T_HALF] = FALIGN(2,2), -#if __FreeBSD_version >= 700009 +#if __FreeBSD_version >= 700025 [ELF_T_LWORD] = FALIGN(8,8), [ELF_T_MOVE] = FALIGN(8,8), #endif [ELF_T_MOVEP] = UNSUPPORTED(), -#if __FreeBSD_version >= 700009 +#if __FreeBSD_version >= 700025 [ELF_T_NOTE] = FALIGN(4,4), #endif [ELF_T_OFF] = FALIGN(4,8), @@ -132,7 +132,7 @@ static struct align falign[ELF_T_NUM] = { [ELF_T_SWORD] = FALIGN(4,4), [ELF_T_SXWORD] = FALIGN(0,8), [ELF_T_SYM] = FALIGN(4,8), -#if __FreeBSD_version >= 700009 +#if __FreeBSD_version >= 700025 [ELF_T_SYMINFO] = FALIGN(2,2), #endif #if __FreeBSD_version >= 700009 diff --git a/lib/libelf/libelf_data.c b/lib/libelf/libelf_data.c index 4bab441..873fac8 100644 --- a/lib/libelf/libelf_data.c +++ b/lib/libelf/libelf_data.c @@ -66,7 +66,7 @@ _libelf_xlate_shtype(uint32_t sht) return (ELF_T_SYM); case SHT_SYMTAB_SHNDX: return (ELF_T_WORD); -#if __FreeBSD_version > 700009 +#if __FreeBSD_version >= 700025 case SHT_GNU_verdef: /* == SHT_SUNW_verdef */ return (ELF_T_VDEF); case SHT_GNU_verneed: /* == SHT_SUNW_verneed */ @@ -82,4 +82,3 @@ _libelf_xlate_shtype(uint32_t sht) return (-1); } } - |
