diff --git a/test/DebugInfo/2006-11-06-StackTrace.cpp b/test/DebugInfo/2006-11-06-StackTrace.cpp
index a9af6904af7..9c48b59fe25 100644
--- a/test/DebugInfo/2006-11-06-StackTrace.cpp
+++ b/test/DebugInfo/2006-11-06-StackTrace.cpp
@@ -1,10 +1,11 @@
 // This is a regression test on debug info to make sure that we can get a
 // meaningful stack trace from a C++ program.
 // RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | llc -o Output/StackTrace.s -f
-// RUN: gcc -g Output/StackTrace.s -o Output/StackTrace.exe -lstdc++
+// RUN: as Output/StackTrace.s -o Output/StackTrace.o
+// RUN: g++ Output/StackTrace.o -o Output/StackTrace.exe
 // RUN: ( echo "break DeepStack::deepest"; echo "run 17" ; echo "where" ) > Output/StackTrace.gdbin 
-// RUN: gdb -q -batch -n -x Output/StackTrace.gdbin Output/StackTrace.exe | tee Output/StackTrace.out | grep '#0  DeepStack::deepest (this=.*,x=33)'
-// RUN: gdb -q -batch -n -x Output/StackTrace.gdbin Output/StackTrace.exe | grep '#7  0x.* in main(argc=1, argv=.*)'
+// RUN: gdb -q -batch -n -x Output/StackTrace.gdbin Output/StackTrace.exe | tee Output/StackTrace.out | grep '#0  DeepStack::deepest.*(this=.*,.*x=33)'
+// RUN: gdb -q -batch -n -x Output/StackTrace.gdbin Output/StackTrace.exe | grep '#7  0x.* in main.*(argc=[12],.*argv=.*)'
 // XFAIL: linux