Index: compiler-rt/trunk/test/asan/TestCases/Linux/throw_invoke_test_libstdcxx.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/Linux/throw_invoke_test_libstdcxx.cc
+++ compiler-rt/trunk/test/asan/TestCases/Linux/throw_invoke_test_libstdcxx.cc
@@ -0,0 +1,48 @@
+// This the basically the `throw_invoke_test.cc` test but using libstdc++
+// instead of the default.
+// RUN: %clangxx_asan %s -o %t -stdlib=libstdc++ -static-libstdc++ && %run %t
+
+#include <stdio.h>
+static volatile int zero = 0;
+inline void pretend_to_do_something(void *x) {
+  __asm__ __volatile__("" : : "r"(x) : "memory");
+}
+
+__attribute__((noinline)) void ReallyThrow() {
+  fprintf(stderr, "ReallyThrow\n");
+  try {
+    if (zero == 0)
+      throw 42;
+    else if (zero == 1)
+      throw 1.;
+  } catch (double x) {
+  }
+}
+
+__attribute__((noinline)) void Throw() {
+  int a, b, c, d, e;
+  pretend_to_do_something(&a);
+  pretend_to_do_something(&b);
+  pretend_to_do_something(&c);
+  pretend_to_do_something(&d);
+  pretend_to_do_something(&e);
+  fprintf(stderr, "Throw stack = %p\n", &a);
+  ReallyThrow();
+}
+
+__attribute__((noinline)) void CheckStack() {
+  int ar[100];
+  pretend_to_do_something(ar);
+  for (int i = 0; i < 100; i++)
+    ar[i] = i;
+  fprintf(stderr, "CheckStack stack = %p, %p\n", ar, ar + 100);
+}
+
+int main(int argc, char **argv) {
+  try {
+    Throw();
+  } catch (int a) {
+    fprintf(stderr, "a = %d\n", a);
+  }
+  CheckStack();
+}
Index: compiler-rt/trunk/test/asan/TestCases/throw_invoke_test.cc
===================================================================
--- compiler-rt/trunk/test/asan/TestCases/throw_invoke_test.cc
+++ compiler-rt/trunk/test/asan/TestCases/throw_invoke_test.cc
@@ -1,5 +1,4 @@
 // RUN: %clangxx_asan %s -o %t && %run %t
-// RUN: %clangxx_asan %s -o %t -stdlib=libstdc++ -static-libstdc++ && %run %t
 
 #include <stdio.h>
 static volatile int zero = 0;