diff options
| author | kaiw <kaiw@FreeBSD.org> | 2014-01-25 11:27:09 +0000 |
|---|---|---|
| committer | kaiw <kaiw@FreeBSD.org> | 2014-01-25 11:27:09 +0000 |
| commit | 82f9b341c7eb836ad4e40f08931a711a06cb019e (patch) | |
| tree | 0dfd0aae86c0a25d547c30efbfff95ea5b9445af /cddl | |
| parent | aae1bb2a7decfd4c2ae210975f7f7f28c76529c6 (diff) | |
| download | FreeBSD-src-82f9b341c7eb836ad4e40f08931a711a06cb019e.zip FreeBSD-src-82f9b341c7eb836ad4e40f08931a711a06cb019e.tar.gz | |
Simplify DWARF version check.
Submitted by: emaste
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c b/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c index f929cde..bff4c54 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c @@ -96,11 +96,6 @@ #include "list.h" #include "traverse.h" -/* The versions of DWARF which we support. */ -#define DWARF_VERSION 2 -#define DWARF_VERSION3 3 -#define DWARF_VERSION4 4 - /* * We need to define a couple of our own intrinsics, to smooth out some of the * differences between the GCC and DevPro DWARF emitters. See the referenced @@ -1983,10 +1978,9 @@ dw_read(tdata_t *td, Elf *elf, char *filename __unused) terminate("file contains too many types\n"); debug(1, "DWARF version: %d\n", vers); - if (vers != DWARF_VERSION && vers != DWARF_VERSION3 && - vers != DWARF_VERSION4) { + if (vers < 2 || vers > 4) { terminate("file contains incompatible version %d DWARF code " - "(version 2, 3, or 4 required)\n", vers); + "(version 2, 3 or 4 required)\n", vers); } if (die_string(&dw, cu, DW_AT_producer, &prod, 0)) { |
