Index: llvm/test/tools/llvm-debuginfo-analyzer/DWARF/06-dwarf-full-logical-view.test
===================================================================
--- llvm/test/tools/llvm-debuginfo-analyzer/DWARF/06-dwarf-full-logical-view.test
+++ llvm/test/tools/llvm-debuginfo-analyzer/DWARF/06-dwarf-full-logical-view.test
@@ -1,10 +1,25 @@
 ; REQUIRES: x86-registered-target
 
-; FIXME: Test failure https://reviews.llvm.org/D125783
-; UNSUPPORTED: arm
-
 ; Test case 6 - Full logical view
 
+; The original test case used the '--print=all' option which causes
+; issues on the following platforms:
+;
+;  clang-armv7-vfpv3-2stage
+;  https://lab.llvm.org/buildbot/#/builders/182/builds/4232
+;
+;  clang-armv7-global-isel
+;  https://lab.llvm.org/buildbot/#/builders/186/builds/9519
+;
+;  clang-armv7-2stage
+;  https://lab.llvm.org/buildbot/#/builders/187/builds/9483
+;
+; 32-bit multilib on amd64
+;
+; Created https://github.com/llvm/llvm-project/issues/58758
+;
+; Remove the '--print=sizes' for this specific test.
+
 ; test.cpp
 ;  1  using INTPTR = const int *;
 ;  2  int foo(INTPTR ParamPtr, unsigned ParamUnsigned, bool ParamBool) {
@@ -22,7 +37,7 @@
 ; operands, linkage names, etc.
 
 ; RUN: llvm-debuginfo-analyzer --attribute=all \
-; RUN:                         --print=all \
+; RUN:                         --print=elements,warnings,summary \
 ; RUN:                         %p/Inputs/test-dwarf-clang.o 2>&1 | \
 ; RUN: FileCheck --strict-whitespace -check-prefix=ONE %s
 
@@ -98,13 +113,3 @@
 ; ONE-NEXT: Lines           25         25
 ; ONE-NEXT: -----------------------------
 ; ONE-NEXT: Total           37         37
-; ONE-EMPTY:
-; ONE-NEXT: Scope Sizes:
-; ONE-NEXT:        189 (100.00%) : [0x000000000b][001]              {CompileUnit} 'test.cpp'
-; ONE-NEXT:        110 ( 58.20%) : [0x000000002a][002]      2         {Function} extern not_inlined 'foo' -> [0x0000000099]'int'
-; ONE-NEXT:         27 ( 14.29%) : [0x0000000071][003]                  {Block}
-; ONE-EMPTY:
-; ONE-NEXT: Totals by lexical level:
-; ONE-NEXT: [001]:        189 (100.00%)
-; ONE-NEXT: [002]:        110 ( 58.20%)
-; ONE-NEXT: [003]:         27 ( 14.29%)