Merge r65575 into Dib:
Revert 50419. This test wasn't needed with some
earlier versions of Darwin linkers, but now it is again.
llvm-svn: 65581
diff --git a/llvm-gcc-4.2/gcc/testsuite/g++.old-deja/g++.pt/const2.C b/llvm-gcc-4.2/gcc/testsuite/g++.old-deja/g++.pt/const2.C
index f772c5c..797c11a 100644
--- a/llvm-gcc-4.2/gcc/testsuite/g++.old-deja/g++.pt/const2.C
+++ b/llvm-gcc-4.2/gcc/testsuite/g++.old-deja/g++.pt/const2.C
@@ -1,7 +1,8 @@
// { dg-do link }
// This test should get a linker error for the reference to A<int>::i.
// { dg-error "i" "" { target *-*-* } 0 }
-// LLVM LOCAL remove extra check
+// APPLE LOCAL 5317196
+// { dg-error ".*" "" { target *-*-darwin* } 0 }
template <class T> struct B { static const int i = 3; };
template <class T> struct A { static const int i = B<T>::i; };
