[compiler-rt] r313053 - [ubsan-minimal] Fix the x86_64h config check

Vedant Kumar via llvm-commits llvm-commits at lists.llvm.org
Tue Sep 12 10:32:25 PDT 2017


Author: vedantk
Date: Tue Sep 12 10:32:25 2017
New Revision: 313053

URL: http://llvm.org/viewvc/llvm-project?rev=313053&view=rev
Log:
[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

Modified:
    compiler-rt/trunk/test/ubsan_minimal/lit.common.cfg

Modified: compiler-rt/trunk/test/ubsan_minimal/lit.common.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan_minimal/lit.common.cfg?rev=313053&r1=313052&r2=313053&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan_minimal/lit.common.cfg (original)
+++ compiler-rt/trunk/test/ubsan_minimal/lit.common.cfg Tue Sep 12 10:32:25 2017
@@ -34,7 +34,7 @@ if config.host_os not in ['Linux', 'Free
   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)




More information about the llvm-commits mailing list