[PATCH] D65772: Add support for FreeBSD's LD_32_LIBRARY_PATH
Dimitry Andric via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Aug 5 13:21:55 PDT 2019
dim created this revision.
dim added reviewers: emaste, kcc, rnk, arichardson.
Herald added subscribers: Sanitizers, delcypher, fedor.sergeev, krytarowski, kubamracek.
Herald added projects: LLVM, Sanitizers.
Because the dynamic linker for 32-bit executables on 64-bit FreeBSD uses
the environment variable `LD_32_LIBRARY_PATH` instead of
`LD_LIBRARY_PATH` to find needed dynamic libraries, running the 32-bit
parts of the dynamic ASan tests will fail with errors similar to:
ld-elf32.so.1: Shared object "libclang_rt.asan-i386.so" not found, required by "Asan-i386-inline-Dynamic-Test"
This adds support for setting up `LD_32_LIBRARY_PATH` for the unit and
regression tests. It will likely also require a minor change to the
`TestingConfig` class in `llvm/utils/lit/lit`.
Repository:
rCRT Compiler Runtime
https://reviews.llvm.org/D65772
Files:
test/asan/Unit/lit.site.cfg.py.in
test/asan/lit.cfg.py
test/xray/Unit/lit.site.cfg.py.in
Index: test/xray/Unit/lit.site.cfg.py.in
===================================================================
--- test/xray/Unit/lit.site.cfg.py.in
+++ test/xray/Unit/lit.site.cfg.py.in
@@ -1,6 +1,7 @@
@LIT_SITE_CFG_IN_HEADER@
import os
+import platform
# Load common config for all compiler-rt unit tests.
lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
@@ -22,3 +23,10 @@
config.environment['LD_LIBRARY_PATH'] = libdirs
else:
config.environment['LD_LIBRARY_PATH'] = config.llvm_lib_dir
+
+if platform.system() == 'FreeBSD':
+ if 'LD_32_LIBRARY_PATH' in os.environ:
+ libdirs = os.path.pathsep.join((config.llvm_lib_dir, os.environ['LD_32_LIBRARY_PATH']))
+ config.environment['LD_32_LIBRARY_PATH'] = libdirs
+ else:
+ config.environment['LD_32_LIBRARY_PATH'] = config.llvm_lib_dir
Index: test/asan/lit.cfg.py
===================================================================
--- test/asan/lit.cfg.py
+++ test/asan/lit.cfg.py
@@ -36,6 +36,12 @@
(new_path, config.environment.get(dynamic_library_lookup_var, '')))
config.environment[dynamic_library_lookup_var] = new_ld_library_path
+ if platform.system() == 'FreeBSD':
+ dynamic_library_lookup_var = 'LD_32_LIBRARY_PATH'
+ new_ld_32_library_path = os.path.pathsep.join(
+ (new_path, config.environment.get(dynamic_library_lookup_var, '')))
+ config.environment[dynamic_library_lookup_var] = new_ld_32_library_path
+
# Setup config name.
config.name = 'AddressSanitizer' + config.name_suffix
@@ -111,7 +117,7 @@
config.substitutions.append( ("%clang_asan ", build_invocation(clang_asan_cflags)) )
config.substitutions.append( ("%clangxx_asan ", build_invocation(clang_asan_cxxflags)) )
if config.asan_dynamic:
- if config.host_os in ['Linux', 'NetBSD', 'SunOS']:
+ if config.host_os in ['Linux', 'FreeBSD', 'NetBSD', 'SunOS']:
shared_libasan_path = os.path.join(config.compiler_rt_libdir, "libclang_rt.asan{}.so".format(config.target_suffix))
elif config.host_os == 'Darwin':
shared_libasan_path = os.path.join(config.compiler_rt_libdir, 'libclang_rt.asan_{}_dynamic.dylib'.format(config.apple_platform))
Index: test/asan/Unit/lit.site.cfg.py.in
===================================================================
--- test/asan/Unit/lit.site.cfg.py.in
+++ test/asan/Unit/lit.site.cfg.py.in
@@ -1,6 +1,7 @@
@LIT_SITE_CFG_IN_HEADER@
import os
+import platform
# Load common config for all compiler-rt unit tests.
lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
@@ -9,6 +10,11 @@
new_ld_library_path = os.path.pathsep.join(
(new_path, config.environment.get('LD_LIBRARY_PATH', '')))
config.environment['LD_LIBRARY_PATH'] = new_ld_library_path
+
+ if platform.system() == 'FreeBSD':
+ new_ld_32_library_path = os.path.pathsep.join(
+ (new_path, config.environment.get('LD_32_LIBRARY_PATH', '')))
+ config.environment['LD_32_LIBRARY_PATH'] = new_ld_32_library_path
# Setup config name.
config.name = 'AddressSanitizer-Unit'
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D65772.213447.patch
Type: text/x-patch
Size: 3074 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190805/ce1169cf/attachment.bin>
More information about the llvm-commits
mailing list