Re: [Mesa-dev] [PATCH v2] clover: Fix build after clang r367864
On Tue, 2019-08-06 at 21:39 -0500, Aaron Watry wrote:
> I had come up with an almost identical patch last night, but hadn't
> gotten around to testing it before turning in.
>
> Reviewed-by: Aaron Watry
Thanks both to you and Dieter.
I've pushed the patch.
Jan
>
> On Tue, Aug 6, 2019 at 12:59 PM Jan Vesely wrote:
> > v2: Drop special case of llvm-9
> > Signed-off-by: Jan Vesely
> > ---
> > src/gallium/state_trackers/clover/llvm/compat.hpp | 10 --
> > 1 file changed, 8 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp
> > b/src/gallium/state_trackers/clover/llvm/compat.hpp
> > index 0ecf622a9af..b040902fcfe 100644
> > --- a/src/gallium/state_trackers/clover/llvm/compat.hpp
> > +++ b/src/gallium/state_trackers/clover/llvm/compat.hpp
> > @@ -79,11 +79,17 @@ namespace clover {
> > #endif
> > }
> >
> > -#if HAVE_LLVM >= 0x0500
> > +#if HAVE_LLVM >= 0x1000
> > + const clang::InputKind ik_opencl = clang::Language::OpenCL;
> > +#elif HAVE_LLVM >= 0x0500
> > const clang::InputKind ik_opencl = clang::InputKind::OpenCL;
> > - const clang::LangStandard::Kind lang_opencl10 =
> > clang::LangStandard::lang_opencl10;
> > #else
> > const clang::InputKind ik_opencl = clang::IK_OpenCL;
> > +#endif
> > +
> > +#if HAVE_LLVM >= 0x0500
> > + const clang::LangStandard::Kind lang_opencl10 =
> > clang::LangStandard::lang_opencl10;
> > +#else
> > const clang::LangStandard::Kind lang_opencl10 =
> > clang::LangStandard::lang_opencl;
> > #endif
> >
> > --
> > 2.21.0
> >
> > ___
> > mesa-dev mailing list
> > mesa-dev@lists.freedesktop.org
> > https://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Fmesa-dev&data=02%7C01%7Cjan.vesely%40cs.rutgers.edu%7C009ff6fbb5d940512d2808d71ae09bf8%7Cb92d2b234d35447093ff69aca6632ffe%7C1%7C1%7C637007424321638812&sdata=BjCsoj8%2Fbz7K0cymyBVVvq6Bgc2yVGdvYATF9yK4ygA%3D&reserved=0
--
Jan Vesely
signature.asc
Description: This is a digitally signed message part
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH v2] clover: Fix build after clang r367864
I had come up with an almost identical patch last night, but hadn't
gotten around to testing it before turning in.
Reviewed-by: Aaron Watry
On Tue, Aug 6, 2019 at 12:59 PM Jan Vesely wrote:
>
> v2: Drop special case of llvm-9
> Signed-off-by: Jan Vesely
> ---
> src/gallium/state_trackers/clover/llvm/compat.hpp | 10 --
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp
> b/src/gallium/state_trackers/clover/llvm/compat.hpp
> index 0ecf622a9af..b040902fcfe 100644
> --- a/src/gallium/state_trackers/clover/llvm/compat.hpp
> +++ b/src/gallium/state_trackers/clover/llvm/compat.hpp
> @@ -79,11 +79,17 @@ namespace clover {
> #endif
> }
>
> -#if HAVE_LLVM >= 0x0500
> +#if HAVE_LLVM >= 0x1000
> + const clang::InputKind ik_opencl = clang::Language::OpenCL;
> +#elif HAVE_LLVM >= 0x0500
> const clang::InputKind ik_opencl = clang::InputKind::OpenCL;
> - const clang::LangStandard::Kind lang_opencl10 =
> clang::LangStandard::lang_opencl10;
> #else
> const clang::InputKind ik_opencl = clang::IK_OpenCL;
> +#endif
> +
> +#if HAVE_LLVM >= 0x0500
> + const clang::LangStandard::Kind lang_opencl10 =
> clang::LangStandard::lang_opencl10;
> +#else
> const clang::LangStandard::Kind lang_opencl10 =
> clang::LangStandard::lang_opencl;
> #endif
>
> --
> 2.21.0
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH v2] clover: Fix build after clang r367864
Back from vacation try to bring all stuff on par - LLVM 10 (with Clover)
- and boom...
Acked-by: Dieter Nützel
Tested-by: Dieter Nützel
Thank you Jan!
Dieter
Am 06.08.2019 19:59, schrieb Jan Vesely:
v2: Drop special case of llvm-9
Signed-off-by: Jan Vesely
---
src/gallium/state_trackers/clover/llvm/compat.hpp | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp
b/src/gallium/state_trackers/clover/llvm/compat.hpp
index 0ecf622a9af..b040902fcfe 100644
--- a/src/gallium/state_trackers/clover/llvm/compat.hpp
+++ b/src/gallium/state_trackers/clover/llvm/compat.hpp
@@ -79,11 +79,17 @@ namespace clover {
#endif
}
-#if HAVE_LLVM >= 0x0500
+#if HAVE_LLVM >= 0x1000
+ const clang::InputKind ik_opencl = clang::Language::OpenCL;
+#elif HAVE_LLVM >= 0x0500
const clang::InputKind ik_opencl = clang::InputKind::OpenCL;
- const clang::LangStandard::Kind lang_opencl10 =
clang::LangStandard::lang_opencl10;
#else
const clang::InputKind ik_opencl = clang::IK_OpenCL;
+#endif
+
+#if HAVE_LLVM >= 0x0500
+ const clang::LangStandard::Kind lang_opencl10 =
clang::LangStandard::lang_opencl10;
+#else
const clang::LangStandard::Kind lang_opencl10 =
clang::LangStandard::lang_opencl;
#endif
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH v2] clover: Fix build after clang r367864
v2: Drop special case of llvm-9
Signed-off-by: Jan Vesely
---
src/gallium/state_trackers/clover/llvm/compat.hpp | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp
b/src/gallium/state_trackers/clover/llvm/compat.hpp
index 0ecf622a9af..b040902fcfe 100644
--- a/src/gallium/state_trackers/clover/llvm/compat.hpp
+++ b/src/gallium/state_trackers/clover/llvm/compat.hpp
@@ -79,11 +79,17 @@ namespace clover {
#endif
}
-#if HAVE_LLVM >= 0x0500
+#if HAVE_LLVM >= 0x1000
+ const clang::InputKind ik_opencl = clang::Language::OpenCL;
+#elif HAVE_LLVM >= 0x0500
const clang::InputKind ik_opencl = clang::InputKind::OpenCL;
- const clang::LangStandard::Kind lang_opencl10 =
clang::LangStandard::lang_opencl10;
#else
const clang::InputKind ik_opencl = clang::IK_OpenCL;
+#endif
+
+#if HAVE_LLVM >= 0x0500
+ const clang::LangStandard::Kind lang_opencl10 =
clang::LangStandard::lang_opencl10;
+#else
const clang::LangStandard::Kind lang_opencl10 =
clang::LangStandard::lang_opencl;
#endif
--
2.21.0
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
