diff options
Diffstat (limited to 'usr/src/cmd/sgs/rtld')
| -rw-r--r-- | usr/src/cmd/sgs/rtld/common/debug.c | 8 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/rtld/common/object.c | 9 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/rtld/common/rtld.msg | 4 |
3 files changed, 13 insertions, 8 deletions
diff --git a/usr/src/cmd/sgs/rtld/common/debug.c b/usr/src/cmd/sgs/rtld/common/debug.c index 377a2da34a..6942ef8434 100644 --- a/usr/src/cmd/sgs/rtld/common/debug.c +++ b/usr/src/cmd/sgs/rtld/common/debug.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -145,9 +145,11 @@ dbg_setup(const char *options, Dbg_desc *dbp) dbg_ino = status.st_ino; /* - * Now that the output file is established, generate help - * output if the user specified the debug help token. + * Now that the output file is established, identify the linker + * package, and generate help output if the user specified the + * debug help token. */ + Dbg_version(); if (dbp->d_extra & DBG_E_HELP) Dbg_help(); diff --git a/usr/src/cmd/sgs/rtld/common/object.c b/usr/src/cmd/sgs/rtld/common/object.c index cc2d633424..f46dfaf12f 100644 --- a/usr/src/cmd/sgs/rtld/common/object.c +++ b/usr/src/cmd/sgs/rtld/common/object.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -217,6 +217,7 @@ elf_obj_fini(Lm_list *lml, Rt_map *lmp, int *in_nfavl) Fdesc fd = { 0 }; Grp_hdl *ghp; Rej_desc rej = { 0 }; + elfcap_mask_t cap_value; DBG_CALL(Dbg_util_nl(lml, DBG_NL_STD)); @@ -230,7 +231,8 @@ elf_obj_fini(Lm_list *lml, Rt_map *lmp, int *in_nfavl) * hardware or software capabilities have been established, ensure that * they are appropriate for this platform. */ - if ((ofl->ofl_hwcap_1) && (hwcap_check(ofl->ofl_hwcap_1, &rej) == 0)) { + cap_value = CAPMASK_VALUE(&ofl->ofl_ocapset.c_hw_1); + if (cap_value && (hwcap_check(cap_value, &rej) == 0)) { if ((lml_main.lm_flags & LML_FLG_TRC_LDDSTUB) && lmp && (FLAGS1(lmp) & FL1_RT_LDDSTUB) && (NEXT(lmp) == NULL)) { (void) printf(MSG_INTL(MSG_LDD_GEN_HWCAP_1), @@ -239,7 +241,8 @@ elf_obj_fini(Lm_list *lml, Rt_map *lmp, int *in_nfavl) return (NULL); } - if ((ofl->ofl_sfcap_1) && (sfcap_check(ofl->ofl_sfcap_1, &rej) == 0)) { + cap_value = CAPMASK_VALUE(&ofl->ofl_ocapset.c_sf_1); + if (cap_value && (sfcap_check(cap_value, &rej) == 0)) { if ((lml_main.lm_flags & LML_FLG_TRC_LDDSTUB) && lmp && (FLAGS1(lmp) & FL1_RT_LDDSTUB) && (NEXT(lmp) == NULL)) { (void) printf(MSG_INTL(MSG_LDD_GEN_SFCAP_1), diff --git a/usr/src/cmd/sgs/rtld/common/rtld.msg b/usr/src/cmd/sgs/rtld/common/rtld.msg index 919009d3a3..1b2033c400 100644 --- a/usr/src/cmd/sgs/rtld/common/rtld.msg +++ b/usr/src/cmd/sgs/rtld/common/rtld.msg @@ -20,7 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -125,7 +125,7 @@ # Versioning diagnostics. -@ MSG_VER_NFOUND "%s: version `%s' not found (required by file %s)" +@ MSG_VER_NFOUND "%s: version '%s' not found (required by file %s)" # Diagnostics generated under the control of ldd(1). |