PERFORCE change 142856 for review
John Birrell
jb at FreeBSD.org
Wed Jun 4 03:11:56 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142856
Change 142856 by jb at freebsd3 on 2008/06/04 03:11:32
Removed all the version ifdefs from libelf. I can't see what this buys
us. Sure, ports can use a FreeBSD version to check for functionality
level.
Affected files ...
.. //depot/projects/dtrace6/src/lib/libelf/gelf.h#3 edit
.. //depot/projects/dtrace6/src/lib/libelf/gelf_cap.c#3 edit
.. //depot/projects/dtrace6/src/lib/libelf/gelf_move.c#3 edit
.. //depot/projects/dtrace6/src/lib/libelf/gelf_syminfo.c#3 edit
.. //depot/projects/dtrace6/src/lib/libelf/libelf_align.c#3 edit
.. //depot/projects/dtrace6/src/lib/libelf/libelf_convert.m4#3 edit
.. //depot/projects/dtrace6/src/lib/libelf/libelf_data.c#3 edit
.. //depot/projects/dtrace6/src/lib/libelf/libelf_fsize.m4#3 edit
.. //depot/projects/dtrace6/src/lib/libelf/libelf_msize.m4#3 edit
Differences ...
==== //depot/projects/dtrace6/src/lib/libelf/gelf.h#3 (text+ko) ====
@@ -50,11 +50,9 @@
typedef Elf64_Rel GElf_Rel; /* Relocation entries */
typedef Elf64_Rela GElf_Rela; /* Relocation entries with addend */
-#if __FreeBSD_version >= 700025
typedef Elf64_Cap GElf_Cap; /* SW/HW capabilities */
typedef Elf64_Move GElf_Move; /* Move entries */
typedef Elf64_Syminfo GElf_Syminfo; /* Symbol information */
-#endif
#define GELF_M_INFO ELF64_M_INFO
#define GELF_M_SIZE ELF64_M_SIZE
@@ -100,14 +98,12 @@
Elf_Data *gelf_xlatetof(Elf *_elf, Elf_Data *_dst, const Elf_Data *_src, unsigned int _encode);
Elf_Data *gelf_xlatetom(Elf *_elf, Elf_Data *_dst, const Elf_Data *_src, unsigned int _encode);
-#if __FreeBSD_version >= 700025
GElf_Cap *gelf_getcap(Elf_Data *_data, int _index, GElf_Cap *_cap);
GElf_Move *gelf_getmove(Elf_Data *_src, int _index, GElf_Move *_dst);
GElf_Syminfo *gelf_getsyminfo(Elf_Data *_src, int _index, GElf_Syminfo *_dst);
int gelf_update_cap(Elf_Data *_dst, int _index, GElf_Cap *_src);
int gelf_update_move(Elf_Data *_dst, int _index, GElf_Move *_src);
int gelf_update_syminfo(Elf_Data *_dst, int _index, GElf_Syminfo *_src);
-#endif
__END_DECLS
#endif /* _GELF_H_ */
==== //depot/projects/dtrace6/src/lib/libelf/gelf_cap.c#3 (text+ko) ====
@@ -35,8 +35,6 @@
#include "_libelf.h"
-#if __FreeBSD_version >= 700025
-
GElf_Cap *
gelf_getcap(Elf_Data *d, int ndx, GElf_Cap *dst)
{
@@ -146,5 +144,3 @@
return (1);
}
-
-#endif /* __FreeBSD_version >= 700025 */
==== //depot/projects/dtrace6/src/lib/libelf/gelf_move.c#3 (text+ko) ====
@@ -35,8 +35,6 @@
#include "_libelf.h"
-#if __FreeBSD_version >= 700025
-
GElf_Move *
gelf_getmove(Elf_Data *d, int ndx, GElf_Move *dst)
{
@@ -153,4 +151,3 @@
return (1);
}
-#endif /* __FreeBSD_version >= 700025 */
==== //depot/projects/dtrace6/src/lib/libelf/gelf_syminfo.c#3 (text+ko) ====
@@ -35,8 +35,6 @@
#include "_libelf.h"
-#if __FreeBSD_version >= 700025
-
GElf_Syminfo *
gelf_getsyminfo(Elf_Data *d, int ndx, GElf_Syminfo *dst)
{
@@ -148,4 +146,3 @@
return (1);
}
-#endif /* __FreeBSD_version >= 700025 */
==== //depot/projects/dtrace6/src/lib/libelf/libelf_align.c#3 (text+ko) ====
@@ -62,20 +62,14 @@
static struct align malign[ELF_T_NUM] = {
[ELF_T_ADDR] = MALIGN(Addr),
[ELF_T_BYTE] = { .a32 = 1, .a64 = 1 },
-#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 >= 700025
[ELF_T_LWORD] = MALIGN(Lword),
[ELF_T_MOVE] = MALIGN(Move),
-#endif
[ELF_T_MOVEP] = UNSUPPORTED(),
-#if __FreeBSD_version >= 700025
[ELF_T_NOTE] = MALIGN(Nhdr),
-#endif
[ELF_T_OFF] = MALIGN(Off),
[ELF_T_PHDR] = MALIGN(Phdr),
[ELF_T_REL] = MALIGN(Rel),
@@ -84,13 +78,9 @@
[ELF_T_SWORD] = MALIGN(Sword),
[ELF_T_SXWORD] = MALIGN64(Sxword),
[ELF_T_SYM] = MALIGN(Sym),
-#if __FreeBSD_version >= 700025
[ELF_T_SYMINFO] = MALIGN(Syminfo),
-#endif
-#if __FreeBSD_version >= 700009
[ELF_T_VDEF] = MALIGN(Verdef),
[ELF_T_VNEED] = MALIGN(Verneed),
-#endif
[ELF_T_WORD] = MALIGN(Word),
[ELF_T_XWORD] = MALIGN64(Xword)
};
@@ -110,20 +100,14 @@
static struct align falign[ELF_T_NUM] = {
[ELF_T_ADDR] = FALIGN(4,8),
[ELF_T_BYTE] = FALIGN(1,1),
-#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 >= 700025
[ELF_T_LWORD] = FALIGN(8,8),
[ELF_T_MOVE] = FALIGN(8,8),
-#endif
[ELF_T_MOVEP] = UNSUPPORTED(),
-#if __FreeBSD_version >= 700025
[ELF_T_NOTE] = FALIGN(1,1),
-#endif
[ELF_T_OFF] = FALIGN(4,8),
[ELF_T_PHDR] = FALIGN(4,8),
[ELF_T_REL] = FALIGN(4,8),
@@ -132,13 +116,9 @@
[ELF_T_SWORD] = FALIGN(4,4),
[ELF_T_SXWORD] = FALIGN(0,8),
[ELF_T_SYM] = FALIGN(4,8),
-#if __FreeBSD_version >= 700025
[ELF_T_SYMINFO] = FALIGN(2,2),
-#endif
-#if __FreeBSD_version >= 700009
[ELF_T_VDEF] = FALIGN(4,4),
[ELF_T_VNEED] = FALIGN(4,4),
-#endif
[ELF_T_WORD] = FALIGN(4,4),
[ELF_T_XWORD] = FALIGN(0,8)
};
==== //depot/projects/dtrace6/src/lib/libelf/libelf_convert.m4#3 (text+ko) ====
@@ -447,7 +447,7 @@
*/
define(`MAKE_TYPE_CONVERTER',
- `#if __FreeBSD_version >= $3 /* $1 */
+ `
ifdef(`BASE'_$1,
`ifdef(`IGNORE_'$1,`',
`MAKEPRIM_TO_F($1,$2,`',64)
@@ -461,7 +461,6 @@
MAKE_TO_F($1,$2,64)dnl
MAKE_TO_M($1,$2,32)dnl
MAKE_TO_M($1,$2,64)')')
-#endif /* $1 */
')
define(`MAKE_TYPE_CONVERTERS',
@@ -612,11 +611,10 @@
define(`CONVERTER_NAME',
`ifdef(`IGNORE_'$1,`',
- `#if __FreeBSD_version >= $3
+ `
[ELF_T_$1] = {
CONV($1,32,tof), CONV($1,32,tom),
CONV($1,64,tof), CONV($1,64,tom) },
-#endif
')')
define(`CONVERTER_NAMES',
==== //depot/projects/dtrace6/src/lib/libelf/libelf_data.c#3 (text+ko) ====
@@ -66,7 +66,6 @@
return (ELF_T_SYM);
case SHT_SYMTAB_SHNDX:
return (ELF_T_WORD);
-#if __FreeBSD_version >= 700025
case SHT_GNU_verdef: /* == SHT_SUNW_verdef */
return (ELF_T_VDEF);
case SHT_GNU_verneed: /* == SHT_SUNW_verneed */
@@ -77,7 +76,6 @@
return (ELF_T_MOVE);
case SHT_SUNW_syminfo:
return (ELF_T_SYMINFO);
-#endif
case SHT_AMD64_UNWIND: /* == SHT_IA_64_UNWIND */
return (ELF_T_BYTE);
default:
==== //depot/projects/dtrace6/src/lib/libelf/libelf_fsize.m4#3 (text+ko) ====
@@ -115,9 +115,9 @@
DEFINE_ELF_FSIZE(`IDENT',`') # `IDENT' is a pseudo type
define(`FSIZE',
- `#if __FreeBSD_version >= $3
+ `
[ELF_T_$1] = { .fsz32 = $1_SIZE32, .fsz64 = $1_SIZE64 },
-#endif')
+')
define(`FSIZES',
`ifelse($#,1,`',
`FSIZE($1)
==== //depot/projects/dtrace6/src/lib/libelf/libelf_msize.m4#3 (text+ko) ====
@@ -74,9 +74,9 @@
DEFINE_ELF_MSIZES(ELF_TYPE_LIST)
define(`MSIZE',
- `#if __FreeBSD_version >= $3
+ `
[ELF_T_$1] = { .msz32 = $1_SIZE32, .msz64 = $1_SIZE64 },
-#endif')
+')
define(`MSIZES',
`ifelse($#,1,`',
`MSIZE($1)
More information about the p4-projects
mailing list