Index: lldb/test/API/commands/apropos/with-process/TestAproposWithProcess.py
===================================================================
--- lldb/test/API/commands/apropos/with-process/TestAproposWithProcess.py
+++ lldb/test/API/commands/apropos/with-process/TestAproposWithProcess.py
@@ -38,6 +38,6 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         self.runCmd('apropos env')
Index: lldb/test/API/commands/command/nested_alias/TestNestedAlias.py
===================================================================
--- lldb/test/API/commands/command/nested_alias/TestNestedAlias.py
+++ lldb/test/API/commands/command/nested_alias/TestNestedAlias.py
@@ -38,7 +38,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # This is the function to remove the custom aliases in order to have a
         # clean slate for the next test case.
Index: lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
===================================================================
--- lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
+++ lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
@@ -266,7 +266,7 @@
 
         self.expect(side_effect.frame, exe=False, startstr="frame #0:")
         self.expect(side_effect.bp_loc, exe=False,
-                patterns=["1.* where = .*main .* resolved, hit count = 1"])
+                patterns=["1.* where = .*main .* resolved,( hardware,)? hit count = 1"])
 
     def breakpoint_commands_on_creation(self):
         """Test that setting breakpoint commands when creating the breakpoint works"""
Index: lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
===================================================================
--- lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
+++ lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
@@ -192,5 +192,5 @@
             "The breakpoints should report correct hit counts",
             patterns=[
                 "1\.1: .+ unresolved, hit count = 0 +Options: disabled",
-                "1\.2: .+ resolved, hit count = 1",
-                "1\.3: .+ resolved, hit count = 1"])
+                "1\.2: .+ resolved,( hardware,)? hit count = 1",
+                "1\.3: .+ resolved,( hardware,)? hit count = 1"])
Index: lldb/test/API/functionalities/breakpoint/cpp_exception/Makefile
===================================================================
--- lldb/test/API/functionalities/breakpoint/cpp_exception/Makefile
+++ lldb/test/API/functionalities/breakpoint/cpp_exception/Makefile
@@ -1,3 +1,4 @@
 CXX_SOURCES := main.cpp
+CFLAGS_EXTRAS := -fexceptions
 
 include Makefile.rules
Index: lldb/test/API/functionalities/dead-strip/TestDeadStrip.py
===================================================================
--- lldb/test/API/functionalities/dead-strip/TestDeadStrip.py
+++ lldb/test/API/functionalities/dead-strip/TestDeadStrip.py
@@ -45,7 +45,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f 1", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         self.runCmd("continue")
 
@@ -57,4 +57,4 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f 3", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
Index: lldb/test/API/functionalities/load_unload/TestLoadUnload.py
===================================================================
--- lldb/test/API/functionalities/load_unload/TestLoadUnload.py
+++ lldb/test/API/functionalities/load_unload/TestLoadUnload.py
@@ -326,7 +326,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # Issue the 'continue' command.  We should stop agaian at a_function.
         # The stop reason of the thread should be breakpoint and at a_function.
Index: lldb/test/API/functionalities/memory/cache/TestMemoryCache.py
===================================================================
--- lldb/test/API/functionalities/memory/cache/TestMemoryCache.py
+++ lldb/test/API/functionalities/memory/cache/TestMemoryCache.py
@@ -39,7 +39,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # Read a chunk of memory containing &my_ints[0]. The number of bytes read
         # must be greater than m_L2_cache_line_byte_size to make sure the L1
Index: lldb/test/API/functionalities/memory/find/TestMemoryFind.py
===================================================================
--- lldb/test/API/functionalities/memory/find/TestMemoryFind.py
+++ lldb/test/API/functionalities/memory/find/TestMemoryFind.py
@@ -39,7 +39,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # Test the memory find commands.
 
Index: lldb/test/API/functionalities/memory/read/TestMemoryRead.py
===================================================================
--- lldb/test/API/functionalities/memory/read/TestMemoryRead.py
+++ lldb/test/API/functionalities/memory/read/TestMemoryRead.py
@@ -39,7 +39,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # Test the memory read commands.
 
