From eaf6624384e1dac8072673983c1f4b2d9da71c12 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 2 Aug 2011 16:58:57 +0200 Subject: [PATCH] - Disable AVX tests, else they fail since AVX is now disabled - Remove clang 2.9 patch retrieved when cherry-picking F-16/Rawhide commit --- clang-2.9-add_gcc_vers.patch | 12 ------------ llvm.spec | 8 +++----- 2 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 clang-2.9-add_gcc_vers.patch diff --git a/clang-2.9-add_gcc_vers.patch b/clang-2.9-add_gcc_vers.patch deleted file mode 100644 index 03afe49..0000000 --- a/clang-2.9-add_gcc_vers.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- clang-2.9/lib/Driver/ToolChains.cpp.add_gcc_vers 2011-03-21 22:29:27.000000000 +0100 -+++ clang-2.9/lib/Driver/ToolChains.cpp 2011-08-01 18:20:29.504194241 +0200 -@@ -1449,7 +1449,8 @@ - GccTriple = "i586-suse-linux"; - } - -- const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", -+ const char* GccVersions[] = {"4.6.1", "4.6.0", -+ "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", - "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2", - "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1", - "4.2"}; diff --git a/llvm.spec b/llvm.spec index 44cdb5e..c1a91f2 100644 --- a/llvm.spec +++ b/llvm.spec @@ -34,10 +34,6 @@ Patch2: clang-2.8-alignOf.patch # http://llvm.org/bugs/show_bug.cgi?id=9508 Patch3: llvm-2.8-disable-avx.patch -# clang link failure if system GCC version is unknown -# http://llvm.org/bugs/show_bug.cgi?id=8897 -# Patch4: clang-2.9-add_gcc_vers.patch - BuildRequires: bison BuildRequires: chrpath @@ -229,9 +225,11 @@ mv clang-%{version} tools/clang # clang patches pushd tools/clang %patch2 -p0 -b .alignOf -#patch3 -p1 -b .add_gcc_ver popd +# Also disable AVX tests +rm test/CodeGen/X86/avx*.ll + # Encoding fix #(cd tools/clang/docs && \ # iconv -f ISO88591 -t UTF8 BlockImplementation.txt \