Author: hans Date: Thu Aug 2 01:53:00 2018 New Revision: 338688 URL: http://llvm.org/viewvc/llvm-project?rev=338688&view=rev Log: Merging r338553: ------------------------------------------------------------------------ r338553 | filcab | 2018-08-01 15:41:42 +0200 (Wed, 01 Aug 2018) | 1 line
Use a dummy target so the test passes when default target is for a toolchain implements useIntegratedAs() -> true ------------------------------------------------------------------------ Modified: cfe/branches/release_70/ (props changed) cfe/branches/release_70/test/Driver/integrated-as.c Propchange: cfe/branches/release_70/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 2 01:53:00 2018 @@ -1,4 +1,4 @@ /cfe/branches/type-system-rewrite:134693-134817 -/cfe/trunk:338552,338602 +/cfe/trunk:338552-338553,338602 /cfe/trunk/test:170344 /cfe/trunk/test/SemaTemplate:126920 Modified: cfe/branches/release_70/test/Driver/integrated-as.c URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_70/test/Driver/integrated-as.c?rev=338688&r1=338687&r2=338688&view=diff ============================================================================== --- cfe/branches/release_70/test/Driver/integrated-as.c (original) +++ cfe/branches/release_70/test/Driver/integrated-as.c Thu Aug 2 01:53:00 2018 @@ -7,7 +7,7 @@ // FIAS: cc1as -// RUN: %clang -### -fno-integrated-as -S %s 2>&1 \ +// RUN: %clang -target none -### -fno-integrated-as -S %s 2>&1 \ // RUN: | FileCheck %s -check-prefix NOFIAS // NOFIAS-NOT: cc1as _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits