diff --git a/llvm/test/Assembler/thinlto-vtable-summary.ll b/llvm/test/Assembler/thinlto-vtable-summary.ll
--- a/llvm/test/Assembler/thinlto-vtable-summary.ll
+++ b/llvm/test/Assembler/thinlto-vtable-summary.ll
@@ -4,7 +4,7 @@
 ; RUN: grep "^\^" %t.ll >%t3
 ; Expect that the summary information is the same after round-trip through
 ; llvm-as and llvm-dis.
-; RUN: diff --strip-trailing-cr %t2 %t3
+; RUN: diff -b %t2 %t3
 
 source_filename = "thinlto-vtable-summary.ll"
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
diff --git a/llvm/test/tools/llvm-cxxmap/remap.test b/llvm/test/tools/llvm-cxxmap/remap.test
--- a/llvm/test/tools/llvm-cxxmap/remap.test
+++ b/llvm/test/tools/llvm-cxxmap/remap.test
@@ -1,5 +1,5 @@
 RUN: llvm-cxxmap %S/Inputs/before.sym %S/Inputs/after.sym -r %S/Inputs/remap.map -o %t.output -Wambiguous -Wincomplete 2>&1 | FileCheck %s --allow-empty
-RUN: diff --strip-trailing-cr %S/Inputs/expected %t.output
+RUN: diff -b %S/Inputs/expected %t.output
 
 CHECK-NOT: warning
 CHECK-NOT: error
diff --git a/llvm/test/tools/llvm-profdata/profile-symbol-list.test b/llvm/test/tools/llvm-profdata/profile-symbol-list.test
--- a/llvm/test/tools/llvm-profdata/profile-symbol-list.test
+++ b/llvm/test/tools/llvm-profdata/profile-symbol-list.test
@@ -2,4 +2,4 @@
 ; RUN: llvm-profdata merge -sample -extbinary -prof-sym-list=%S/Inputs/profile-symbol-list-2.text %S/Inputs/sample-profile.proftext -o %t.2.output
 ; RUN: llvm-profdata merge -sample -extbinary %t.1.output %t.2.output -o %t.3.output
 ; RUN: llvm-profdata show -sample -show-prof-sym-list %t.3.output > %t.4.output
-; RUN: diff --strip-trailing-cr %S/Inputs/profile-symbol-list.expected %t.4.output
+; RUN: diff -b %S/Inputs/profile-symbol-list.expected %t.4.output
diff --git a/llvm/test/tools/llvm-profdata/roundtrip.test b/llvm/test/tools/llvm-profdata/roundtrip.test
--- a/llvm/test/tools/llvm-profdata/roundtrip.test
+++ b/llvm/test/tools/llvm-profdata/roundtrip.test
@@ -1,18 +1,18 @@
 RUN: llvm-profdata merge -o %t.0.profdata %S/Inputs/IR_profile.proftext
 RUN: llvm-profdata show -o %t.0.proftext -all-functions -text %t.0.profdata 
-RUN: diff --strip-trailing-cr %t.0.proftext %S/Inputs/IR_profile.proftext
+RUN: diff -b %t.0.proftext %S/Inputs/IR_profile.proftext
 RUN: llvm-profdata merge -o %t.1.profdata %t.0.proftext
 RUN: llvm-profdata show -o %t.1.proftext -all-functions -text %t.1.profdata 
-RUN: diff --strip-trailing-cr %t.1.proftext %S/Inputs/IR_profile.proftext
+RUN: diff -b %t.1.proftext %S/Inputs/IR_profile.proftext
 RUN: llvm-profdata merge --sample --binary -output=%t.2.profdata %S/Inputs/sample-profile.proftext
 RUN: llvm-profdata merge --sample --text -output=%t.2.proftext %t.2.profdata
-RUN: diff --strip-trailing-cr %t.2.proftext %S/Inputs/sample-profile.proftext
+RUN: diff -b %t.2.proftext %S/Inputs/sample-profile.proftext
 # Round trip from text --> extbinary --> text
 RUN: llvm-profdata merge --sample --extbinary -output=%t.3.profdata %S/Inputs/sample-profile.proftext
 RUN: llvm-profdata merge --sample --text -output=%t.3.proftext %t.3.profdata
-RUN: diff --strip-trailing-cr %t.3.proftext %S/Inputs/sample-profile.proftext
+RUN: diff -b %t.3.proftext %S/Inputs/sample-profile.proftext
 # Round trip from text --> binary --> extbinary --> text
 RUN: llvm-profdata merge --sample --binary -output=%t.4.profdata %S/Inputs/sample-profile.proftext
 RUN: llvm-profdata merge --sample --extbinary -output=%t.5.profdata %t.4.profdata
 RUN: llvm-profdata merge --sample --text -output=%t.4.proftext %t.5.profdata
-RUN: diff --strip-trailing-cr %t.4.proftext %S/Inputs/sample-profile.proftext
+RUN: diff -b %t.4.proftext %S/Inputs/sample-profile.proftext
diff --git a/llvm/test/tools/llvm-profdata/sample-remap.test b/llvm/test/tools/llvm-profdata/sample-remap.test
--- a/llvm/test/tools/llvm-profdata/sample-remap.test
+++ b/llvm/test/tools/llvm-profdata/sample-remap.test
@@ -1,2 +1,2 @@
 ; RUN: llvm-profdata merge -sample -text %S/Inputs/sample-remap.proftext -r %S/Inputs/sample-remap.remap -o %t.output
-; RUN: diff --strip-trailing-cr %S/Inputs/sample-remap.expected %t.output
+; RUN: diff -b %S/Inputs/sample-remap.expected %t.output