Author: hans Date: Tue Aug 21 15:45:19 2018 New Revision: 340354 URL: http://llvm.org/viewvc/llvm-project?rev=340354&view=rev Log: 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 ------------------------------------------------------------------------ Modified: test-suite/branches/release_70/ (props changed) test-suite/branches/release_70/ABI-Testsuite/test/mangling/test.xpp Propchange: test-suite/branches/release_70/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 21 15:45:19 2018 @@ -1 +1 @@ -/test-suite/trunk:338710,340320 +/test-suite/trunk:338710,340320,340322 Modified: test-suite/branches/release_70/ABI-Testsuite/test/mangling/test.xpp URL: http://llvm.org/viewvc/llvm-project/test-suite/branches/release_70/ABI-Testsuite/test/mangling/test.xpp?rev=340354&r1=340353&r2=340354&view=diff ============================================================================== --- test-suite/branches/release_70/ABI-Testsuite/test/mangling/test.xpp (original) +++ test-suite/branches/release_70/ABI-Testsuite/test/mangling/test.xpp Tue Aug 21 15:45:19 2018 @@ -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> _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits