diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2019-01-15 21:27:44 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2019-01-15 21:27:44 +0000 |
| commit | d51e3112be9f4b78c409b81cf2c7aff54daa671e (patch) | |
| tree | 1aaa703a363ab9ffab7aa1276c4925ede4011e88 | |
| parent | a2619910a1002985535aeb737b7868d8eff3cd68 (diff) | |
compiler-rt/test: Clean up Android specific workarounds in lit.common.cfg.
-pie -Wl,--enable-new-dtags are no longer needed because
the driver passes them by default as of r316606.
Prepend -fuse-ld=gold instead of appending it so that the linker can
be overridden using COMPILER_RT_TEST_COMPILER_CFLAGS.
Differential Revision: https://reviews.llvm.org/D56697
| -rw-r--r-- | compiler-rt/test/lit.common.cfg | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compiler-rt/test/lit.common.cfg b/compiler-rt/test/lit.common.cfg index 163e587a374..cd00f32dd9d 100644 --- a/compiler-rt/test/lit.common.cfg +++ b/compiler-rt/test/lit.common.cfg @@ -55,10 +55,11 @@ config.available_features.add(compiler_id) if config.asan_shadow_scale != '': config.target_cflags += " -mllvm -asan-mapping-scale=" + config.asan_shadow_scale -# BFD linker in 64-bit android toolchains fails to find libm.so, which is a -# transitive shared library dependency (via asan runtime). +# BFD linker in 64-bit android toolchains fails to find libc++_shared.so, which +# is a transitive shared library dependency (via asan runtime). if config.android: - config.target_cflags += " -pie -fuse-ld=gold -Wl,--enable-new-dtags" + # Prepend the flag so that it can be overridden. + config.target_cflags = "-fuse-ld=gold " + config.target_cflags config.cxx_mode_flags.append('-stdlib=libstdc++') # Clear some environment variables that might affect Clang. |