From 45b533945f0851ec234ca846e1af5ee1e4df0b6e Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 30 Dec 2015 11:49:41 +0000 Subject: Vendor import of clang trunk r256633: https://llvm.org/svn/llvm-project/cfe/trunk@256633 --- test/ASTMerge/codegen-exprs.c | 6 +++--- test/ASTMerge/exprs.c | 6 +++--- test/ASTMerge/function.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'test/ASTMerge') diff --git a/test/ASTMerge/codegen-exprs.c b/test/ASTMerge/codegen-exprs.c index 6c4a575d6096..b5069f993be5 100644 --- a/test/ASTMerge/codegen-exprs.c +++ b/test/ASTMerge/codegen-exprs.c @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/exprs1.c -// RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/exprs2.c -// RUN: %clang_cc1 -emit-obj -o /dev/null -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -verify %s +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-pch -o %t.1.ast %S/Inputs/exprs1.c +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-pch -o %t.2.ast %S/Inputs/exprs2.c +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-obj -o /dev/null -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -verify %s // expected-no-diagnostics diff --git a/test/ASTMerge/exprs.c b/test/ASTMerge/exprs.c index c82e6831f5c6..7495bb6a874a 100644 --- a/test/ASTMerge/exprs.c +++ b/test/ASTMerge/exprs.c @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/exprs1.c -// RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/exprs2.c -// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -verify %s +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-pch -o %t.1.ast %S/Inputs/exprs1.c +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-pch -o %t.2.ast %S/Inputs/exprs2.c +// RUN: %clang_cc1 -triple %itanium_abi_triple -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -verify %s // expected-no-diagnostics diff --git a/test/ASTMerge/function.c b/test/ASTMerge/function.c index 89e1c699c3aa..650f719d1fa8 100644 --- a/test/ASTMerge/function.c +++ b/test/ASTMerge/function.c @@ -3,7 +3,7 @@ // RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s // RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -verify %s -// CHECK: function2.c:3:6: error: external function 'f1' declared with incompatible types in different translation units ('void (Int, double)' vs. 'void (int, float)') +// CHECK: function2.c:3:6: error: external function 'f1' declared with incompatible types in different translation units ('void (Int, double)' (aka 'void (int, double)') vs. 'void (int, float)') // CHECK: function1.c:2:6: note: declared here with type 'void (int, float)' // CHECK: function2.c:5:6: error: external function 'f3' declared with incompatible types in different translation units ('void (int)' vs. 'void (void)') // CHECK: function1.c:4:6: note: declared here with type 'void (void)' -- cgit v1.2.3