Index: llvm/trunk/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
===================================================================
--- llvm/trunk/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
+++ llvm/trunk/test/ExecutionEngine/MCJIT/eh-lg-pic.ll
@@ -1,3 +1,4 @@
+; REQUIRES: cxx-shared-library
 ; RUN: %lli -relocation-model=pic -code-model=large %s
 ; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm
 declare i8* @__cxa_allocate_exception(i64)
Index: llvm/trunk/test/ExecutionEngine/MCJIT/eh.ll
===================================================================
--- llvm/trunk/test/ExecutionEngine/MCJIT/eh.ll
+++ llvm/trunk/test/ExecutionEngine/MCJIT/eh.ll
@@ -1,3 +1,4 @@
+; REQUIRES: cxx-shared-library
 ; RUN: %lli %s
 ; XFAIL: arm, cygwin, win32, mingw
 declare i8* @__cxa_allocate_exception(i64)
Index: llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
===================================================================
--- llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
+++ llvm/trunk/test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
@@ -1,3 +1,4 @@
+; REQUIRES: cxx-shared-library
 ; RUN: %lli -extra-module=%p/Inputs/multi-module-eh-b.ll %s
 ; XFAIL: arm, cygwin, win32, mingw
 declare i8* @__cxa_allocate_exception(i64)
Index: llvm/trunk/test/ExecutionEngine/MCJIT/remote/eh.ll
===================================================================
--- llvm/trunk/test/ExecutionEngine/MCJIT/remote/eh.ll
+++ llvm/trunk/test/ExecutionEngine/MCJIT/remote/eh.ll
@@ -1,3 +1,4 @@
+; REQUIRES: cxx-shared-library
 ; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s
 ; XFAIL: arm, cygwin, win32, mingw
 ; UNSUPPORTED: powerpc64-unknown-linux-gnu
Index: llvm/trunk/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
===================================================================
--- llvm/trunk/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
+++ llvm/trunk/test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
@@ -1,3 +1,4 @@
+; REQUIRES: cxx-shared-library
 ; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=large %s
 ; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm
 declare i8* @__cxa_allocate_exception(i64)
Index: llvm/trunk/test/ExecutionEngine/OrcMCJIT/eh.ll
===================================================================
--- llvm/trunk/test/ExecutionEngine/OrcMCJIT/eh.ll
+++ llvm/trunk/test/ExecutionEngine/OrcMCJIT/eh.ll
@@ -1,3 +1,4 @@
+; REQUIRES: cxx-shared-library
 ; RUN: %lli -jit-kind=orc-mcjit %s
 ; XFAIL: arm, cygwin, win32, mingw
 declare i8* @__cxa_allocate_exception(i64)
Index: llvm/trunk/test/ExecutionEngine/OrcMCJIT/multi-module-eh-a.ll
===================================================================
--- llvm/trunk/test/ExecutionEngine/OrcMCJIT/multi-module-eh-a.ll
+++ llvm/trunk/test/ExecutionEngine/OrcMCJIT/multi-module-eh-a.ll
@@ -1,3 +1,4 @@
+; REQUIRES: cxx-shared-library
 ; RUN: %lli -jit-kind=orc-mcjit -extra-module=%p/Inputs/multi-module-eh-b.ll %s
 ; XFAIL: arm, cygwin, win32, mingw
 declare i8* @__cxa_allocate_exception(i64)
Index: llvm/trunk/test/ExecutionEngine/OrcMCJIT/remote/eh.ll
===================================================================
--- llvm/trunk/test/ExecutionEngine/OrcMCJIT/remote/eh.ll
+++ llvm/trunk/test/ExecutionEngine/OrcMCJIT/remote/eh.ll
@@ -1,3 +1,4 @@
+; REQUIRES: cxx-shared-library
 ; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s
 ; XFAIL: arm, cygwin, win32, mingw
 ; UNSUPPORTED: powerpc64-unknown-linux-gnu
Index: llvm/trunk/test/lit.cfg.py
===================================================================
--- llvm/trunk/test/lit.cfg.py
+++ llvm/trunk/test/lit.cfg.py
@@ -194,6 +194,36 @@
 if not config.build_shared_libs and not config.link_llvm_dylib:
     config.available_features.add('static-libs')
 
+def have_cxx_shared_library():
+    readobj_exe = lit.util.which('llvm-readobj', config.llvm_tools_dir)
+    if not readobj_exe:
+        print('llvm-readobj not found')
+        return False
+
+    try:
+        readobj_cmd = subprocess.Popen(
+            [readobj_exe, '-needed-libs', readobj_exe], stdout=subprocess.PIPE)
+    except OSError:
+        print('could not exec llvm-readobj')
+        return False
+
+    readobj_out = readobj_cmd.stdout.read().decode('ascii')
+    readobj_cmd.wait()
+
+    regex = re.compile(r'(libc\+\+|libstdc\+\+|msvcp).*\.(so|dylib|dll)')
+    needed_libs = False
+    for line in readobj_out.splitlines():
+        if 'NeededLibraries [' in line:
+            needed_libs = True
+        if ']' in line:
+            needed_libs = False
+        if needed_libs and regex.search(line.lower()):
+            return True
+    return False
+
+if have_cxx_shared_library():
+    config.available_features.add('cxx-shared-library')
+
 # Direct object generation
 if not 'hexagon' in config.target_triple:
     config.available_features.add('object-emission')