From a89982c40de41581bdef1e2088d22fdb16fd8404 Mon Sep 17 00:00:00 2001 From: Blue Gaston Date: Mon, 25 Jul 2022 20:47:15 -0700 Subject: [PATCH] [Sanitizers][Darwin] Allows '-mtargetos' to used to set minimum deployment target. Currently, m{platform}-version-min is default flag used to set min deployment target within compilter-rt and sanitizers. However, clang uses flags -target and -mtargetos for setting target triple and minimum deployment targets. -mtargetos will be the preferred flag to set min version in the future and the ${platform}-version-min flag will not be used for future platforms. This change allows darwin platforms to use either ${platform}-min-version or -mtargetos without breaking lit test flags that allows for overriding the default min value in lit tests Tests using flags: 'darwin_min_target_with_tls_support', 'min_macos_deployment_target' will no longer fail if they use mtargetos instead of version-min. rdar://81028225 Differential Revision: https://reviews.llvm.org/D130542 --- compiler-rt/test/lit.common.cfg.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py index 62a73dd3..c5a8420 100644 --- a/compiler-rt/test/lit.common.cfg.py +++ b/compiler-rt/test/lit.common.cfg.py @@ -455,7 +455,11 @@ if config.host_os == 'Darwin': for vers in min_macos_deployment_target_substitutions: flag = config.apple_platform_min_deployment_target_flag major, minor = get_macos_aligned_version(vers) - config.substitutions.append( ('%%min_macos_deployment_target=%s.%s' % vers, '{}={}.{}'.format(flag, major, minor)) ) + if 'mtargetos' in flag: + sim = '-simulator' if 'sim' in config.apple_platform else '' + config.substitutions.append( ('%%min_macos_deployment_target=%s.%s' % vers, '{}{}.{}{}'.format(flag, major, minor, sim)) ) + else: + config.substitutions.append( ('%%min_macos_deployment_target=%s.%s' % vers, '{}={}.{}'.format(flag, major, minor)) ) else: for vers in min_macos_deployment_target_substitutions: config.substitutions.append( ('%%min_macos_deployment_target=%s.%s' % vers, '') ) -- 2.7.4