python2-clang subpkg (#1490997 )

tools-extras: tighten (internal) -libs dep %install: avoid cd
Fix Requires for git-clang-format and split into its own package
2017-10-10 11:07:34 -05:00 · 2017-09-05 18:27:20 +00:00 · 2017-08-24 13:29:31 +00:00 · 2017-08-24 00:06:49 +00:00 · 2017-05-11 10:34:06 +00:00 · 2017-05-11 10:33:55 +00:00
19 changed files with 325 additions and 1067 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,90 +12,3 @@
 /cfe-4.0.1.src.tar.xz
 /test-suite-4.0.1.src.tar.xz
 /clang-tools-extra-4.0.1.src.tar.xz
-/cfe-5.0.0.src.tar.xz
-/test-suite-5.0.0.src.tar.xz
-/clang-tools-extra-5.0.0.src.tar.xz
-/clang-tools-extra-5.0.1.src.tar.xz
-/cfe-5.0.1.src.tar.xz
-/test-suite-5.0.1.src.tar.xz
-/cfe-6.0.0rc1.src.tar.xz
-/clang-tools-extra-6.0.0rc1.src.tar.xz
-/test-suite-6.0.0rc1.src.tar.xz
-/cfe-6.0.0rc2.src.tar.xz
-/test-suite-6.0.0rc2.src.tar.xz
-/clang-tools-extra-6.0.0rc2.src.tar.xz
-/cfe-6.0.0.src.tar.xz
-/test-suite-6.0.0.src.tar.xz
-/clang-tools-extra-6.0.0.src.tar.xz
-/cfe-6.0.1rc1.src.tar.xz
-/clang-tools-extra-6.0.1rc1.src.tar.xz
-/test-suite-6.0.1rc1.src.tar.xz
-/cfe-6.0.1rc2.src.tar.xz
-/clang-tools-extra-6.0.1rc2.src.tar.xz
-/test-suite-6.0.1rc2.src.tar.xz
-/cfe-6.0.1.src.tar.xz
-/clang-tools-extra-6.0.1.src.tar.xz
-/test-suite-6.0.1.src.tar.xz
-/cfe-7.0.0rc1.src.tar.xz
-/test-suite-7.0.0rc1.src.tar.xz
-/clang-tools-extra-7.0.0rc1.src.tar.xz
-/test-suite-7.0.0rc1.src.fedora.tar.gz
-/test-suite-7.0.0rc1.src.fedora.tar.xz
-/cfe-7.0.0rc2.src.tar.xz
-/clang-tools-extra-7.0.0rc2.src.tar.xz
-/test-suite-7.0.0rc2.src.fedora.tar.xz
-/cfe-7.0.0rc3.src.tar.xz
-/clang-tools-extra-7.0.0rc3.src.tar.xz
-/test-suite-7.0.0rc3.src.fedora.tar.xz
-/cfe-7.0.0.src.tar.xz
-/test-suite-7.0.0.src.fedora.tar.xz
-/clang-tools-extra-7.0.0.src.tar.xz
-/clang-tools-extra-7.0.1.src.tar.xz
-/cfe-7.0.1.src.tar.xz
-/clang-tools-extra-8.0.0rc1.src.tar.xz
-/cfe-8.0.0rc1.src.tar.xz
-/cfe-8.0.0rc2.src.tar.xz
-/clang-tools-extra-8.0.0rc2.src.tar.xz
-/cfe-8.0.0rc3.src.tar.xz
-/clang-tools-extra-8.0.0rc3.src.tar.xz
-
-/cfe-8.0.0rc4.src.tar.xz
-/clang-tools-extra-8.0.0rc4.src.tar.xz
-/cfe-8.0.0.src.tar.xz
-/clang-tools-extra-8.0.0.src.tar.xz
-/cfe-9.0.0rc2.src.tar.xz
-/clang-tools-extra-9.0.0rc2.src.tar.xz
-/cfe-9.0.0rc3.src.tar.xz
-/clang-tools-extra-9.0.0rc3.src.tar.xz
-/cfe-9.0.0.src.tar.xz
-/clang-tools-extra-9.0.0.src.tar.xz
-/clang-9.0.1.src.tar.xz
-/clang-tools-extra-9.0.1.src.tar.xz
-/clang-10.0.0rc1.src.tar.xz
-/clang-tools-extra-10.0.0rc1.src.tar.xz
-/clang-10.0.0rc1.src.tar.xz.sig
-/clang-tools-extra-10.0.0rc1.src.tar.xz.sig
-/clang-10.0.0rc2.src.tar.xz
-/clang-tools-extra-10.0.0rc2.src.tar.xz
-/clang-tools-extra-10.0.0rc2.src.tar.xz.sig
-/clang-10.0.0rc2.src.tar.xz.sig
-/clang-10.0.0rc3.src.tar.xz
-/clang-tools-extra-10.0.0rc3.src.tar.xz
-/clang-tools-extra-10.0.0rc3.src.tar.xz.sig
-/clang-10.0.0rc3.src.tar.xz.sig
-/clang-10.0.0rc4.src.tar.xz
-/clang-tools-extra-10.0.0rc4.src.tar.xz
-/clang-tools-extra-10.0.0rc4.src.tar.xz.sig
-/clang-10.0.0rc4.src.tar.xz.sig
-/clang-10.0.0rc5.src.tar.xz
-/clang-tools-extra-10.0.0rc5.src.tar.xz
-/clang-tools-extra-10.0.0rc5.src.tar.xz.sig
-/clang-10.0.0rc5.src.tar.xz.sig
-/clang-10.0.0rc6.src.tar.xz
-/clang-tools-extra-10.0.0rc6.src.tar.xz
-/clang-tools-extra-10.0.0rc6.src.tar.xz.sig
-/clang-10.0.0rc6.src.tar.xz.sig
-/clang-10.0.0.src.tar.xz.sig
-/clang-tools-extra-10.0.0.src.tar.xz.sig
-/clang-tools-extra-10.0.0.src.tar.xz
-/clang-10.0.0.src.tar.xz
--- a/0001-CMake-Fix-pthread-handling-for-out-of-tree-builds.patch
+++ b/0001-CMake-Fix-pthread-handling-for-out-of-tree-builds.patch
@ -0,0 +1,36 @@
+From f5f712dfcac6ee99381c5aca212950276f1743e8 Mon Sep 17 00:00:00 2001
+From: Eric Fiselier <eric@efcs.ca>
+Date: Fri, 10 Feb 2017 01:59:20 +0000
+Subject: [PATCH] [CMake] Fix pthread handling for out-of-tree builds
+
+LLVM defines `PTHREAD_LIB` which is used by AddLLVM.cmake and various projects
+to correctly link the threading library when needed. Unfortunately
+`PTHREAD_LIB` is defined by LLVM's `config-ix.cmake` file which isn't installed
+and therefore can't be used when configuring out-of-tree builds. This causes
+such builds to fail since `pthread` isn't being correctly linked.
+
+This patch attempts to fix that problem by renaming and exporting
+`LLVM_PTHREAD_LIB` as part of`LLVMConfig.cmake`. I renamed `PTHREAD_LIB`
+because It seemed likely to cause collisions with downstream users of
+`LLVMConfig.cmake`.
+
+
+git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@294690 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ include-fixer/plugin/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include-fixer/plugin/CMakeLists.txt b/include-fixer/plugin/CMakeLists.txt
+index 2799fd4..df792ea 100644
+--- a/include-fixer/plugin/CMakeLists.txt
+++ b/include-fixer/plugin/CMakeLists.txt
+@@ -9,5 +9,5 @@ add_clang_library(clangIncludeFixerPlugin
+   clangParse
+   clangSema
+   clangTooling
+-  ${PTHREAD_LIB}
+  ${LLVM_PTHREAD_LIB}
+   )
+-- 
+1.8.3.1
+
--- a/0001-Make-funwind-tables-the-default-for-all-archs.patch
+++ b/0001-Make-funwind-tables-the-default-for-all-archs.patch
@ -1,39 +0,0 @@
-From 690373af5a5d50cf115ed6e4d2849bb786f9dc8e Mon Sep 17 00:00:00 2001
-From: serge-sans-paille <sguelton@redhat.com>
-Date: Tue, 10 Dec 2019 09:18:03 +0000
-Subject: [PATCH] Make -funwind-tables the default for all archs
-
---
- clang/lib/Driver/ToolChain.cpp      | 2 +-
- clang/lib/Driver/ToolChains/Gnu.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
-index b1fddb0af55..43af40ed0e8 100644
--- a/clang/lib/Driver/ToolChain.cpp
-+++ b/clang/lib/Driver/ToolChain.cpp
-@@ -244,7 +244,7 @@ std::string ToolChain::getInputFilename(const InputInfo &Input) const {
- }
- 
- bool ToolChain::IsUnwindTablesDefault(const ArgList &Args) const {
-  return false;
-+  return true;
- }
- 
- Tool *ToolChain::getClang() const {
-diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index 33cdd3585c2..15e82be8f3a 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -2535,7 +2535,7 @@ void Generic_GCC::printVerboseInfo(raw_ostream &OS) const {
- }
- 
- bool Generic_GCC::IsUnwindTablesDefault(const ArgList &Args) const {
-  return getArch() == llvm::Triple::x86_64;
-+  return true;
- }
- 
- bool Generic_GCC::isPICDefault() const {
-- 
-2.20.1
-
--- a/0001-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch
+++ b/0001-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch
@ -1,50 +0,0 @@
-From 09ae3ef5710a89505318ec721c65b6c838147276 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Thu, 7 Feb 2019 21:05:37 -0800
-Subject: [PATCH] ToolChain: Add -lgcc_s to the linker flags when using libc++
-
-The libc++ build for Fedora does not include an implementation of
-libunwind, so we need to explicitly link against something that
-provides this implementation.
---
- clang/lib/Driver/ToolChain.cpp | 1 +
- clang/test/Driver/netbsd.cpp   | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp
-index 88a627e..cb99844 100644
--- a/lib/Driver/ToolChain.cpp
-+++ b/lib/Driver/ToolChain.cpp
-@@ -767,6 +767,7 @@ void ToolChain::AddCXXStdlibLibArgs(const ArgList &Args,
-   switch (Type) {
-   case ToolChain::CST_Libcxx:
-     CmdArgs.push_back("-lc++");
-+    CmdArgs.push_back("-lgcc_s");
-     break;
- 
-   case ToolChain::CST_Libstdcxx:
-diff --git a/test/Driver/netbsd.cpp b/test/Driver/netbsd.cpp
-index 4af7d83..ff18c62 100644
--- a/test/Driver/netbsd.cpp
-+++ b/test/Driver/netbsd.cpp
-@@ -131,7 +131,7 @@
- // ARM-7: clang{{.*}}" "-cc1" "-triple" "armv5e-unknown-netbsd7.0.0-eabi"
- // ARM-7: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"
- // ARM-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}eabi{{/|\\\\}}crti.o"
-// ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc++" "-lm" "-lc"
-+// ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc++" "-lgcc_s" "-lm" "-lc"
- // ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
- 
- // AARCH64: clang{{.*}}" "-cc1" "-triple" "aarch64-unknown-netbsd"
-@@ -250,7 +250,7 @@
- // S-ARM-7: clang{{.*}}" "-cc1" "-triple" "armv5e-unknown-netbsd7.0.0-eabi"
- // S-ARM-7: ld{{.*}}" "--eh-frame-hdr" "-Bstatic"
- // S-ARM-7: "-o" "a.out" "{{.*}}/usr/lib{{/|\\\\}}crt0.o" "{{.*}}/usr/lib{{/|\\\\}}eabi{{/|\\\\}}crti.o"
-// S-ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc++" "-lm" "-lc"
-+// S-ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtbegin.o" "{{.*}}.o" "-lc++" "-lgcc_s" "-lm" "-lc"
- // S-ARM-7: "{{.*}}/usr/lib{{/|\\\\}}crtend.o" "{{.*}}/usr/lib{{/|\\\\}}crtn.o"
- 
- // S-AARCH64: clang{{.*}}" "-cc1" "-triple" "aarch64-unknown-netbsd"
-- 
-1.8.3.1
-
--- a/0001-clang-Don-t-install-static-libraries.patch
+++ b/0001-clang-Don-t-install-static-libraries.patch
@ -1,25 +0,0 @@
-From 856b789b9de0895786ba23681c4337172676e01e Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Fri, 31 Jan 2020 11:04:57 -0800
-Subject: [PATCH] clang: Don't install static libraries
-
---
- clang/cmake/modules/AddClang.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
-index cbd618e..9cf076a 100644
--- a/clang/cmake/modules/AddClang.cmake
-+++ b/clang/cmake/modules/AddClang.cmake
-@@ -97,7 +97,7 @@ macro(add_clang_library name)
-   if(TARGET ${name})
-     target_link_libraries(${name} INTERFACE ${LLVM_COMMON_LIBS})
- 
-    if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ARG_INSTALL_WITH_TOOLCHAIN)
-+    if (ARG_SHARED AND (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ARG_INSTALL_WITH_TOOLCHAIN))
-       set(export_to_clangtargets)
-       if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
-           "clang-libraries" IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
-- 
-1.8.3.1
-
--- a/0001-docs-Fix-Sphinx-detection-with-out-of-tree-builds.patch
+++ b/0001-docs-Fix-Sphinx-detection-with-out-of-tree-builds.patch
@ -0,0 +1,29 @@
+From 9d17579a4fa653627bfafa77621c3a89867da97d Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Tue, 9 May 2017 01:42:33 +0000
+Subject: [PATCH] docs: Fix Sphinx detection with out-of-tree builds
+
+Adapt to changes made in r302499.
+
+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@302500 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ docs/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index 13b79fdf..d2956c1 100644
+--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
+@@ -91,8 +91,8 @@ endif()
+ endif()
+ 
+ if (LLVM_ENABLE_SPHINX)
+  include(AddSphinxTarget)
+   if (SPHINX_FOUND)
+-    include(AddSphinxTarget)
+     if (${SPHINX_OUTPUT_HTML})
+       add_sphinx_target(html clang)
+       add_custom_command(TARGET docs-clang-html POST_BUILD
+-- 
+1.8.3.1
+
--- a/0001-lit.cfg-Remove-substitutions-for-clang-llvm-tools.patch
+++ b/0001-lit.cfg-Remove-substitutions-for-clang-llvm-tools.patch
@ -0,0 +1,73 @@
+From c4d409e8481e402eb34739c6579bd9ffe383f3cd Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Fri, 16 Jun 2017 00:48:27 +0000
+Subject: [PATCH] lit.cfg: Remove substitutions for clang/llvm tools
+
+We were missing some subsitutions, for example 'not with no pipe, so
+there was a mismatch where some tests would run tools using the full
+path and others would search PATH for the tool.
+
+The new beahavior is that the lit tests will always search PATH for the
+tool.  This should not change the current functionality, because the
+smae paths that were being used in substitutions are being added to
+PATH.
+---
+ test/lit.cfg | 42 ------------------------------------------
+ 1 file changed, 42 deletions(-)
+
+diff --git a/test/lit.cfg b/test/lit.cfg
+index 7d8bebf..9ded96c 100644
+--- a/test/lit.cfg
+++ b/test/lit.cfg
+@@ -303,48 +303,6 @@ config.substitutions.append(
+     (' %clang-cl ',
+      """*** invalid substitution, use '%clang_cl'. ***""") )
+ 
+-# For each occurrence of a clang tool name as its own word, replace it
+-# with the full path to the build directory holding that tool.  This
+-# ensures that we are testing the tools just built and not some random
+-# tools that might happen to be in the user's PATH.
+-tool_dirs = os.path.pathsep.join((clang_tools_dir, llvm_tools_dir))
+-
+-# Regex assertions to reject neighbor hyphens/dots (seen in some tests).
+-# For example, don't match 'clang-check-' or '.clang-format'.
+-NoPreHyphenDot = r"(?<!(-|\.))"
+-NoPostHyphenDot = r"(?!(-|\.))"
+-NoPostBar = r"(?!(/|\\))"
+-
+-tool_patterns = [r"\bFileCheck\b",
+-                 r"\bc-index-test\b",
+-                 NoPreHyphenDot + r"\bclang-check\b" + NoPostHyphenDot,
+-                 NoPreHyphenDot + r"\bclang-format\b" + NoPostHyphenDot,
+-                 # FIXME: Some clang test uses opt?
+-                 NoPreHyphenDot + r"\bopt\b" + NoPostBar + NoPostHyphenDot,
+-                 # Handle these specially as they are strings searched
+-                 # for during testing.
+-                 r"\| \bcount\b",
+-                 r"\| \bnot\b"]
+-
+-if config.clang_examples:
+-    tool_patterns.append(NoPreHyphenDot + r"\bclang-interpreter\b" + NoPostHyphenDot)
+-
+-for pattern in tool_patterns:
+-    # Extract the tool name from the pattern.  This relies on the tool
+-    # name being surrounded by \b word match operators.  If the
+-    # pattern starts with "| ", include it in the string to be
+-    # substituted.
+-    tool_match = re.match(r"^(\\)?((\| )?)\W+b([0-9A-Za-z-_]+)\\b\W*$",
+-                          pattern)
+-    tool_pipe = tool_match.group(2)
+-    tool_name = tool_match.group(4)
+-    tool_path = lit.util.which(tool_name, tool_dirs)
+-    if not tool_path:
+-        # Warn, but still provide a substitution.
+-        lit_config.note('Did not find ' + tool_name + ' in ' + tool_dirs)
+-        tool_path = clang_tools_dir + '/' + tool_name
+-    config.substitutions.append((pattern, tool_pipe + tool_path))
+-
+ ###
+ 
+ # Set available features we allow tests to conditionalize on.
+-- 
+2.9.3
+
--- a/0001-litsupport-Add-compatibility-cludge-so-it-still-work.patch
+++ b/0001-litsupport-Add-compatibility-cludge-so-it-still-work.patch
@ -0,0 +1,43 @@
+From 3306314bccdb3429a58fca198bec8d1a01cdf170 Mon Sep 17 00:00:00 2001
+From: Matthias Braun <matze@braunis.de>
+Date: Fri, 13 Jan 2017 18:36:20 +0000
+Subject: [PATCH] litsupport: Add compatibility cludge so it still works with
+ the pypy version of lit
+
+git-svn-id: https://llvm.org/svn/llvm-project/test-suite/trunk@291933 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ litsupport/testfile.py | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/litsupport/testfile.py b/litsupport/testfile.py
+index d1d234a..7223938 100644
+--- a/litsupport/testfile.py
+++ b/litsupport/testfile.py
+@@ -27,16 +27,19 @@ def parse(context, filename):
+     runscript = []
+     verifyscript = []
+     metricscripts = {}
+-    keywords = ['PREPARE:', 'RUN:', 'VERIFY:', 'METRIC:']
+    # Note that we keep both "RUN" and "RUN:" in the list to stay compatible
+    # with older lit versions.
+    keywords = ['PREPARE:', 'PREPARE', 'RUN:', 'RUN', 'VERIFY:', 'VERIFY',
+                'METRIC:', 'METRIC']
+     for line_number, command_type, ln in \
+             parseIntegratedTestScriptCommands(filename, keywords):
+-        if command_type == 'PREPARE:':
+        if command_type.startswith('PREPARE'):
+             _parseShellCommand(preparescript, ln)
+-        elif command_type == 'RUN:':
+        elif command_type.startswith('RUN'):
+             _parseShellCommand(runscript, ln)
+-        elif command_type == 'VERIFY:':
+        elif command_type.startswith('VERIFY'):
+             _parseShellCommand(verifyscript, ln)
+-        elif command_type == 'METRIC:':
+        elif command_type.startswith('METRIC'):
+             metric, ln = ln.split(':', 1)
+             metricscript = metricscripts.setdefault(metric.strip(), list())
+             _parseShellCommand(metricscript, ln)
+-- 
+2.9.3
+
--- a/0001-remark-diagnostics-codegen-Fix-PR44896.patch
+++ b/0001-remark-diagnostics-codegen-Fix-PR44896.patch
@ -1,99 +0,0 @@
-From 11857d49948b845dcfd7c7f78595095e3add012d Mon Sep 17 00:00:00 2001
-From: Rong Xu <xur@google.com>
-Date: Tue, 25 Feb 2020 08:04:01 -0800
-Subject: [PATCH] [remark][diagnostics] [codegen] Fix PR44896
-
-This patch fixes PR44896. For IR input files, option fdiscard-value-names
-should be ignored as we need named values in loadModule().
-Commit 60d3947922 sets this option after loadModule() where valued names
-already created. This creates an inconsistent state in setNameImpl()
-that leads to a seg fault.
-This patch forces fdiscard-value-names to be false for IR input files.
-
-This patch also emits a warning of "ignoring -fdiscard-value-names" if
-option fdiscard-value-names is explictly enabled in the commandline for
-IR input files.
-
-Differential Revision: https://reviews.llvm.org/D74878
---
- clang/include/clang/Basic/DiagnosticDriverKinds.td |  3 +++
- clang/lib/CodeGen/CodeGenAction.cpp                |  3 +++
- clang/lib/Driver/ToolChains/Clang.cpp              | 10 +++++++++-
- clang/test/CodeGen/PR44896.ll                      | 15 +++++++++++++++
- 4 files changed, 30 insertions(+), 1 deletion(-)
- create mode 100644 clang/test/CodeGen/PR44896.ll
-
-diff --git a/clang/include/clang/Basic/DiagnosticDriverKinds.td b/clang/include/clang/Basic/DiagnosticDriverKinds.td
-index ecd871e..48ece91 100644
--- a/clang/include/clang/Basic/DiagnosticDriverKinds.td
-+++ b/clang/include/clang/Basic/DiagnosticDriverKinds.td
-@@ -271,6 +271,9 @@ def warn_drv_unsupported_debug_info_opt_for_target : Warning<
-   InGroup<UnsupportedTargetOpt>;
- def warn_c_kext : Warning<
-   "ignoring -fapple-kext which is valid for C++ and Objective-C++ only">;
-+def warn_ignoring_fdiscard_for_bitcode : Warning<
-+  "ignoring -fdiscard-value-names for LLVM Bitcode">,
-+  InGroup<UnusedCommandLineArgument>;
- def warn_drv_input_file_unused : Warning<
-   "%0: '%1' input unused%select{ when '%3' is present|}2">,
-   InGroup<UnusedCommandLineArgument>;
-diff --git a/clang/lib/CodeGen/CodeGenAction.cpp b/clang/lib/CodeGen/CodeGenAction.cpp
-index 5ebc34c..81946b1 100644
--- a/clang/lib/CodeGen/CodeGenAction.cpp
-+++ b/clang/lib/CodeGen/CodeGenAction.cpp
-@@ -1146,6 +1146,9 @@ void CodeGenAction::ExecuteAction() {
-                            CI.getTargetOpts(), CI.getLangOpts(),
-                            CI.getFrontendOpts().ShowTimers,
-                            std::move(LinkModules), *VMContext, nullptr);
-+    // PR44896: Force DiscardValueNames as false. DiscardValueNames cannot be
-+    // true here because the valued names are needed for reading textual IR.
-+    Ctx.setDiscardValueNames(false);
-     Ctx.setDiagnosticHandler(
-         std::make_unique<ClangDiagnosticHandler>(CodeGenOpts, &Result));
-
-diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
-index 19a23c9..d387a1d 100644
--- a/clang/lib/Driver/ToolChains/Clang.cpp
-+++ b/clang/lib/Driver/ToolChains/Clang.cpp
-@@ -4332,8 +4332,16 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
- 
-   // Discard value names in assert builds unless otherwise specified.
-   if (Args.hasFlag(options::OPT_fdiscard_value_names,
-                   options::OPT_fno_discard_value_names, !IsAssertBuild))
-+                   options::OPT_fno_discard_value_names, !IsAssertBuild)) {
-+    if (Args.hasArg(options::OPT_fdiscard_value_names) &&
-+        (std::any_of(Inputs.begin(), Inputs.end(),
-+                     [](const clang::driver::InputInfo &II) {
-+                       return types::isLLVMIR(II.getType());
-+                     }))) {
-+      D.Diag(diag::warn_ignoring_fdiscard_for_bitcode);
-+    }
-     CmdArgs.push_back("-discard-value-names");
-+  }
- 
-   // Set the main file name, so that debug info works even with
-   // -save-temps.
-diff --git a/clang/test/CodeGen/PR44896.ll b/clang/test/CodeGen/PR44896.ll
-new file mode 100644
-index 0000000..a4d3445
--- /dev/null
-+++ b/clang/test/CodeGen/PR44896.ll
-@@ -0,0 +1,15 @@
-+; RUN: %clang -fdiscard-value-names -S %s -o /dev/null 2>&1 | FileCheck --check-prefix=WARNING %s
-+; RUN: %clang -S %s -o /dev/null 2>&1 | FileCheck --check-prefix=NOWARNING %s
-+; RUN: %clang_cc1 -S -emit-llvm %s -discard-value-names -o /dev/null
-+; PR 44896
-+
-+; WARNING: ignoring -fdiscard-value-names for LLVM Bitcode
-+; NOWARNING-NOT: ignoring -fdiscard-value-names for LLVM Bitcode
-+
-+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
-+target triple = "x86_64--linux-gnu"
-+
-+define linkonce i8* @b(i8* %a) {
-+  ret i8* %a
-+}
-+
-- 
-1.8.3.1
-
--- a/0001-test-Remove-FileCheck-not-count-dependencies.patch
+++ b/0001-test-Remove-FileCheck-not-count-dependencies.patch
@ -0,0 +1,27 @@
+From 0d272ed9be35fcd1992b08a9026a74d18cf1d7ec Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Thu, 15 Jun 2017 16:33:25 -0400
+Subject: [PATCH] test: Remove FileCheck, not, count dependencies
+
+clang already adds these as dependencies for lit.
+---
+ test/CMakeLists.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index a9d7b7c..1a8930a 100644
+--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
+@@ -31,9 +31,6 @@ if(CLANG_TOOLS_TEST_USE_VG)
+ endif()
+ 
+ set(CLANG_TOOLS_TEST_DEPS
+-  # Base line deps.
+-  FileCheck count not
+-
+   # clang-tidy tests require it.
+   clang-headers
+ 
+-- 
+1.8.3.1
+
--- a/0002-gtest-reorg.patch
+++ b/0002-gtest-reorg.patch
@ -1,42 +0,0 @@
-From 1f26a0284925859b72ee520ce74452d77d822409 Mon Sep 17 00:00:00 2001
-From: serge-sans-paille <sguelton@redhat.com>
-Date: Mon, 28 Jan 2019 19:12:27 +0000
-Subject: [PATCH 2/2] [PATCH] gtest reorg
-
---
- CMakeLists.txt | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c2016a45ca..48ea3c3bb9 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -157,12 +157,6 @@ Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
-         set(LLVM_UTILS_PROVIDED ON)
-         set(CLANG_TEST_DEPS FileCheck count not)
-       endif()
-      set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
-      if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h
-          AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
-          AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt)
-        add_subdirectory(${UNITTEST_DIR} utils/unittest)
-      endif()
-     else()
-       # Seek installed Lit.
-       find_program(LLVM_LIT
-@@ -507,7 +501,11 @@ endif()
- 
- 
- if( CLANG_INCLUDE_TESTS )
-  if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include/gtest/gtest.h)
-+  set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
-+  if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h
-+      AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
-+      AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt)
-+    add_subdirectory(${UNITTEST_DIR} utils/unittest)
-     add_subdirectory(unittests)
-     list(APPEND CLANG_TEST_DEPS ClangUnitTests)
-     list(APPEND CLANG_TEST_PARAMS
-- 
-2.19.2
-
--- a/clang-config.h
+++ b/clang-config.h
@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "config-32.h"
+#elif __WORDSIZE == 64
+#include "config-64.h"
+#else
+#error "Unknown word size"
+#endif
--- a/clang.spec
+++ b/clang.spec
@ -1,145 +1,70 @@
-%global compat_build 0
-
-%global maj_ver 10
-%global min_ver 0
-%global patch_ver 0
-#%%global rc_ver 6
-%global baserelease 1
-
 %global clang_tools_binaries \
 	%{_bindir}/clang-apply-replacements \
 	%{_bindir}/clang-change-namespace \
-	%{_bindir}/clang-check \
-	%{_bindir}/clang-doc \
-	%{_bindir}/clang-extdef-mapping \
-	%{_bindir}/clang-format \
-	%{_bindir}/clang-import-test \
 	%{_bindir}/clang-include-fixer \
-	%{_bindir}/clang-move \
-	%{_bindir}/clang-offload-bundler \
-	%{_bindir}/clang-offload-wrapper \
 	%{_bindir}/clang-query \
-	%{_bindir}/clang-refactor \
-	%{_bindir}/clang-rename \
 	%{_bindir}/clang-reorder-fields \
-	%{_bindir}/clang-scan-deps \
-	%{_bindir}/clang-tidy \
-	%{_bindir}/clangd \
-	%{_bindir}/diagtool \
-	%{_bindir}/hmaptool \
-	%{_bindir}/pp-trace
+	%{_bindir}/clang-rename \
+	%{_bindir}/clang-tidy

 %global clang_binaries \
 	%{_bindir}/clang \
 	%{_bindir}/clang++ \
-	%{_bindir}/clang-%{maj_ver} \
-	%{_bindir}/clang++-%{maj_ver} \
+	%{_bindir}/clang-4.0 \
+	%{_bindir}/clang-check \
 	%{_bindir}/clang-cl \
 	%{_bindir}/clang-cpp \
+	%{_bindir}/clang-format \
+	%{_bindir}/clang-import-test \
+	%{_bindir}/clang-offload-bundler

-%if 0%{?compat_build}
-%global pkg_name clang%{maj_ver}.%{min_ver}
-# Install clang to same prefix as llvm, so that apps that use llvm-config
-# will also be able to find clang libs.
-%global install_prefix %{_libdir}/llvm%{maj_ver}.%{min_ver}
-%global install_bindir %{install_prefix}/bin
-%global install_includedir %{install_prefix}/include
-%global install_libdir %{install_prefix}/lib
-
-%global pkg_bindir %{install_bindir}
-%global pkg_includedir %{_includedir}/llvm%{maj_ver}.%{min_ver}
-%global pkg_libdir %{install_libdir}
-%else
-%global pkg_name clang
-%global install_prefix /usr
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} > 7
+%if 0%{?fedora}
 %bcond_without python3
 %else
 %bcond_with python3
 %endif

-%global build_install_prefix %{buildroot}%{install_prefix}
-
-%ifarch ppc64le
-# Too many threads on ppc64 systems causes OOM errors.
-%global _smp_mflags -j8
-%endif
-
-%global clang_srcdir clang-%{version}%{?rc_ver:rc%{rc_ver}}.src
-%global clang_tools_srcdir clang-tools-extra-%{version}%{?rc_ver:rc%{rc_ver}}.src
-
-Name:		%pkg_name
-Version:	%{maj_ver}.%{min_ver}.%{patch_ver}
-Release:	%{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist}
+Name:		clang
+Version:	4.0.1
+Release:	6%{?dist}
 Summary:	A C language family front-end for LLVM

 License:	NCSA
 URL:		http://llvm.org
-%if 0%{?rc_ver:1}
-Source0:	https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{clang_srcdir}.tar.xz
-Source3:	https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{clang_srcdir}.tar.xz.sig
-%else
-Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{clang_srcdir}.tar.xz
-Source3:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{clang_srcdir}.tar.xz.sig
-%endif
-%if !0%{?compat_build}
-%if 0%{?rc_ver:1}
-Source1:	https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{clang_tools_srcdir}.tar.xz
-Source2:	https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{clang_tools_srcdir}.tar.xz.sig
-%else
-Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{clang_tools_srcdir}.tar.xz
-Source2:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{clang_tools_srcdir}.tar.xz.sig
-%endif
-%endif
-Source4:	https://prereleases.llvm.org/%{version}/hans-gpg-key.asc
+Source0:	http://llvm.org/releases/%{version}/cfe-%{version}.src.tar.xz
+Source1:	http://llvm.org/releases/%{version}/clang-tools-extra-%{version}.src.tar.xz
+Source2:	http://llvm.org/releases/%{version}/test-suite-%{version}.src.tar.xz

-Patch4:		0002-gtest-reorg.patch
-Patch11:	0001-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch
-Patch13:	0001-Make-funwind-tables-the-default-for-all-archs.patch
+Source100:	clang-config.h

-# Not Upstream
-Patch15:	0001-clang-Don-t-install-static-libraries.patch
+# This patch is required when the test suite is using python-lit 0.5.0.
+Patch1:		0001-litsupport-Add-compatibility-cludge-so-it-still-work.patch
+Patch2:		0001-docs-Fix-Sphinx-detection-with-out-of-tree-builds.patch
+Patch3:		0001-test-Remove-FileCheck-not-count-dependencies.patch
+Patch4:		0001-lit.cfg-Remove-substitutions-for-clang-llvm-tools.patch

-BuildRequires:	gcc
-BuildRequires:	gcc-c++
 BuildRequires:	cmake
-BuildRequires:	ninja-build
-%if 0%{?compat_build}
-BuildRequires:	llvm%{maj_ver}.%{min_ver}-devel = %{version}
-BuildRequires:	llvm%{maj_ver}.%{min_ver}-static = %{version}
-%else
 BuildRequires:	llvm-devel = %{version}
-BuildRequires:	llvm-test = %{version}
+BuildRequires:	libxml2-devel
 # llvm-static is required, because clang-tablegen needs libLLVMTableGen, which
 # is not included in libLLVM.so.
-BuildRequires:	llvm-static = %{version}
-BuildRequires:	llvm-googletest = %{version}
-%endif
-
-BuildRequires:	libxml2-devel
-BuildRequires:	perl-generators
-BuildRequires:	ncurses-devel
-# According to https://fedoraproject.org/wiki/Packaging:Emacs a package
-# should BuildRequires: emacs if it packages emacs integration files.
-BuildRequires:	emacs
+BuildRequires:  llvm-static = %{version}
+BuildRequires:  perl-generators
+BuildRequires:  ncurses-devel

 # These build dependencies are required for the test suite.
 %if %with python3
-# The testsuite uses /usr/bin/lit which is part of the python3-lit package.
-BuildRequires:	python3-lit
+BuildRequires:  python3-lit
+%else
+BuildRequires:  python2-lit
 %endif

-BuildRequires:	python3-sphinx
-BuildRequires:	libatomic
+BuildRequires: zlib-devel
+BuildRequires: tcl
+BuildRequires: python-virtualenv
+BuildRequires: libstdc++-static
+BuildRequires: python3-sphinx

-# We need python3-devel for pathfix.py.
-BuildRequires:	python3-devel
-
-# Needed for %%multilib_fix_c_header
-BuildRequires:	multilib-rpm-config
-BuildRequires: chrpath

 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}

@ -149,12 +74,6 @@ Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 Requires:	libstdc++-devel
 Requires:	gcc-c++

-Requires:	emacs-filesystem
-
-Provides:	clang(major) = %{maj_ver}
-
-Conflicts:	compiler-rt < %{version}
-Conflicts:	compiler-rt > %{version}

 %description
 clang: noun
@ -168,33 +87,26 @@ as libraries and designed to be loosely-coupled and extensible.

 %package libs
 Summary: Runtime library for clang
-Recommends: compiler-rt%{?_isa} = %{version}
-# libomp-devel is required, so clang can find the omp.h header when compiling
-# with -fopenmp.
-Recommends: libomp-devel%{_isa} = %{version}
-Recommends: libomp%{_isa} = %{version}
+Requires: compiler-rt%{?_isa} >= %{version}

 %description libs
 Runtime library for clang.

 %package devel
-Summary: Development header files for clang
-%if !0%{?compat_build}
+Summary: Development header files for clang.
 Requires: %{name}%{?_isa} = %{version}-%{release}
-# The clang CMake files reference tools from clang-tools-extra.
-Requires: %{name}-tools-extra%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-%endif

 %description devel
 Development header files for clang.

-%if !0%{?compat_build}
 %package analyzer
 Summary:	A source code analysis framework
 License:	NCSA and MIT
 BuildArch:	noarch
 Requires:	%{name} = %{version}-%{release}
+# not picked up automatically since files are currently not installed in
+# standard Python hierarchies yet
+Requires:	python

 %description analyzer
 The Clang Static Analyzer consists of both a source code analysis
@ -203,240 +115,143 @@ programs. The standalone tool is invoked from the command-line, and is
 intended to run in tandem with a build of a project or code base.

 %package tools-extra
-Summary:	Extra tools for clang
-Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
-Requires:	emacs-filesystem
+Summary: Extra tools for clang
+Requires: llvm-libs%{?_isa} = %{version}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}

 %description tools-extra
 A set of extra tools built using Clang's tooling API.

