diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/librarian/library.c | 8 | ||||
| -rw-r--r-- | src/tools/env.c | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/librarian/library.c b/src/librarian/library.c index 300d17cf..1405159a 100644 --- a/src/librarian/library.c +++ b/src/librarian/library.c @@ -356,15 +356,18 @@ static int loadEmulatedLib(const char* libname, library_t *lib, box64context_t* } printf_dump(LOG_INFO, "Using emulated %s\n", libname); + int env_changed = 0; #ifdef DYNAREC if(libname && BOX64ENV(dynarec_bleeding_edge) && strstr(libname, "libmonobdwgc-2.0.so")) { printf_dump(LOG_INFO, "MonoBleedingEdge detected, disable Dynarec BigBlock and enable Dynarec StrongMem\n"); SET_BOX64ENV(dynarec_bigblock, 0); SET_BOX64ENV(dynarec_strongmem, 1); + env_changed = 1; } if(libname && BOX64ENV(dynarec_tbb) && strstr(libname, "libtbb.so")) { printf_dump(LOG_INFO, "libtbb detected, enable Dynarec StrongMem\n"); SET_BOX64ENV(dynarec_strongmem, 1); + env_changed = 1; } #endif if(libname && BOX64ENV(jvm) && strstr(libname, "libjvm.so")) { @@ -376,11 +379,14 @@ static int loadEmulatedLib(const char* libname, library_t *lib, box64context_t* printf_dump(LOG_INFO, "libjvm detected, hide SSE 4.2\n"); #endif SET_BOX64ENV(sse42, 0); + env_changed = 1; } if(libname && BOX64ENV(libcef) && strstr(libname, "libcef.so")) { - printf_dump(LOG_INFO, "libcef detected, using malloc_hack_2\n"); + printf_dump(LOG_INFO, "libcef detected, using malloc_hack=2\n"); SET_BOX64ENV(malloc_hack, 2); + env_changed = 1; } + if (env_changed) PrintEnvVariables(&box64env, LOG_INFO); return 1; } return 0; diff --git a/src/tools/env.c b/src/tools/env.c index 60e45d0d..3d79fda0 100644 --- a/src/tools/env.c +++ b/src/tools/env.c @@ -626,8 +626,7 @@ void LoadEnvVariables() void PrintEnvVariables(box64env_t* env, int level) { - if (env->is_any_overridden) - printf_log(level, "BOX64ENV: Variables overridden via env and/or RC file:\n"); + if (env->is_any_overridden) printf_log(level, "BOX64ENV: Variables overridden:\n"); #define INTEGER(NAME, name, default, min, max) \ if (env->is_##name##_overridden) \ printf_log_prefix(0, level, "\t%s=%d\n", #NAME, env->name); |