From 43dc555430c1df25ec0712ab3bafdfc095909d3f Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Thu, 24 Mar 2016 01:26:08 +0000 Subject: [PATCH] The time when -faltivec (or, on clang only, -maltivec) will magically include altivec.h has come and gone. Rationale: This causes modules, rewrite-includes, etc to be sad and people should just include altivec.h in their source. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@264235 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Frontend/CompilerInvocation.cpp | 4 ---- test/CodeGen/builtins-ppc-altivec.c | 5 ++++- test/CodeGen/builtins-ppc-p8vector.c | 1 + test/CodeGen/builtins-ppc-quadword.c | 1 + test/CodeGen/builtins-ppc-vsx.c | 1 + test/Parser/cxx-altivec.cpp | 1 + 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 1764c3ce9c..6b2e93f21b 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -2002,10 +2002,6 @@ static void ParsePreprocessorArgs(PreprocessorOptions &Opts, ArgList &Args, for (const Arg *A : Args.filtered(OPT_chain_include)) Opts.ChainedIncludes.emplace_back(A->getValue()); - // Include 'altivec.h' if -faltivec option present - if (Args.hasArg(OPT_faltivec)) - Opts.Includes.emplace_back("altivec.h"); - for (const Arg *A : Args.filtered(OPT_remap_file)) { std::pair Split = StringRef(A->getValue()).split(';'); diff --git a/test/CodeGen/builtins-ppc-altivec.c b/test/CodeGen/builtins-ppc-altivec.c index f9e0584ad0..1edf99f868 100644 --- a/test/CodeGen/builtins-ppc-altivec.c +++ b/test/CodeGen/builtins-ppc-altivec.c @@ -6,8 +6,11 @@ // RUN: %clang_cc1 -faltivec -triple powerpc64le-unknown-unknown -emit-llvm %s \ // RUN: -o - | FileCheck %s -check-prefix=CHECK-LE // RUN: not %clang_cc1 -triple powerpc64le-unknown-unknown -emit-llvm %s \ -// RUN: -ferror-limit 0 -o - 2>&1 \ +// RUN: -ferror-limit 0 -DNO_ALTIVEC -o - 2>&1 \ // RUN: | FileCheck %s -check-prefix=CHECK-NOALTIVEC +#ifndef NO_ALTIVEC +#include +#endif vector bool char vbc = { 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0 }; vector signed char vsc = { 1, -2, 3, -4, 5, -6, 7, -8, 9, -10, 11, -12, 13, -14, 15, -16 }; diff --git a/test/CodeGen/builtins-ppc-p8vector.c b/test/CodeGen/builtins-ppc-p8vector.c index 594ed335c8..096e3e1bb6 100644 --- a/test/CodeGen/builtins-ppc-p8vector.c +++ b/test/CodeGen/builtins-ppc-p8vector.c @@ -6,6 +6,7 @@ // generate the correct errors for functions that are only overloaded with VSX // (vec_cmpge, vec_cmple). Without this option, there is only one overload so // it is selected. +#include void dummy() { } signed int si; diff --git a/test/CodeGen/builtins-ppc-quadword.c b/test/CodeGen/builtins-ppc-quadword.c index e17b6791d5..f381642c42 100644 --- a/test/CodeGen/builtins-ppc-quadword.c +++ b/test/CodeGen/builtins-ppc-quadword.c @@ -8,6 +8,7 @@ // RUN: not %clang_cc1 -faltivec -triple powerpc-unknown-unknown \ // RUN: -emit-llvm %s -o - 2>&1 | FileCheck %s -check-prefix=CHECK-PPC +#include // CHECK-PPC: error: __int128 is not supported on this target vector signed __int128 vlll = { -1 }; diff --git a/test/CodeGen/builtins-ppc-vsx.c b/test/CodeGen/builtins-ppc-vsx.c index 27f160586d..21a24a2c89 100644 --- a/test/CodeGen/builtins-ppc-vsx.c +++ b/test/CodeGen/builtins-ppc-vsx.c @@ -1,6 +1,7 @@ // REQUIRES: powerpc-registered-target // RUN: %clang_cc1 -faltivec -target-feature +vsx -triple powerpc64-unknown-unknown -emit-llvm %s -o - | FileCheck %s // RUN: %clang_cc1 -faltivec -target-feature +vsx -triple powerpc64le-unknown-unknown -emit-llvm %s -o - | FileCheck %s -check-prefix=CHECK-LE +#include vector signed char vsc = { -8, 9, -10, 11, -12, 13, -14, 15, -0, 1, -2, 3, -4, 5, -6, 7}; diff --git a/test/Parser/cxx-altivec.cpp b/test/Parser/cxx-altivec.cpp index ac20de288f..5b0da6c5e6 100644 --- a/test/Parser/cxx-altivec.cpp +++ b/test/Parser/cxx-altivec.cpp @@ -1,6 +1,7 @@ // RUN: %clang_cc1 -triple=powerpc-apple-darwin8 -faltivec -fsyntax-only -verify -std=c++11 %s // RUN: %clang_cc1 -triple=powerpc64-unknown-linux-gnu -faltivec -fsyntax-only -verify -std=c++11 %s // RUN: %clang_cc1 -triple=powerpc64le-unknown-linux-gnu -faltivec -fsyntax-only -verify -std=c++11 %s +#include __vector char vv_c; __vector signed char vv_sc; -- 2.40.0