diff options
Diffstat (limited to 'usr/src/cmd/sgs/libld/common/machrel.intel.c')
| -rw-r--r-- | usr/src/cmd/sgs/libld/common/machrel.intel.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/cmd/sgs/libld/common/machrel.intel.c b/usr/src/cmd/sgs/libld/common/machrel.intel.c index b0ec82748e..6a1560ec45 100644 --- a/usr/src/cmd/sgs/libld/common/machrel.intel.c +++ b/usr/src/cmd/sgs/libld/common/machrel.intel.c @@ -957,7 +957,7 @@ ld_do_activerelocs(Ofl_desc *ofl) arsp->rel_osdesc->os_outdata->d_buf; DBG_CALL(Dbg_reloc_doact(ofl->ofl_lml, - ELF_DBG_LD, M_MACH, SHT_REL, + ELF_DBG_LD_ACT, M_MACH, SHT_REL, arsp->rel_rtype, R1addr, value, arsp->rel_sname, arsp->rel_osdesc)); @@ -1065,7 +1065,7 @@ ld_do_activerelocs(Ofl_desc *ofl) (uintptr_t)_elf_getxoff(arsp->rel_isdesc-> is_indata)); - DBG_CALL(Dbg_reloc_doact(ofl->ofl_lml, ELF_DBG_LD, + DBG_CALL(Dbg_reloc_doact(ofl->ofl_lml, ELF_DBG_LD_ACT, M_MACH, SHT_REL, arsp->rel_rtype, EC_NATPTR(addr), value, arsp->rel_sname, arsp->rel_osdesc)); addr += (uintptr_t)arsp->rel_osdesc->os_outdata->d_buf; @@ -1151,8 +1151,7 @@ ld_add_outrel(Word flags, Rel_desc *rsp, Ofl_desc *ofl) * symbol in a static executable, it's best to disable them here * instead of through out the relocation code. */ - if ((ofl->ofl_flags & (FLG_OF_STATIC | FLG_OF_EXEC)) == - (FLG_OF_STATIC | FLG_OF_EXEC)) + if (OFL_IS_STATIC_EXEC(ofl)) return (1); /* @@ -1503,7 +1502,7 @@ ld_fillin_gotplt(Ofl_desc *ofl) Sym_desc *sdp; if ((sdp = ld_sym_find(MSG_ORIG(MSG_SYM_DYNAMIC_U), - SYM_NOHASH, 0, ofl)) != NULL) { + SYM_NOHASH, NULL, ofl)) != NULL) { uchar_t *genptr; genptr = ((uchar_t *)ofl->ofl_osgot->os_outdata->d_buf + |