Permalink
Browse files

Remove two changes to rtld, we wont need them for PBIs on 10

  • Loading branch information...
1 parent 4b95e2d commit 4b708d35f543d086c3d23e65430a818dfcd79856 @kmoore134 kmoore134 committed Sep 30, 2013
Showing with 2 additions and 15 deletions.
  1. +0 −1 include/elf-hints.h
  2. +2 −12 libexec/rtld-elf/rtld.c
  3. +0 −2 libexec/rtld-elf/rtld.h
View
@@ -46,6 +46,5 @@ struct elfhints_hdr {
#define ELFHINTS_MAGIC 0x746e6845
#define _PATH_ELF_HINTS "/var/run/ld-elf.so.hints"
-#define _PATH_ELF_HINTS_LOCAL "/usr/local/var/run/ld-elf.so.hints"
#endif /* !_ELF_HINTS_H_ */
View
@@ -424,18 +424,8 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp)
ld_tracing = getenv(LD_ "TRACE_LOADED_OBJECTS");
ld_utrace = getenv(LD_ "UTRACE");
- if ((ld_elf_hints_path == NULL) || strlen(ld_elf_hints_path) == 0) {
- /*
- Allow us to first look for a /usr/local based hints file
-
- Used by PBIs to virtualize the /usr/local namespace without
- needing a messy replacement of the files in /var/run
- */
- if ( access(_PATH_ELF_HINTS_LOCAL, R_OK) == 0 )
- ld_elf_hints_path = _PATH_ELF_HINTS_LOCAL;
- else
- ld_elf_hints_path = _PATH_ELF_HINTS;
- }
+ if ((ld_elf_hints_path == NULL) || strlen(ld_elf_hints_path) == 0)
+ ld_elf_hints_path = _PATH_ELF_HINTS;
if (ld_debug != NULL && *ld_debug != '\0')
debug = 1;
View
@@ -45,8 +45,6 @@
#undef STANDARD_LIBRARY_PATH
#undef _PATH_ELF_HINTS
#define _PATH_ELF_HINTS "/var/run/ld-elf32.so.hints"
-#undef _PATH_ELF_HINTS_LOCAL
-#define _PATH_ELF_HINTS_LOCAL "/usr/local/var/run/ld-elf32.so.hints"
/* For running 32 bit binaries */
#define STANDARD_LIBRARY_PATH "/lib32:/usr/lib32"
#define LD_ "LD_32_"

0 comments on commit 4b708d3

Please sign in to comment.