Index: .gitignore
===================================================================
--- .gitignore
+++ .gitignore
@@ -21,7 +21,7 @@
 *.sln
 *.suo
 # vim swap files
-.*.swp
+.*.sw?
 .sw?
 # OS X specific files.
 .DS_store
@@ -39,7 +39,12 @@
 __pycache__/
 *.lock
 *.so
+a.out
+*.o
+*.d
+*.dwo
 
+.ycm_extra_conf.py
 clang-module-cache
 
 # Skip ctags-style tags files
Index: packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py
===================================================================
--- packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py
+++ packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py
@@ -21,11 +21,6 @@
         self.breakpoint = line_number('main.cpp', '// Set breakpoint here')
 
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
-    @expectedFailureAndroid("llvm.org/pr24497", archs=['arm', 'aarch64'])
-    @expectedFailureAll(
-        oslist=["linux"],
-        archs=["arm"],
-        bugnumber="llvm.org/pr24497")
     # IO error due to breakpoint at invalid address
     @expectedFailureAll(triple=re.compile('^mips'))
     def test_step_inst_with(self):
Index: source/Plugins/Process/Linux/NativeProcessLinux.cpp
===================================================================
--- source/Plugins/Process/Linux/NativeProcessLinux.cpp
+++ source/Plugins/Process/Linux/NativeProcessLinux.cpp
@@ -1347,7 +1347,7 @@
     if (next_flags & 0x20) {
       // Thumb mode
       error = SetSoftwareBreakpoint(next_pc, 2);
-    } else {
+    } else if (next_pc) {
       // Arm mode
       error = SetSoftwareBreakpoint(next_pc, 4);
     }