On Thu, Mar 29, 2018 at 4:56 PM, Mike Lothian <m...@fireburn.co.uk> wrote: > Include llvm-c/Transforms/Utils.h with the newest LLVM 7 > > Fixes: 2dd4f35c7fc llvm-c: Split Utils out of Scalar.h > Signed-of-by: Mike Lothian <m...@fireburn.co.uk> > > --- > > I don't have git commit rights > > If you're happy with this patch please can you commit it > > Cheers > > Mike > --- > src/amd/vulkan/radv_nir_to_llvm.c | 3 +++ > src/gallium/auxiliary/gallivm/lp_bld_init.c | 3 +++ > src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c | 3 +++ > 3 files changed, 9 insertions(+) > > diff --git a/src/amd/vulkan/radv_nir_to_llvm.c > b/src/amd/vulkan/radv_nir_to_llvm.c > index c6b4e8b532..2f0864da46 100644 > --- a/src/amd/vulkan/radv_nir_to_llvm.c > +++ b/src/amd/vulkan/radv_nir_to_llvm.c > @@ -32,6 +32,9 @@ > #include <llvm-c/Core.h> > #include <llvm-c/TargetMachine.h> > #include <llvm-c/Transforms/Scalar.h> > +#if HAVE_LLVM >= 0x0700 > +#include <llvm-c/Transforms/Utils.h> > +#endif > > #include "sid.h" > #include "gfx9d.h" > diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c > b/src/gallium/auxiliary/gallivm/lp_bld_init.c > index 6ddc509a81..dae9d01552 100644 > --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c > +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c > @@ -40,6 +40,9 @@ > > #include <llvm-c/Analysis.h> > #include <llvm-c/Transforms/Scalar.h> > +#if HAVE_LLVM >= 0x0700 > +#include <llvm-c/Transforms/Utils.h> > +#endif > #include <llvm-c/BitWriter.h> > > > diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c > b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c > index 79fdebe838..622fd26950 100644 > --- a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c > +++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c > @@ -40,6 +40,9 @@ > #include <stdio.h> > #include <llvm-c/Transforms/IPO.h> > #include <llvm-c/Transforms/Scalar.h> > +#if HAVE_LLVM >= 0x0700 > +#include <llvm-c/Transforms/Utils.h> > +#endif > > enum si_llvm_calling_convention { > RADEON_LLVM_AMDGPU_VS = 87, > -- > 2.16.3 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
A similar change is needed in src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp. Vinson _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev