summaryrefslogtreecommitdiffstats
path: root/compiler-rt/test/ubsan_minimal
diff options
context:
space:
mode:
authorVedant Kumar <vsk@apple.com>2017-09-12 17:32:25 +0000
committerVedant Kumar <vsk@apple.com>2017-09-12 17:32:25 +0000
commit57e8a2e5040a150b0d377bd2d1e9724b0df208c4 (patch)
tree25e79c5f96198df7cecee15a63a354108792e724 /compiler-rt/test/ubsan_minimal
parent18ff5c1374bfbb4193613a9c356f6e3aad7ec175 (diff)
downloadbcm5719-llvm-57e8a2e5040a150b0d377bd2d1e9724b0df208c4.tar.gz
bcm5719-llvm-57e8a2e5040a150b0d377bd2d1e9724b0df208c4.zip
[ubsan-minimal] Fix the x86_64h config check
Checking if config.target_arch is x86_64h doesn't work (the 'h' suffix is dropped here, and I didn't account for that). Instead, check to see if '-arch x86_64h' is in the cflags. Tested on a pre-Haswell bot. rdar://problem/34378605 llvm-svn: 313053
Diffstat (limited to 'compiler-rt/test/ubsan_minimal')
-rw-r--r--compiler-rt/test/ubsan_minimal/lit.common.cfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/test/ubsan_minimal/lit.common.cfg b/compiler-rt/test/ubsan_minimal/lit.common.cfg
index ab0eb9720a9..e8b42bb823c 100644
--- a/compiler-rt/test/ubsan_minimal/lit.common.cfg
+++ b/compiler-rt/test/ubsan_minimal/lit.common.cfg
@@ -34,7 +34,7 @@ if config.host_os not in ['Linux', 'FreeBSD', 'NetBSD', 'Darwin']: # TODO: Windo
config.unsupported = True
# Don't target x86_64h if the test machine can't execute x86_64h binaries.
-if config.target_arch == 'x86_64h' and 'x86_64h' not in config.available_features:
+if '-arch x86_64h' in target_cflags and 'x86_64h' not in config.available_features:
config.unsupported = True
config.available_features.add('arch=' + config.target_arch)
OpenPOWER on IntegriCloud