[Mesa-dev] [PATCH 07/12] android: add support for Android 7.0 with llvm 3.8

[Mauro Rossi]

2017-01-10 1:53 GMT+01:00 Mauro Rossi <issor.oruam at gmail.com>:
> Integration of rules that set correct HAVE_LLVM value for Android 7.0
> ---
>  Android.common.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Android.common.mk b/Android.common.mk
> index 1745b08..36a44bb 100644
> --- a/Android.common.mk
> +++ b/Android.common.mk
> @@ -80,7 +80,7 @@ endif
>
>  ifeq ($(MESA_ENABLE_LLVM),true)
>  LOCAL_CFLAGS += \
> -       -DHAVE_LLVM=0x030$(if $(filter 5,$(MESA_ANDROID_MAJOR_VERSION)),5,7) -DMESA_LLVM_VERSION_PATCH=0 \
> +       -DHAVE_LLVM=0x030$(if $(filter 5,$(MESA_ANDROID_MAJOR_VERSION)),5,$(if $(filter 6,$(MESA_ANDROID_MAJOR_VERSION)),7,8)) -DMESA_LLVM_VERSION_PATCH=0 \
>         -D__STDC_CONSTANT_MACROS \
>         -D__STDC_FORMAT_MACROS \
>         -D__STDC_LIMIT_MACROS
> --
> 2.9.3
>

Hi, please consider that the following patch adding support for
marshmallow/llvm3.7.0
is a necessary pre-requisite for PATCH 07/12

Added also as attachment, to avoid gmail reformatting/unwanted spaces.


>From 8f3d32ced7a3413a24a494e575949eebab5c85f6 Mon Sep 17 00:00:00 2001
From: Mauro Rossi <issor.oruam at gmail.com>
Date: Tue, 22 Dec 2015 13:26:51 +0100
Subject: [PATCH] android: add support for LLVM 3.7.0 for marshmallow

The changes add support for LLVM 3.7.0 for marshmallow,
while keeping support for LLVM 3.5.0 with lollipop.

MESA_LLVM_VERSION_PATCH=0 is compatible with radeonsi build in lollipop-x86,
since mesa 11.0 and newer do not check anymore for LLVM 3.5.2

This changes, combined with specific R600 patches for external/llvm,
enable building gallium radeonsi driver in marshmallow-x86.

The patch is applicable to 11.2.0devel, 11.1 and 11.0 branches.
---
 Android.common.mk             | 2 +-
 src/gallium/Android.common.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Android.common.mk b/Android.common.mk
index 8a752a5..98be839 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -76,7 +76,7 @@ endif

 ifeq ($(MESA_ENABLE_LLVM),true)
 LOCAL_CFLAGS += \
- -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2 \
+ -DHAVE_LLVM=0x030$(if $(filter 5,$(MESA_ANDROID_MAJOR_VERSION)),5,7)
-DMESA_LLVM_VERSION_PATCH=0 \
  -D__STDC_CONSTANT_MACROS \
  -D__STDC_FORMAT_MACROS \
  -D__STDC_LIMIT_MACROS
diff --git a/src/gallium/Android.common.mk b/src/gallium/Android.common.mk
index 7c6c7ac..757716f 100644
--- a/src/gallium/Android.common.mk
+++ b/src/gallium/Android.common.mk
@@ -34,7 +34,7 @@ LOCAL_C_INCLUDES += \
  external/llvm/include \
  external/llvm/device/include \
  external/libcxx/include \
- external/elfutils/$(if $(filter true,$(MESA_LOLLIPOP_BUILD)),0.153/)libelf
+ external/elfutils/$(if $(filter
5,$(MESA_ANDROID_MAJOR_VERSION)),0.153/,src/)libelf
 endif

 include $(MESA_COMMON_MK)
-- 
2.1.4
-------------- next part --------------
A non-text attachment was scrubbed...
Name: android-add-support-for-LLVM-3.7.0-for-marshmallow.patch
Type: application/octet-stream
Size: 1748 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170110/5329aded/attachment.obj>