-# Put git-clang-format in its own package, because it Requires git
+# Put git-clang-format in its own package, because it Requires git and python2
 # and we don't want to force users to install all those dependenices if they
 # just want clang.
 %package -n git-clang-format
-Summary:	Integration of clang-format for git
-Requires:	%{name}-tools-extra = %{version}-%{release}
-Requires:	git
-Requires:	python3
+Summary: clang-format integration for git
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: git
+Requires: python2

 %description -n git-clang-format
 clang-format integration for git.

-
-%package -n python3-clang
-Summary:       Python3 bindings for clang
-Requires:      %{name}-libs%{?_isa} = %{version}-%{release}
-Requires:      python3
-%description -n python3-clang
+%package -n python2-clang
+Summary: Python2 bindings for clang
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: python2
+%description -n python2-clang
 %{summary}.


-%endif
-
-
 %prep
-%if 0%{?compat_build}
-%autosetup -n %{clang_srcdir} -p1
-%else
-%setup -T -q -b 1 -n %{clang_tools_srcdir}
+%setup -T -q -b 1 -n clang-tools-extra-%{version}.src
+%patch3 -p1 -b .lit-dep-fix

+%setup -T -q -b 2 -n test-suite-%{version}.src
+%patch1 -p1 -b .lit-fix

