diff --git a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/skip.exp b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/skip.exp
index 2dfa2a6..07d9837 100644
--- a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/skip.exp
+++ b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/skip.exp
@@ -127,6 +127,7 @@
 }
 # account for differing order of evaluation of function operands
 if [using_clang] {
+  setup_xfail "works in gdb trunk" *-*-*
   gdb_test "step" "bar \\(\\) at.*" "step after disabling 3 (3)"
 } else {
   gdb_test "step" "foo \\(\\) at.*" "step after disabling 3 (3)"
diff --git a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/step-precsave.exp b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/step-precsave.exp
index e701795..5e7e645 100644
--- a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/step-precsave.exp
+++ b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/step-precsave.exp
@@ -258,20 +258,25 @@
 
 # step backward out of called function (thru call)
 
+if [using_clang] { setup_xfail "PR 20284" *-*-* }
 gdb_test "step" ".*STEP INTO THIS CALL.*" "reverse step out of called fn"
 
 # next backward over call
 
+if [using_clang] { setup_xfail "PR 20284" *-*-* }
 gdb_test "next" ".*NEXT OVER THIS CALL.*" "reverse next over call"
 
 # step/next backward with count
 
+if [using_clang] { setup_xfail "PR 20284" *-*-* }
 gdb_test "step 3" ".*REVERSE STEP TEST 1.*" "reverse step test 1"
+if [using_clang] { setup_xfail "PR 20284" *-*-* }
 gdb_test "next 2" ".*REVERSE NEXT TEST 1.*" "reverse next test 1"
 
 # step/next backward without count
 
 gdb_test "step" ".*STEP TEST 1.*" "reverse step test 2"
+if [using_clang] { setup_xfail "PR 20284" *-*-* }
 gdb_test "next" ".*NEXT TEST 1.*" "reverse next test 2"
 
 
diff --git a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/step-reverse.exp b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/step-reverse.exp
index e33d026..7d84143 100644
--- a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/step-reverse.exp
+++ b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.reverse/step-reverse.exp
@@ -238,20 +238,25 @@
 
 # step backward out of called function (thru call)
 
+if [using_clang] { setup_xfail "PR 20284" *-*-* }
 gdb_test "step" ".*STEP INTO THIS CALL.*" "reverse step out of called fn"
 
 # next backward over call
 
+if [using_clang] { setup_xfail "PR 20284" *-*-* }
 gdb_test "next" ".*NEXT OVER THIS CALL.*" "reverse next over call"
 
 # step/next backward with count
 
+if [using_clang] { setup_xfail "PR 20284" *-*-* }
 gdb_test "step 3" ".*REVERSE STEP TEST 1.*" "reverse step test 1"
+if [using_clang] { setup_xfail "PR 20284" *-*-* }
 gdb_test "next 2" ".*REVERSE NEXT TEST 1.*" "reverse next test 1"
 
 # step/next backward without count
 
 gdb_test "step" ".*STEP TEST 1.*" "reverse step test 2"
+if [using_clang] { setup_xfail "PR 20284" *-*-* }
 gdb_test "next" ".*NEXT TEST 1.*" "reverse next test 2"