Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the SVR4_LIBDIR madness.

This commit is contained in:
mycroft 2002-09-24 12:52:20 +00:00
parent 3c16ffb1dd
commit 7f44855294
2 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libexec/ld.elf_so/rtld.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtld.h,v 1.55 2002/09/24 09:45:59 junyoung Exp $ */
/* $NetBSD: rtld.h,v 1.56 2002/09/24 12:52:20 mycroft Exp $ */
/*
* Copyright 1996 John D. Polstra.
@ -50,13 +50,6 @@
#endif
#define _PATH_LD_HINTS "/etc/ld.so.conf"
#if 0
#define SVR4_LIBDIR "/usr/lib"
#endif
#define LIBDIRLEN (sizeof LIBDIR - 1)
#define SVR4_LIBDIRLEN (sizeof SVR4_LIBDIR - 1)
extern int _rtld_pagesz;
#define round_down(x) ((x) & ~(_rtld_pagesz - 1))

19
libexec/ld.elf_so/search.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: search.c,v 1.12 2002/09/24 00:02:46 mycroft Exp $ */
/* $NetBSD: search.c,v 1.13 2002/09/24 12:52:20 mycroft Exp $ */
/*
* Copyright 1996 Matt Thomas <matt@3am-software.com>
@ -103,25 +103,10 @@ _rtld_load_library(name, refobj, mode)
if (strchr(name, '/') != NULL) { /* Hard coded pathname */
if (name[0] != '/' && !_rtld_trust) {
_rtld_error(
"Absolute pathname required for shared object \"%s\"",
"absolute pathname required for shared object \"%s\"",
name);
return NULL;
}
#ifdef SVR4_LIBDIR
if (strncmp(name, SVR4_LIBDIR, SVR4_LIBDIRLEN) == 0
&& name[SVR4_LIBDIRLEN] == '/') { /* In "/usr/lib" */
/*
* Map hard-coded "/usr/lib" onto our ELF library
* directory.
*/
pathname = xmalloc(strlen(name) + LIBDIRLEN -
SVR4_LIBDIRLEN + 1);
(void)strcpy(pathname, LIBDIR);
(void)strcpy(pathname + LIBDIRLEN, name +
SVR4_LIBDIRLEN);
goto found;
}
#endif /* SVR4_LIBDIR */
pathname = xstrdup(name);
goto found;
}