[libcxx] Set -D_LIBCPP_HAS_NO_THREADS and -D_LIBCPP_HAS_NO_MONOTONIC_CLOCK based on available_features

[danalbert]

How are those features getting set?

[jroelofs]

I had been setting them in the lit.site.cfg, but it will work out better in zorg for them to come in from the command line too...

The updated patch lets you specify --param=additional_features=foo,bar,baz

[danalbert]

lit.cfg

296

Probably f.strip() to be safe. I don't know what lit would do with --param=additional_features=' foo, bar'

[jroelofs]

Looks like they do end up with weird whitespace in that case... So strip them on the way in.

[danalbert]

lit.cfg

361

One nitpick: libcpp-has-no-monotonic-clock to match the other one?

[jroelofs]

re-name the features for consistency

[jroelofs]

r217261

lit.cfg

def configure_use_clang_verify(self):
         self.use_clang_verify = self.get_lit_bool('use_clang_verify')
         if self.use_clang_verify is None:
             # TODO: Default this to True when using clang.
             self.use_clang_verify = False
             self.lit_config.note(
                 "inferred use_clang_verify as: %r" % self.use_clang_verify)
 
     def configure_features(self):
+        additional_features = self.get_lit_conf('additional_features').split(",")
+        for f in additional_features:
+            self.config.available_features.add(f.strip())
+
         # Figure out which of the required locales we support
         locales = {
             'Darwin': {
                 'en_US.UTF-8': 'en_US.UTF-8',
                 'cs_CZ.ISO8859-2': 'cs_CZ.ISO8859-2',
                 'fr_FR.UTF-8': 'fr_FR.UTF-8',
                 'fr_CA.ISO8859-1': 'cs_CZ.ISO8859-1',
                 'ru_RU.UTF-8': 'ru_RU.UTF-8',
def configure_features(self):
             # Drop sub-major version components from the triple, because the
             # current XFAIL handling expects exact matches for feature checks.
             sanitized_triple = re.sub(
                 r"([^-]+)-([^-]+)-([^-.]+).*", r"\1-\2-\3",
                 self.config.target_triple)
             self.config.available_features.add(
                 'with_system_lib=%s' % sanitized_triple)
 
+        if 'libcpp-has-no-threads' in self.config.available_features:
+            self.compile_flags += ['-D_LIBCPP_HAS_NO_THREADS']
+
+        if 'libcpp-has-no-monotonic-clock' in self.config.available_features:
+            self.compile_flags += ['-D_LIBCPP_HAS_NO_MONOTONIC_CLOCK']
+
     def configure_compile_flags(self):
         # Configure extra compiler flags.
         self.compile_flags += ['-I' + self.src_root + '/include',
                                '-I' + self.src_root + '/test/support']
 
     def configure_link_flags(self):
         self.link_flags += ['-L' + self.obj_root + '/lib', '-lc++']
         link_flags_str = self.get_lit_conf('link_flags')

utilities/time/time.clock/time.clock.steady/consistency.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is dual licensed under the MIT and the University of Illinois Open
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This test uses new symbols that were not defined in the libc++ shipped on
 // darwin11 and darwin12:
 // XFAIL: with_system_lib=x86_64-apple-darwin11
 // XFAIL: with_system_lib=x86_64-apple-darwin12
-// UNSUPPORTED: no-monotonic-clock
+// UNSUPPORTED: libcpp-has-no-monotonic-clock
 
 // <chrono>
 
 // steady_clock
 
 // check clock invariants
 
 #include <chrono>

utilities/time/time.clock/time.clock.steady/now.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is dual licensed under the MIT and the University of Illinois Open
 // Source Licenses. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: no-monotonic-clock
+// UNSUPPORTED: libcpp-has-no-monotonic-clock
 
 // <chrono>
 
 // steady_clock
 
 // static time_point now();
 
 #include <chrono>