diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2015-12-21 22:40:29 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2015-12-21 22:40:29 +0000 |
| commit | 66963b3cefec682f8e254e3c4f8c69d546bc7f70 (patch) | |
| tree | 19cc0c8a41cadf09966566a158f7421feae7523b /libexec | |
| parent | dfbf5e4bbf2ff299182e7e529ba8ba8e0ba8d05a (diff) | |
| download | src-66963b3cefec682f8e254e3c4f8c69d546bc7f70.tar.gz src-66963b3cefec682f8e254e3c4f8c69d546bc7f70.zip | |
rtld: Use common NT_FREEBSD_* note types introduced in r291909
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=292575
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index c2e165e01995..0e8b78835308 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1362,22 +1362,22 @@ digest_notes(Obj_Entry *obj, Elf_Addr note_start, Elf_Addr note_end) if (note->n_namesz != sizeof(NOTE_FREEBSD_VENDOR) || note->n_descsz != sizeof(int32_t)) continue; - if (note->n_type != ABI_NOTETYPE && - note->n_type != CRT_NOINIT_NOTETYPE) + if (note->n_type != NT_FREEBSD_ABI_TAG && + note->n_type != NT_FREEBSD_NOINIT_TAG) continue; note_name = (const char *)(note + 1); if (strncmp(NOTE_FREEBSD_VENDOR, note_name, sizeof(NOTE_FREEBSD_VENDOR)) != 0) continue; switch (note->n_type) { - case ABI_NOTETYPE: + case NT_FREEBSD_ABI_TAG: /* FreeBSD osrel note */ p = (uintptr_t)(note + 1); p += roundup2(note->n_namesz, sizeof(Elf32_Addr)); obj->osrel = *(const int32_t *)(p); dbg("note osrel %d", obj->osrel); break; - case CRT_NOINIT_NOTETYPE: + case NT_FREEBSD_NOINIT_TAG: /* FreeBSD 'crt does not call init' note */ obj->crt_no_init = true; dbg("note crt_no_init"); |