Merge topic 'fix-osmesa-llvm7-patch' into release

5d8dccd2 osmesa: Fix llvm7 patch to match mesa

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Cory Quammen <cory.quammen@kitware.com>
Merge-request: !523

projects/unix/patches/osmesa-swr-llvm7-support.patch

@@ -3393,30 +3393,3 @@ diff -N -u -r mesa-18.2.2.old/src/gallium/drivers/swr/rasterizer/jitter/gen_stat
 -
 -
 -// clang-format on
-diff -N -u -r mesa-18.2.2.old/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp mesa-18.2.2/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp
---- mesa-18.2.2.old/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp	2018-10-05 06:15:58.000000000 -0400
-+++ mesa-18.2.2/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp	2018-10-09 14:00:49.941043815 -0400
-@@ -70,6 +70,7 @@
- #if LLVM_VERSION_MAJOR >= 7
- #include "llvm/Transforms/Utils.h"
- #include "llvm/Transforms/InstCombine/InstCombine.h"
-+#include "llvm/LinkAllPasses.h"
- #endif
- #include "llvm/Support/Host.h"
- #include "llvm/Support/DynamicLibrary.h"
-diff -N -u -r mesa-18.2.2.old/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp mesa-18.2.2/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp
---- mesa-18.2.2.old/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp	2018-10-05 06:15:58.000000000 -0400
-+++ mesa-18.2.2/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp	2018-10-09 14:00:49.941043815 -0400
-@@ -306,7 +306,11 @@
-         passes.add(createCFGSimplificationPass());
-         passes.add(createEarlyCSEPass());
-         passes.add(createInstructionCombiningPass());
--        passes.add(createInstructionSimplifierPass());
-+#if LLVM_VERSION_MAJOR >= 7
-+    passes.add(createInstSimplifyLegacyPass());
-+#else
-+    passes.add(createInstructionSimplifierPass());
-+#endif
-         passes.add(createConstantPropagationPass());
-         passes.add(createSCCPPass());
-         passes.add(createAggressiveDCEPass());