Skip to content

Commit

Permalink
12944 remove long obsolete libsys
Browse files Browse the repository at this point in the history
Reviewed by: Robert Mustacchi <rm+illumos@fingolfin.org>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
  • Loading branch information
richlowe committed Aug 11, 2020
1 parent f7eeebb commit 0904e7e
Show file tree
Hide file tree
Showing 19 changed files with 2 additions and 1,399 deletions.
5 changes: 0 additions & 5 deletions exception_lists/interface_check
Expand Up @@ -99,8 +99,3 @@ NONSTD_VERNAME ^usr/MACH(lib)/libtecla\.so\.1$

# These libc variants have an SONAME of libc\.so\.1$
NONSTD_VERNAME ^usr/MACH(lib)/libc/libc_hwcap[1-3]+\.so\.1$

# The ABI requires the SONAME for libsys.so.1 to be /usr/lib/ld.so.1
# That means that the base version will also be /usr/lib/ld.so.1, which
# is non-standard.
NONSTD_VERNAME ^usr/lib/libsys\.so\.1$
31 changes: 2 additions & 29 deletions usr/src/cmd/sgs/rtld/common/elf.c
Expand Up @@ -126,40 +126,13 @@ elf_get_sec_dirs()
}

/*
* Redefine NEEDED name if necessary.
* For a.out we have actual work to do here, on ELF we just perform path
* expansion.
*/
static int
elf_fix_name(const char *name, Rt_map *clmp, Alist **alpp, Aliste alni,
uint_t orig)
{
/*
* For ABI compliance, if we are asked for ld.so.1, then really give
* them libsys.so.1 (the SONAME of libsys.so.1 is ld.so.1).
*/
if (((*name == '/') &&
/* BEGIN CSTYLED */
#if defined(_ELF64)
(strcmp(name, MSG_ORIG(MSG_PTH_RTLD_64)) == 0)) ||
#else
(strcmp(name, MSG_ORIG(MSG_PTH_RTLD)) == 0)) ||
#endif
(strcmp(name, MSG_ORIG(MSG_FIL_RTLD)) == 0)) {
/* END CSTYLED */
Pdesc *pdp;

DBG_CALL(Dbg_file_fixname(LIST(clmp), name,
MSG_ORIG(MSG_PTH_LIBSYS)));
if ((pdp = alist_append(alpp, NULL, sizeof (Pdesc),
alni)) == NULL)
return (0);

pdp->pd_pname = (char *)MSG_ORIG(MSG_PTH_LIBSYS);
pdp->pd_plen = MSG_PTH_LIBSYS_SIZE;
pdp->pd_flags = PD_FLG_PNSLASH;

return (1);
}

return (expand_paths(clmp, name, alpp, alni, orig, 0));
}

Expand Down
1 change: 0 additions & 1 deletion usr/src/cmd/sgs/rtld/common/rtld.msg
Expand Up @@ -346,7 +346,6 @@

@ MSG_PTH_LDPROF "/usr/lib/link_audit/ldprof.so.1"
@ MSG_PTH_LDPROFSE "/usr/lib/secure/ldprof.so.1"
@ MSG_PTH_LIBSYS "/usr/lib/libsys.so.1"
@ MSG_PTH_RTLD "/usr/lib/ld.so.1"
@ MSG_PTH_LIB "/lib"
@ MSG_PTH_USRLIB "/usr/lib"
Expand Down
1 change: 0 additions & 1 deletion usr/src/lib/Makefile
Expand Up @@ -221,7 +221,6 @@ SUBDIRS += \
libstmfproxy \
libsum \
libsun_ima \
libsys \
libsysevent \
libtecla \
libtermcap \
Expand Down
43 changes: 0 additions & 43 deletions usr/src/lib/libsys/Makefile

This file was deleted.

36 changes: 0 additions & 36 deletions usr/src/lib/libsys/Makefile.com

This file was deleted.

39 changes: 0 additions & 39 deletions usr/src/lib/libsys/Makefile.targ

This file was deleted.

53 changes: 0 additions & 53 deletions usr/src/lib/libsys/common/libsys.sh

This file was deleted.

0 comments on commit 0904e7e

Please sign in to comment.