-pathfix.py -i %{__python3} -pn \
-	clang-tidy/tool/*.py \
-	clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
+%setup -q -n cfe-%{version}.src
+%patch2 -p1 -b .docs-fix
+%patch4 -p1 -b .lit-tools-fix

-%setup -q -n %{clang_srcdir}
-
-%patch4 -p1 -b .gtest
-%patch11 -p1 -b .libcxx-fix
-%patch13 -p2 -b .unwind-all
-%patch15 -p2 -b .no-install-static
-
-mv ../%{clang_tools_srcdir} tools/extra
-
-pathfix.py -i %{__python3} -pn \
-	tools/clang-format/*.py \
-	tools/clang-format/git-clang-format \
-	utils/hmaptool/hmaptool \
-	tools/scan-view/bin/scan-view
-%endif
+mv ../clang-tools-extra-%{version}.src tools/extra

 %build
-
-%if 0%{?__isa_bits} == 64
-sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@/64/g' test/lit.cfg.py
-%else
-sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py
-%endif
-
 mkdir -p _build
 cd _build
-
-%ifarch s390 s390x %{arm} %ix86 ppc64le
-# Decrease debuginfo verbosity to reduce memory consumption during final library linking
-%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
-%endif
-
-# -DCMAKE_INSTALL_RPATH=";" is a workaround for llvm manually setting the
-# rpath of libraries and binaries.  llvm will skip the manual setting
-# if CAMKE_INSTALL_RPATH is set to a value, but cmake interprets this value
-# as nothing, so it sets the rpath to "" when installing.
-%cmake .. -G Ninja \
-	-DLLVM_PARALLEL_LINK_JOBS=1 \
+%cmake .. \
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-	-DPYTHON_EXECUTABLE=%{__python3} \
-	-DCMAKE_INSTALL_RPATH:BOOL=";" \
-%ifarch s390 s390x %{arm} %ix86 ppc64le
-	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
-	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
-%endif
-%if 0%{?compat_build}
-	-DLLVM_CONFIG:FILEPATH=%{_bindir}/llvm-config-%{maj_ver}.%{min_ver}-%{__isa_bits} \
-	-DCMAKE_INSTALL_PREFIX=%{install_prefix} \
-	-DCLANG_INCLUDE_TESTS:BOOL=OFF \
-%else
-	-DCLANG_INCLUDE_TESTS:BOOL=ON \
-	-DLLVM_EXTERNAL_LIT=%{_bindir}/lit \
-	-DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \
-%if 0%{?__isa_bits} == 64
-	-DLLVM_LIBDIR_SUFFIX=64 \
-%else
-	-DLLVM_LIBDIR_SUFFIX= \
-%endif
-%endif
+	-DLLVM_CONFIG:FILEPATH=/usr/bin/llvm-config-%{__isa_bits} \
 	\
-%if !0%{compat_build}
-	-DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen \
-%else
-	-DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen-%{maj_ver}.%{min_ver} \
-%endif
 	-DCLANG_ENABLE_ARCMT:BOOL=ON \
 	-DCLANG_ENABLE_STATIC_ANALYZER:BOOL=ON \
 	-DCLANG_INCLUDE_DOCS:BOOL=ON \
+	-DCLANG_INCLUDE_TESTS:BOOL=ON \
 	-DCLANG_PLUGIN_SUPPORT:BOOL=ON \
 	-DENABLE_LINKER_BUILD_ID:BOOL=ON \
 	-DLLVM_ENABLE_EH=ON \
 	-DLLVM_ENABLE_RTTI=ON \
 	-DLLVM_BUILD_DOCS=ON \
 	-DLLVM_ENABLE_SPHINX=ON \
-	-DCLANG_LINK_CLANG_DYLIB=ON \
 	-DSPHINX_WARNINGS_AS_ERRORS=OFF \
 	\
 	-DCLANG_BUILD_EXAMPLES:BOOL=OFF \
-	-DBUILD_SHARED_LIBS=OFF \
-	-DCLANG_REPOSITORY_STRING="%{?fedora:Fedora}%{?rhel:Red Hat} %{version}-%{release}"
+%if 0%{?__isa_bits} == 64
+        -DLLVM_LIBDIR_SUFFIX=64 \
+%else
+        -DLLVM_LIBDIR_SUFFIX= \
+%endif
+	-DLIB_SUFFIX=

-%ninja_build
+make %{?_smp_mflags}

 %install
-%ninja_install -C _build
+make install DESTDIR=%{buildroot} -C _build

-%if 0%{?compat_build}
-
-# Remove binaries/other files
-rm -Rf %{buildroot}%{install_bindir}
-rm -Rf %{buildroot}%{install_prefix}/share
-rm -Rf %{buildroot}%{install_prefix}/libexec
-
-# Move include files
-mkdir -p %{buildroot}%{pkg_includedir}
-mv  %{buildroot}/%{install_includedir}/clang %{buildroot}/%{pkg_includedir}/
-mv  %{buildroot}/%{install_includedir}/clang-c %{buildroot}/%{pkg_includedir}/
-
-%else
+sed -i -e 's~#!/usr/bin/env python~#!%{_bindir}/python2~' %{buildroot}%{_bindir}/git-clang-format

 # install clang python bindings
-mkdir -p %{buildroot}%{python3_sitelib}/clang/
-install -p -m644 bindings/python/clang/* %{buildroot}%{python3_sitelib}/clang/
-%py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/clang
+mkdir -p %{buildroot}%{python2_sitelib}/clang/
+install -p -m644 bindings/python/clang/* %{buildroot}%{python2_sitelib}/clang/

 # multilib fix
-%multilib_fix_c_header --file %{_includedir}/clang/Config/config.h
-
-# Move emacs integration files to the correct directory
-mkdir -p %{buildroot}%{_emacs_sitestartdir}
-for f in clang-format.el clang-rename.el clang-include-fixer.el; do
-mv %{buildroot}{%{_datadir}/clang,%{_emacs_sitestartdir}}/$f
-done
+mv -v %{buildroot}%{_includedir}/clang/Config/config{,-%{__isa_bits}}.h
+install -m 0644 %{SOURCE100} %{buildroot}%{_includedir}/clang/Config/config.h

 # remove editor integrations (bbedit, sublime, emacs, vim)
 rm -vf %{buildroot}%{_datadir}/clang/clang-format-bbedit.applescript
 rm -vf %{buildroot}%{_datadir}/clang/clang-format-sublime.py*
+rm -vf %{buildroot}%{_datadir}/clang/clang-format.el
+rm -vf %{buildroot}%{_datadir}/clang/clang-format.py*
+# clang-tools-extra
+rm -vf %{buildroot}%{_datadir}/clang/clang-include-fixer.py
+rm -vf %{buildroot}%{_datadir}/clang/clang-tidy-diff.py
+rm -vf %{buildroot}%{_datadir}/clang/run-clang-tidy.py
+rm -vf %{buildroot}%{_datadir}/clang/run-find-all-symbols.py
+rm -vf %{buildroot}%{_datadir}/clang/clang-include-fixer.el
+rm -vf %{buildroot}%{_datadir}/clang/clang-rename.el
+rm -vf %{buildroot}%{_datadir}/clang/clang-rename.py
+# remove diff reformatter
+rm -vf %{buildroot}%{_datadir}/clang/clang-format-diff.py*

 # TODO: Package html docs
 rm -Rvf %{buildroot}%{_pkgdocdir}
-rm -Rvf %{buildroot}%{install_prefix}/share/clang/clang-doc-default-stylesheet.css
-rm -Rvf %{buildroot}%{install_prefix}/share/clang/index.js
-
-# TODO: What are the Fedora guidelines for packaging bash autocomplete files?
-rm -vf %{buildroot}%{_datadir}/clang/bash-autocomplete.sh
-
-# Create Manpage symlinks
-ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang++.1.gz
-ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang-%{maj_ver}.1.gz
-ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang++-%{maj_ver}.1.gz
-
-# Add clang++-{version} symlink
-ln -s clang++ %{buildroot}%{_bindir}/clang++-%{maj_ver}
-
-
-# Fix permission
-chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1*
-
-%endif

 %check
-%if !0%{?compat_build}
 # requires lit.py from LLVM utilities
-# FIXME: Fix failing ARM tests, s390x i686 and ppc64le tests
-# FIXME: Ignore test failures until rhbz#1715016 is fixed.
-LD_LIBRARY_PATH=%{buildroot}%{_libdir} ninja check-all -C _build || \
-%ifarch s390x i686 ppc64le %{arm}
-:
-%else
-:
-%endif
+cd _build
+PATH=%{_libdir}/llvm:$PATH make check-clang

-%endif
+mkdir -p %{_builddir}/test-suite-%{version}.src/_build
+cd %{_builddir}/test-suite-%{version}.src/_build
+
+# FIXME: Using the cmake macro adds -Werror=format-security to the C/CXX flags,
+# which causes the test suite to fail to build.
+cmake .. -DCMAKE_C_COMPILER=%{buildroot}/usr/bin/clang \
+         -DCMAKE_CXX_COMPILER=%{buildroot}/usr/bin/clang++
+make %{?_smp_mflags} check || :


-%if !0%{?compat_build}
 %files
+%{_libdir}/clang/
 %{clang_binaries}
+%{_bindir}/c-index-test
 %{_mandir}/man1/clang.1.gz
-%{_mandir}/man1/clang++.1.gz
-%{_mandir}/man1/clang-%{maj_ver}.1.gz
-%{_mandir}/man1/clang++-%{maj_ver}.1.gz
-%endif

 %files libs
-%if !0%{?compat_build}
-%{_libdir}/clang/
 %{_libdir}/*.so.*
-%else
-%{pkg_libdir}/*.so.*
-%{pkg_libdir}/clang/%{version}
-%endif
+%{_libdir}/*.so

 %files devel
-%if !0%{?compat_build}
-%{_libdir}/*.so
 %{_includedir}/clang/
 %{_includedir}/clang-c/
 %{_libdir}/cmake/*
 %dir %{_datadir}/clang/
-%else
-%{pkg_libdir}/*.so
-%{pkg_includedir}/clang/
-%{pkg_includedir}/clang-c/
-%{pkg_libdir}/cmake/
-%endif

-%if !0%{?compat_build}
 %files analyzer
 %{_bindir}/scan-view
 %{_bindir}/scan-build
+%{_bindir}/scan-build
 %{_libexecdir}/ccc-analyzer
 %{_libexecdir}/c++-analyzer
 %{_datadir}/scan-view/
@ -445,301 +260,16 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ninja check-all -C _build || \

 %files tools-extra
 %{clang_tools_binaries}
-%{_bindir}/c-index-test
 %{_bindir}/find-all-symbols
 %{_bindir}/modularize
-%{_mandir}/man1/diagtool.1.gz
-%{_emacs_sitestartdir}/clang-format.el
-%{_emacs_sitestartdir}/clang-rename.el
-%{_emacs_sitestartdir}/clang-include-fixer.el
-%{_datadir}/clang/clang-format.py*
-%{_datadir}/clang/clang-format-diff.py*
-%{_datadir}/clang/clang-include-fixer.py*
-%{_datadir}/clang/clang-tidy-diff.py*
-%{_datadir}/clang/run-clang-tidy.py*
-%{_datadir}/clang/run-find-all-symbols.py*
-%{_datadir}/clang/clang-rename.py*

 %files -n git-clang-format
 %{_bindir}/git-clang-format

-%files -n python3-clang
-%{python3_sitelib}/clang/
+%files -n python2-clang
+%{python2_sitelib}/clang/

-
-%endif
 %changelog
-* Thu Mar 26 2020 sguelton@redhat.com - 10.0.0-1
- 10.0.0 final
-
-* Tue Mar 24 2020 sguelton@redhat.com - 10.0.0-0.11.rc6
- 10.0.0 rc6
-
-* Sun Mar 22 2020 sguelton@redhat.com - 10.0.0-0.10.rc5
- Update git-clang-format dependency, see rhbz#1815913
-
-* Fri Mar 20 2020 Tom Stellard <tstellar@redhat.com> - 10.0.0-0.9.rc5
- Add dependency on libomp-devel
-
-* Fri Mar 20 2020 sguelton@redhat.com - 10.0.0-0.8.rc5
- 10.0.0 rc5
-
-* Sat Mar 14 2020 sguelton@redhat.com - 10.0.0-0.7.rc4
- 10.0.0 rc4
-
-* Thu Mar 12 2020 sguelton@redhat.com - 10.0.0-0.6.rc3
- Move a few files from clang to clang-tools-extra.
-
-* Thu Mar 05 2020 sguelton@redhat.com - 10.0.0-0.5.rc3
- 10.0.0 rc3
-
-* Tue Feb 25 2020 sguelton@redhat.com - 10.0.0-0.4.rc2
- Apply -fdiscard-value-names patch.
-
-* Mon Feb 17 2020 sguelton@redhat.com - 10.0.0-0.3.rc2
- Fix NVR
-
-* Fri Feb 14 2020 sguelton@redhat.com - 10.0.0-0.1.rc2
- 10.0.0 rc2
-
-* Tue Feb 11 2020 sguelton@redhat.com - 10.0.0-0.2.rc1
- Explicitly conflicts with any different compiler-rt version, see rhbz#1800705
-
-* Fri Jan 31 2020 Tom Stellard <tstellar@redhat.com> - 10.0.0-0.1.rc1
- Stop shipping individual component libraries
- https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package
-
-* Fri Jan 31 2020 sguelton@redhat.com - 10.0.0-0.1.rc1
- 10.0.0 rc1
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jan 10 2020 Tom Stellard <tstellar@redhat.com> - 9.0.1-2
- Fix crash with kernel bpf self-tests
-
-* Thu Dec 19 2019 Tom Stellard <tstellar@redhat.com> - 9.0.1-1
- 9.0.1 Release
-
-* Wed Dec 11 2019 Tom Stellard <tstellar@redhat.com> - 9.0.0-3
- Add explicit requires for clang-libs to fix rpmdiff errors
-
-* Tue Dec 10 2019 sguelton@redhat.com - 9.0.0-2
- Activate -funwind-tables on all arches, see rhbz#1655546.
-
-* Thu Sep 19 2019 Tom Stellard <tstellar@redhat.com> - 9.0.0-1
- 9.0.0 Release
-
-* Wed Sep 11 2019 Tom Stellard <tstellar@redhat.com> - 9.0.0-0.2.rc3
- Reduce debug info verbosity on ppc64le to avoid OOM errors in koji
-
-* Thu Aug 22 2019 Tom Stellard <tstellar@redhat.com> - 9.0.0-0.1.rc3
- 9.0.0 Release candidate 3
-
-* Tue Aug 20 2019 sguelton@redhat.com - 8.0.0-4
- Rebuilt for Python 3.8
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 8.0.0-3.2
- Rebuilt for Python 3.8
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.0-3.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu May 16 2019 sguelton@redhat.com - 8.0.0-3
- Fix for rhbz#1674031
-
-* Fri Apr 12 2019 sguelton@redhat.com - 8.0.0-2
- Remove useless patch thanks to GCC upgrade
-
-* Wed Mar 20 2019 sguelton@redhat.com - 8.0.0-1
- 8.0.0 final
-
-* Tue Mar 12 2019 sguelton@redhat.com - 8.0.0-0.6.rc4
- 8.0.0 Release candidate 4
-
-* Mon Mar 4 2019 sguelton@redhat.com - 8.0.0-0.5.rc3
- Cleanup specfile after llvm dependency update
-
-* Mon Mar 4 2019 sguelton@redhat.com - 8.0.0-0.4.rc3
- 8.0.0 Release candidate 3
-
-* Mon Feb 25 2019 tstellar@redhat.com - 8.0.0-0.3.rc2
- Fix compiling with -stdlib=libc++
-
-* Thu Feb 21 2019 sguelton@redhat.com - 8.0.0-0.2.rc2
- 8.0.0 Release candidate 2
-
-* Sat Feb 09 2019 sguelton@redhat.com - 8.0.0-0.1.rc1
- 8.0.0 Release candidate 1
-
-* Tue Feb 05 2019 sguelton@redhat.com - 7.0.1-6
- Update patch for Python3 port of scan-view
-
-* Tue Feb 05 2019 sguelton@redhat.com - 7.0.1-5
- Working CI test suite
-
-* Mon Feb 04 2019 sguelton@redhat.com - 7.0.1-4
- Workaround gcc-9 bug when compiling bitfields
-
-* Fri Feb 01 2019 sguelton@redhat.com - 7.0.1-3
- Fix uninitialized error detected by gcc-9
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.1-2.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Dec 19 2018 Tom Stellard <tstellar@redhat.com> - 7.0.1-2
- Fix for rhbz#1657544
-
-* Tue Dec 18 2018 sguelton@redhat.com - 7.0.1-1
- 7.0.1
-
-* Tue Dec 18 2018 sguelton@redhat.com - 7.0.0-10
- Install proper manpage symlinks for clang/clang++ versions
-
-* Fri Dec 14 2018 sguelton@redhat.com - 7.0.0-9
- No longer Ignore -fstack-clash-protection option
-
-* Tue Dec 04 2018 sguelton@redhat.com - 7.0.0-8
- Ensure rpmlint passes on specfile
-
-* Fri Nov 30 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-7
- Drop python2 dependency from clang-tools-extra
-
-* Wed Nov 21 2018 sguelton@redhat.com - 7.0.0-6
- Prune unneeded reference to llvm-test-suite sub-package
-
-* Mon Nov 19 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-5
- Run 'make check-all' instead of 'make check-clang'
-
-* Mon Nov 19 2018 sergesanspaille <sguelton@redhat.com> - 7.0.0-4
- Avoid Python2 + Python3 dependency for clang-analyzer
-
-* Mon Nov 05 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-3
- User helper macro to fixup config.h for multilib
-
-* Tue Oct 02 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-2
- Use correct shebang substitution for python scripts
-
-* Mon Sep 24 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-1
- 7.0.0 Release
-
-* Wed Sep 19 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.16.rc3
- Move builtin headers into clang-libs sub-package
-
-* Wed Sep 19 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.15.rc3
- Remove ambiguous python shebangs
-
-* Thu Sep 13 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.14.rc3
- Move unversioned shared objects to devel package
-
-* Thu Sep 13 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.13.rc3
- Rebuild with new llvm-devel that disables rpath on install
-
-* Thu Sep 13 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.12.rc3
- Fix clang++-7 symlink
-
-* Wed Sep 12 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.11.rc3
- 7.0.0-rc3 Release
-
-* Mon Sep 10 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.10.rc2
- Drop siod from llvm-test-suite
-
-* Fri Sep 07 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.9.rc2
- Drop python2 dependency from clang package
-
-* Thu Sep 06 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.8.rc2
- Drop all uses of python2 from lit tests
-
-* Sat Sep 01 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.7.rc2
- Add Fedora specific version string
-
-* Tue Aug 28 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.6.rc2
- 7.0.0-rc2 Release
-
-* Tue Aug 28 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.5.rc1
- Enable unit tests
-
-* Fri Aug 17 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.4.rc1
- Move llvm-test-suite into a sub-package
-
-* Fri Aug 17 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.3.rc1
- Recommend the same version of compiler-rt
-
-* Wed Aug 15 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.2.rc1
- Rebuild for f30
-
-* Mon Aug 13 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.1.rc1
- 7.0.0-rc1 Release
-
-* Mon Jul 23 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-3
- Sync spec file with the clang6.0 package
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 26 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-1
- 6.0.1 Release
-
-* Wed Jun 13 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-0.2.rc2
- 6.0.1-rc2
-
-* Fri May 11 2018 Tom Stellard <tstellar@redhat.com> - 6.0.1-0.1.rc1
- 6.0.1-rc1 Release
-
-* Fri Mar 23 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-5
- Add a clang++-{version} symlink rhbz#1534098
-
-* Thu Mar 22 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-4
- Use correct script for running lit tests
-
-* Wed Mar 21 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-3
- Fix toolchain detection so we don't default to using cross-compilers:
-  rhbz#1482491
-
-* Mon Mar 12 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-2
- Add Provides: clang(major) rhbz#1547444
-
-* Fri Mar 09 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-1
- 6.0.0 Release
-
-* Mon Feb 12 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-0.6.rc2
- 6.0.0-rc2 Release
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-0.5.rc1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Feb 01 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-0.4.rc1
- Package python helper scripts for tools
-
-* Fri Jan 26 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-0.3.rc1
- Ignore -fstack-clash-protection option instead of giving an error
-
-* Fri Jan 26 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-0.2.rc1
- Package emacs integration files
-
-* Wed Jan 24 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-0.1.rc1
- 6.0.0-rc1 Release
-
-* Wed Jan 24 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-3
- Rebuild against llvm5.0 compatibility package
- rhbz#1538231
-
-* Wed Jan 03 2018 Iryna Shcherbina <ishcherb@redhat.com> - 5.0.1-2
- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Wed Dec 20 2017 Tom Stellard <tstellar@redhat.com> - 5.0.1-1
- 5.0.1 Release
-
-* Wed Dec 13 2017 Tom Stellard <tstellar@redhat.com> - 5.0.0-3
- Make compiler-rt a weak dependency and add a weak dependency on libomp
-
-* Mon Nov 06 2017 Merlin Mathesius <mmathesi@redhat.com> - 5.0.0-2
- Cleanup spec file conditionals
-
-* Mon Oct 16 2017 Tom Stellard <tstellar@redhat.com> - 5.0.0-1
- 5.0.0 Release
-
 * Wed Oct 04 2017 Rex Dieter <rdieter@fedoraproject.org> - 4.0.1-6
 - python2-clang subpkg (#1490997)
 - tools-extras: tighten (internal) -libs dep
--- a/gating.yaml
+++ b/gating.yaml
@ -1,12 +0,0 @@
--- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-rules:
-  - !PassingTestCaseRule {test_case_name: org.centos.prod.ci.pipeline.allpackages-build.package.test.functional.complete}
--- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-rules:
-  - !PassingTestCaseRule {test_case_name: org.centos.prod.ci.pipeline.allpackages-build.package.test.functional.complete}
--- a/hans-gpg-key.asc
+++ b/hans-gpg-key.asc
@ -1,52 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-67H2IH//2sf8dw==
-=ADVe
-----END PGP PUBLIC KEY BLOCK-----
--- a/10
+++ b/10
@ -1,4 +1,6 @@
-SHA512 (clang-10.0.0.src.tar.xz.sig) = cb46d9c616de9ba6e11602269f93a003fc24951b75844d2d62ad7c435bd9ace0357bf396141b9a3e97034f617ad8f301a1a5556a3feb94b17647f8b76c0b6236
-SHA512 (clang-tools-extra-10.0.0.src.tar.xz.sig) = f0527b315ce9f2c86a19dabd462d0d466ac0843262f06d5f2b69333f77457ec9cb99f8ce9fdaa00048dfaec3de5613fb884c4259acd4a75463ba3c6714e35423
-SHA512 (clang-tools-extra-10.0.0.src.tar.xz) = 33b6019e64e9ac94bd7c000b77a4a927602a2705baa9b370e392a56b53fe09c8dad1ff7d583892729e9eb291440433ad7d71df768a96d927e4dbc1988fc01d99
-SHA512 (clang-10.0.0.src.tar.xz) = b1cccc13c46abcda3d689f51d486fa613ecec40c581c72d8b15951715100a2b8fb24370161601e6716cdba5a784337439e99ec2f0766f988e9cce92de6d775da
+SHA512 (cfe-4.0.0.src.tar.xz) = a0d9972ec337a5c105fcbe7abc4076ba1e580f28908a3318f43bbfe59143f446ed5b78dad210f624145d7e5a3d56c15bfead78826c068422b60120fa1cfa482a
+SHA512 (clang-tools-extra-4.0.0.src.tar.xz) = 2f9aed5ff7e175b730802961f9ce0aa6376ce78d905839e60536b6d166f68dc31d4420a668ed1e08f3601a5fefa8f7514172daaf77eb325fecd00e55f56e5af4
+SHA512 (test-suite-4.0.0.src.tar.xz) = 1ec2bc3307d8047ffe877e86ebac69f8f1f3ac062d789c2e341b4d4be4b1973d02ab398879cd42faf3346b8952991f00f4f77e4e63604718241cc5f5abb822b3
+SHA512 (cfe-4.0.1.src.tar.xz) = 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
+SHA512 (test-suite-4.0.1.src.tar.xz) = 4a7184568fb805f299d7723622f87e1c7755701a2344b1a554ed657952caa25855ec637c889a15ad23994e4850822571b008c4fc95bee833aa05d564b9ff11c6
+SHA512 (clang-tools-extra-4.0.1.src.tar.xz) = ea26d926f428e62e76cf8a073e63ffe05645f6592e05d7717d5c257908870ae9217727d3e1578227b14eda5937085872463f1a8e99970256179c68b8a92e69e0
--- a/tests/tests-libomp.yml
+++ b/tests/tests-libomp.yml
@ -1,22 +0,0 @@
- hosts: localhost
-  pre_tasks:
-    # We want to make sure libomp is not already present on the system to ensure
-    # that clang pulls in the correct libomp dependencies when it is installed.
-    - name: Uninstall libomp
-      package:
-        name: "{{ item }}"
-        state: absent
-      with_items:
-        - libomp
-        - libomp-devel
-  roles:
-  - role: standard-test-basic
-    tags:
-      - classic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/clang.git"
-      dest: "clang"
-    required_packages:
-      - clang
-    tests:
-      - clang/libomp
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -1,35 +0,0 @@
- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-      - classic
-    required_packages:
-      - clang
-      - llvm-test-suite
-      - ninja-build
-      - gcc-x86_64-linux-gnu
-      # FIXME: It would be nice if we could only install dependencies for a
-      # single test rather than installing dependencies for all tests.  This
-      # will help us catch bugs with implicit package dependencies e.g.
-      # package A depends on package B but does not have an explicit Requires.
-      # These are required for the llvm-toolchain test:
-      - clang
-      - lld
-      - compiler-rt
-      - libcxx-devel
-      - glibc-devel
-      - gcc
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/llvm-test-suite.git"
-      dest: "llvm-test-suite"
-    - repo: "https://src.fedoraproject.org/tests/clang.git"
-      dest: "clang"
-    tests:
-      - rhbz#482491:
-          dir: ./
-          run: echo "int main(){}" | clang -x c -
-      - llvm-test-suite/test-suite
-      - llvm-test-suite/abi-test-suite
-      - clang/rhbz_1657544
-      - clang/rhbz_1647130
-      - clang/llvm-toolchain
--- a/tests/testspocl.yml
+++ b/tests/testspocl.yml
@ -1,28 +0,0 @@
-# This is separate from tests.yml because we want to run the tests without
-# clang installed.
-# FIXME: Is there some way we can put this yaml definition in the tests/pocl
-# repo?  Right now we need to copy and paste this everywhere the test is run.
- hosts: localhost
-  pre_tasks:
-  # Programs linked against pocl should be able to run without clang installed,
-  # so when we run the test we want to make sure clang is not installed to
-  # verify we haven't introduced an implicit dependency on clang.
-  - name: Uninstall clang
-    package:
-      name: clang
-      state: absent
-    tags: classic
-  roles:
-  - role: standard-test-basic
-    tags:
-      - classic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/pocl.git"
-      dest: "pocl"
-    required_packages:
-      - ocl-icd-devel
-      - pocl
-      - gcc
-    tests:
-    # rhbz#1582884
-    - pocl/simple-opencl-no-clang:
Author	SHA1	Message	Date
Rex Dieter	a70305af80	python2-clang subpkg (#1490997 ) tools-extras: tighten (internal) -libs dep %install: avoid cd	2017-10-10 11:07:34 -05:00
Tom Stellard	6558eeb314	Fix Requires for git-clang-format and split into its own package	2017-09-05 18:27:20 +00:00
Tom Stellard	fd570ec077	Re-enable tests This was accidently disabled by the previous merge commit.	2017-08-24 13:29:31 +00:00
Tom Stellard	da075636c1	Merge remote-tracking branch 'origin/f27' into f26	2017-08-24 00:06:49 +00:00
Tom Stellard	604a42b909	Enable eh/rtti, which are required by lldb.	2017-05-11 10:34:06 +00:00
Tom Stellard	762150e96d	Fix clang-tools-extra build Also fix the %install step.	2017-05-11 10:33:55 +00:00
Tom Stellard	cb23bde5c3	clang 4.0.0 final release	2017-05-11 10:32:49 +00:00
David Goerger	3f2091d33a	Add clang-tools-extra package rhbz#1328091	2017-05-11 10:31:29 +00:00
Tom Stellard	9325cf5240	Enable build-id by default rhbz#1432403	2017-03-16 16:14:48 +00:00