Author: emaste
Date: Mon Dec 21 22:40:29 2015
New Revision: 292575
URL: https://svnweb.freebsd.org/changeset/base/292575
Log:
rtld: Use common NT_FREEBSD_* note types introduced in r291909
Sponsored by: The FreeBSD Foundation
Modified:
head/libexec/rtld-elf/rtld.c
Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c Mon Dec 21 22:25:35 2015
(r292574)
+++ head/libexec/rtld-elf/rtld.c Mon Dec 21 22:40:29 2015
(r292575)
@@ -1362,22 +1362,22 @@ digest_notes(Obj_Entry *obj, Elf_Addr no
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");
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
