diff options
| author | Robert Mustacchi <rm@joyent.com> | 2015-03-01 17:22:41 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2015-03-23 23:13:38 +0000 |
| commit | 2c919233a8306711afadcd6ecc876d67c4b4b32b (patch) | |
| tree | 6f6d1cde2057bfcf7518af43e4f2f27ce307951f /usr/src/lib/libctf | |
| parent | 43489f9fd43ea92de4a6795588b0ab45ceb4668e (diff) | |
| download | illumos-joyent-2c919233a8306711afadcd6ecc876d67c4b4b32b.tar.gz | |
OS-3966 Update the new ctfmerge for 5595
Diffstat (limited to 'usr/src/lib/libctf')
| -rw-r--r-- | usr/src/lib/libctf/common/ctf_elfwrite.c | 10 | ||||
| -rw-r--r-- | usr/src/lib/libctf/common/libctf.h | 1 |
2 files changed, 1 insertions, 10 deletions
diff --git a/usr/src/lib/libctf/common/ctf_elfwrite.c b/usr/src/lib/libctf/common/ctf_elfwrite.c index 8c4ba62229..c8a4d22cf7 100644 --- a/usr/src/lib/libctf/common/ctf_elfwrite.c +++ b/usr/src/lib/libctf/common/ctf_elfwrite.c @@ -51,7 +51,6 @@ ctf_write_elf(ctf_file_t *fp, Elf *src, Elf *dst, int flags) int symtab_idx = -1; off_t new_offset = 0; off_t ctfnameoff = 0; - int keep_stabs = (flags & CTF_ELFWRITE_F_KEEP_STABS); int compress = (flags & CTF_ELFWRITE_F_COMPRESS); int *secxlate; int srcidx, dstidx, pad, i; @@ -61,8 +60,7 @@ ctf_write_elf(ctf_file_t *fp, Elf *src, Elf *dst, int flags) void *cdata = NULL; - if ((flags & ~(CTF_ELFWRITE_F_KEEP_STABS | - CTF_ELFWRITE_F_COMPRESS)) != 0) + if ((flags & ~(CTF_ELFWRITE_F_COMPRESS)) != 0) return (ctf_set_errno(fp, EINVAL)); if (gelf_newehdr(dst, gelf_getclass(src)) == NULL) @@ -125,12 +123,6 @@ ctf_write_elf(ctf_file_t *fp, Elf *src, Elf *dst, int flags) if (strcmp(sname, CTF_ELF_SCN_NAME) == 0) { secxlate[srcidx] = -1; - } else if (!keep_stabs && - (strncmp(sname, ".stab", 5) == 0 || - strncmp(sname, ".debug", 6) == 0 || - strncmp(sname, ".rel.debug", 10) == 0 || - strncmp(sname, ".rela.debug", 11) == 0)) { - secxlate[srcidx] = -1; } else { secxlate[srcidx] = dstidx++; curnmoff += strlen(sname) + 1; diff --git a/usr/src/lib/libctf/common/libctf.h b/usr/src/lib/libctf/common/libctf.h index 5e7db9dff9..13c7e07e99 100644 --- a/usr/src/lib/libctf/common/libctf.h +++ b/usr/src/lib/libctf/common/libctf.h @@ -84,7 +84,6 @@ extern int ctf_merge_merge(ctf_merge_t *, ctf_file_t **); extern void ctf_merge_fini(ctf_merge_t *); #define CTF_ELFWRITE_F_COMPRESS 0x1 -#define CTF_ELFWRITE_F_KEEP_STABS 0x2 extern int ctf_elffdwrite(ctf_file_t *, int, int, int); extern int ctf_elfwrite(ctf_file_t *, const char *, const char *, int); |