Merging r340322:
------------------------------------------------------------------------
r340322 | tstellar | 2018-08-21 21:22:19 +0200 (Tue, 21 Aug 2018) | 14 lines

ABI-Testsuite: Force the old c++11 ABI in mangling/test.xpp

Summary:
The check lines for this test assume the old c++11 ABI.

This resolved PR33132.

Reviewers: Sunil_Srivastava

Reviewed By: Sunil_Srivastava

Subscribers: cfe-commits, llvm-commits

Differential Revision: https://reviews.llvm.org/D51021
------------------------------------------------------------------------

llvm-svn: 340354
diff --git a/ABI-Testsuite/test/mangling/test.xpp b/ABI-Testsuite/test/mangling/test.xpp
index e7f4e00..b39e284 100755
--- a/ABI-Testsuite/test/mangling/test.xpp
+++ b/ABI-Testsuite/test/mangling/test.xpp
@@ -1,6 +1,6 @@
 // This file is distributed under the University of Illinois Open Source License.

 // See LICENSE.TXT for details.

-// RUN: cxx_compiler cxx_11 -c %s -o %t.o

+// RUN: cxx_compiler cxx_11 -D_GLIBCXX_USE_CXX11_ABI=0 -c %s -o %t.o

 // RUN: bindump %t.o | FileCheck -allow-deprecated-dag-overlap prefixes %s

 

 #include <cstddef>