From 697d496093d10e99c76f2004c5e6f3b584f0c587 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Mon, 23 Sep 2019 14:34:27 +0200 Subject: [PATCH] ldso: don't strip leading path from ROM name This patch removes ldso's builtin policy of removing any path elements prepending the ROM module name. Instead, the ROM name is used as is. This clears the way to access different ROM modules that share the same name but are stored at different directories behind an fs_rom (e.g., /bin/bash vs. /usr/local/bin/bash). Issue #3500 --- repos/base/src/lib/ldso/main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repos/base/src/lib/ldso/main.cc b/repos/base/src/lib/ldso/main.cc index 608400b208..9fa5487e0a 100644 --- a/repos/base/src/lib/ldso/main.cc +++ b/repos/base/src/lib/ldso/main.cc @@ -104,7 +104,7 @@ class Linker::Elf_object : public Object, private Fifo::Element bool _init_elf_file(Env &env, Allocator &md_alloc, char const *path) { - _elf_file.construct(env, md_alloc, Linker::file(path), true); + _elf_file.construct(env, md_alloc, path, true); Object::init(Linker::file(path), *_elf_file); return true; }