From 9fc69d1b0015d7048ec051e2c0faa8e073ce847e Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sun, 12 Jan 2014 17:04:18 +0100 Subject: [PATCH] runtime_loader: Add __dso_handle. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The symbol is needed for global objects. Usually, GCC also requires this, but for some reason, the linking error only occurs when using Clang. Signed-off-by: Jérôme Duval --- src/system/runtime_loader/arch/arm/arch_relocate.cpp | 2 -- src/system/runtime_loader/runtime_loader.cpp | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/system/runtime_loader/arch/arm/arch_relocate.cpp b/src/system/runtime_loader/arch/arm/arch_relocate.cpp index 2e849b039e..d3dea465ae 100644 --- a/src/system/runtime_loader/arch/arm/arch_relocate.cpp +++ b/src/system/runtime_loader/arch/arm/arch_relocate.cpp @@ -21,8 +21,6 @@ # define TRACE(x) ; #endif -void *__dso_handle; - status_t arch_relocate_image(image_t *rootImage, image_t *image, SymbolLookupCache* cache) diff --git a/src/system/runtime_loader/runtime_loader.cpp b/src/system/runtime_loader/runtime_loader.cpp index e3dc21ff8a..5467b2a36f 100644 --- a/src/system/runtime_loader/runtime_loader.cpp +++ b/src/system/runtime_loader/runtime_loader.cpp @@ -29,6 +29,7 @@ struct user_space_program_args *gProgramArgs; void *__gCommPageAddress; +void *__dso_handle; static const char *