Index: lldb/test/API/lang/c/anonymous/TestAnonymous.py
===================================================================
--- lldb/test/API/lang/c/anonymous/TestAnonymous.py
+++ lldb/test/API/lang/c/anonymous/TestAnonymous.py
@@ -168,4 +168,4 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
Index: lldb/test/API/lang/c/array_types/TestArrayTypes.py
===================================================================
--- lldb/test/API/lang/c/array_types/TestArrayTypes.py
+++ lldb/test/API/lang/c/array_types/TestArrayTypes.py
@@ -43,7 +43,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=['resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # Issue 'variable list' command on several array-type variables.
 
Index: lldb/test/API/lang/c/bitfields/TestBitfields.py
===================================================================
--- lldb/test/API/lang/c/bitfields/TestBitfields.py
+++ lldb/test/API/lang/c/bitfields/TestBitfields.py
@@ -41,7 +41,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # This should display correctly.
         self.expect(
Index: lldb/test/API/lang/c/conflicting-symbol/TestConflictingSymbol.py
===================================================================
--- lldb/test/API/lang/c/conflicting-symbol/TestConflictingSymbol.py
+++ lldb/test/API/lang/c/conflicting-symbol/TestConflictingSymbol.py
@@ -49,7 +49,7 @@
                              'stop reason = breakpoint'])
 
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # This should display correctly.
         self.expect(
@@ -66,7 +66,7 @@
                              'stop reason = breakpoint'])
 
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    Patterns=[' resolved,( hardware,)? hit count = 1'])
 
         self.expect(
             "expr (unsigned long long)conflicting_symbol",
@@ -82,7 +82,7 @@
                              'stop reason = breakpoint'])
 
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         self.expect(
             "expr (unsigned long long)conflicting_symbol",
Index: lldb/test/API/lang/c/const_variables/TestConstVariables.py
===================================================================
--- lldb/test/API/lang/c/const_variables/TestConstVariables.py
+++ lldb/test/API/lang/c/const_variables/TestConstVariables.py
@@ -38,7 +38,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         self.runCmd("next")
         self.runCmd("next")
Index: lldb/test/API/lang/c/enum_types/TestEnumTypes.py
===================================================================
--- lldb/test/API/lang/c/enum_types/TestEnumTypes.py
+++ lldb/test/API/lang/c/enum_types/TestEnumTypes.py
@@ -62,7 +62,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # Look up information about the 'days' enum type.
         # Check for correct display.
Index: lldb/test/API/lang/c/forward/TestForwardDeclaration.py
===================================================================
--- lldb/test/API/lang/c/forward/TestForwardDeclaration.py
+++ lldb/test/API/lang/c/forward/TestForwardDeclaration.py
@@ -31,7 +31,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # This should display correctly.
         # Note that the member fields of a = 1 and b = 2 is by design.
Index: lldb/test/API/lang/c/function_types/TestFunctionTypes.py
===================================================================
--- lldb/test/API/lang/c/function_types/TestFunctionTypes.py
+++ lldb/test/API/lang/c/function_types/TestFunctionTypes.py
@@ -85,4 +85,4 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
Index: lldb/test/API/lang/c/global_variables/TestGlobalVariables.py
===================================================================
--- lldb/test/API/lang/c/global_variables/TestGlobalVariables.py
+++ lldb/test/API/lang/c/global_variables/TestGlobalVariables.py
@@ -69,7 +69,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # Test that the statically initialized variable can also be
         # inspected *with* a process.
Index: lldb/test/API/lang/c/local_variables/TestLocalVariables.py
===================================================================
--- lldb/test/API/lang/c/local_variables/TestLocalVariables.py
+++ lldb/test/API/lang/c/local_variables/TestLocalVariables.py
@@ -49,7 +49,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         self.expect("frame variable i", VARIABLES_DISPLAYED_CORRECTLY,
                     substrs=['(unsigned int) i = 10'])
Index: lldb/test/API/lang/c/modules/TestCModules.py
===================================================================
--- lldb/test/API/lang/c/modules/TestCModules.py
+++ lldb/test/API/lang/c/modules/TestCModules.py
@@ -41,7 +41,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # Enable logging of the imported AST.
         log_file = self.getBuildArtifact("lldb-ast-log.txt")
Index: lldb/test/API/lang/c/register_variables/TestRegisterVariables.py
===================================================================
--- lldb/test/API/lang/c/register_variables/TestRegisterVariables.py
+++ lldb/test/API/lang/c/register_variables/TestRegisterVariables.py
@@ -51,7 +51,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # Try some variables that should be visible
         frame = self.dbg.GetSelectedTarget().GetProcess(
@@ -78,7 +78,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # Try some variables that should be visible
         frame = self.dbg.GetSelectedTarget().GetProcess(
@@ -105,7 +105,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # Try some variables that should be visible
         frame = self.dbg.GetSelectedTarget().GetProcess(
Index: lldb/test/API/lang/c/set_values/TestSetValues.py
===================================================================
--- lldb/test/API/lang/c/set_values/TestSetValues.py
+++ lldb/test/API/lang/c/set_values/TestSetValues.py
@@ -53,7 +53,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # main.c:15
         # Check that 'frame variable --show-types' displays the correct data
Index: lldb/test/API/lang/c/shared_lib/TestSharedLib.py
===================================================================
--- lldb/test/API/lang/c/shared_lib/TestSharedLib.py
+++ lldb/test/API/lang/c/shared_lib/TestSharedLib.py
@@ -101,4 +101,4 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
Index: lldb/test/API/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
===================================================================
--- lldb/test/API/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
+++ lldb/test/API/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
@@ -87,4 +87,4 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
Index: lldb/test/API/lang/cpp/bitfields/TestCppBitfields.py
===================================================================
--- lldb/test/API/lang/cpp/bitfields/TestCppBitfields.py
+++ lldb/test/API/lang/cpp/bitfields/TestCppBitfields.py
@@ -34,7 +34,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         self.expect("expr (lba.a)", VARIABLES_DISPLAYED_CORRECTLY,
                     substrs=['unsigned int', '2'])
Index: lldb/test/API/lang/cpp/class_types/TestClassTypes.py
===================================================================
--- lldb/test/API/lang/cpp/class_types/TestClassTypes.py
+++ lldb/test/API/lang/cpp/class_types/TestClassTypes.py
@@ -45,7 +45,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # We should be stopped on the ctor function of class C.
         self.expect(
@@ -142,7 +142,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # Continue on inside the ctor() body...
         self.runCmd("register read pc")
Index: lldb/test/API/lang/cpp/enum_types/TestCPP11EnumTypes.py
===================================================================
--- lldb/test/API/lang/cpp/enum_types/TestCPP11EnumTypes.py
+++ lldb/test/API/lang/cpp/enum_types/TestCPP11EnumTypes.py
@@ -108,7 +108,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # Look up information about the 'DayType' enum type.
         # Check for correct display.
Index: lldb/test/API/lang/cpp/inlines/TestInlines.py
===================================================================
--- lldb/test/API/lang/cpp/inlines/TestInlines.py
+++ lldb/test/API/lang/cpp/inlines/TestInlines.py
@@ -56,4 +56,4 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
Index: lldb/test/API/lang/cpp/namespace_definitions/TestNamespaceDefinitions.py
===================================================================
--- lldb/test/API/lang/cpp/namespace_definitions/TestNamespaceDefinitions.py
+++ lldb/test/API/lang/cpp/namespace_definitions/TestNamespaceDefinitions.py
@@ -71,4 +71,4 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
Index: lldb/test/API/lang/cpp/signed_types/TestSignedTypes.py
===================================================================
--- lldb/test/API/lang/cpp/signed_types/TestSignedTypes.py
+++ lldb/test/API/lang/cpp/signed_types/TestSignedTypes.py
@@ -48,7 +48,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # Execute the puts().
         self.runCmd("thread step-over")
Index: lldb/test/API/lang/objc/conflicting-definition/TestConflictingDefinition.py
===================================================================
--- lldb/test/API/lang/objc/conflicting-definition/TestConflictingDefinition.py
+++ lldb/test/API/lang/objc/conflicting-definition/TestConflictingDefinition.py
@@ -33,7 +33,7 @@
                              'stop reason = breakpoint'])
 
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # This should display correctly.
         self.expect(
Index: lldb/test/API/lang/objc/forward-decl/TestForwardDecl.py
===================================================================
--- lldb/test/API/lang/objc/forward-decl/TestForwardDecl.py
+++ lldb/test/API/lang/objc/forward-decl/TestForwardDecl.py
@@ -48,7 +48,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # This should display correctly.
         self.expect("expression [j getMember]", VARIABLES_DISPLAYED_CORRECTLY,
Index: lldb/test/API/lang/objc/hidden-ivars/TestHiddenIvars.py
===================================================================
--- lldb/test/API/lang/objc/hidden-ivars/TestHiddenIvars.py
+++ lldb/test/API/lang/objc/hidden-ivars/TestHiddenIvars.py
@@ -118,7 +118,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
     def expr(self, strip):
         self.common_setup(strip)
Index: lldb/test/API/lang/objc/modules-auto-import/TestModulesAutoImport.py
===================================================================
--- lldb/test/API/lang/objc/modules-auto-import/TestModulesAutoImport.py
+++ lldb/test/API/lang/objc/modules-auto-import/TestModulesAutoImport.py
@@ -40,7 +40,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         self.runCmd("settings set target.auto-import-clang-modules true")
 
Index: lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py
===================================================================
--- lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py
+++ lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py
@@ -37,7 +37,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         self.runCmd(
             "settings set target.clang-module-search-paths \"" +
Index: lldb/test/API/lang/objc/modules/TestObjCModules.py
===================================================================
--- lldb/test/API/lang/objc/modules/TestObjCModules.py
+++ lldb/test/API/lang/objc/modules/TestObjCModules.py
@@ -41,7 +41,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         self.expect("expr @import Darwin; 3", VARIABLES_DISPLAYED_CORRECTLY,
                     substrs=["int", "3"])
Index: lldb/test/API/lang/objc/objc-new-syntax/ObjCNewSyntaxTest.py
===================================================================
--- lldb/test/API/lang/objc/objc-new-syntax/ObjCNewSyntaxTest.py
+++ lldb/test/API/lang/objc/objc-new-syntax/ObjCNewSyntaxTest.py
@@ -26,4 +26,4 @@
         self.expect(
             "breakpoint list -f",
             BREAKPOINT_HIT_ONCE,
-            substrs=[' resolved, hit count = 1'])
+            patterns=[' resolved,( hardware,)? hit count = 1'])
Index: lldb/test/API/lang/objc/real-definition/TestRealDefinition.py
===================================================================
--- lldb/test/API/lang/objc/real-definition/TestRealDefinition.py
+++ lldb/test/API/lang/objc/real-definition/TestRealDefinition.py
@@ -34,13 +34,13 @@
 
         # Run and stop at Foo
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         self.runCmd("continue", RUN_SUCCEEDED)
 
         # Run at stop at main
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # This should display correctly.
         self.expect(
@@ -72,13 +72,13 @@
 
         # Run and stop at Foo
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         self.runCmd("continue", RUN_SUCCEEDED)
 
         # Run at stop at main
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         # This should display correctly.
         self.expect(
Index: lldb/test/API/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py
===================================================================
--- lldb/test/API/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py
+++ lldb/test/API/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py
@@ -41,7 +41,7 @@
 
         # The breakpoint should have a hit count of 1.
         self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=[' resolved, hit count = 1'])
+                    patterns=[' resolved,( hardware,)? hit count = 1'])
 
         d1 = self.frame().FindVariable("d1")
         d1.SetPreferSyntheticValue(True)