[src/trunk]: src/external/mit/xorg/lib/gallium put BUILD_LLVMPIPE and it's MK...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ac3c77f2faeb
branches:  trunk
changeset: 841902:ac3c77f2faeb
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jun 07 06:00:05 2019 +0000

description:
put BUILD_LLVMPIPE and it's MKLLVMRT conditional inside the x86 + evbarm
section, so that arm* can build llvmpipe.

the default for arm* and MKLLVMRT remains "no", and for arm64 it does not
actually work yet (faults in "dc cvau", but i don't know why yet).

NFCI.

diffstat:

 external/mit/xorg/lib/gallium/Makefile |  25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diffs (63 lines):

diff -r 3c8940a244d5 -r ac3c77f2faeb external/mit/xorg/lib/gallium/Makefile
--- a/external/mit/xorg/lib/gallium/Makefile    Fri Jun 07 05:34:34 2019 +0000
+++ b/external/mit/xorg/lib/gallium/Makefile    Fri Jun 07 06:00:05 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/06/02 11:35:55 mrg Exp $
+# $NetBSD: Makefile,v 1.30 2019/06/07 06:00:05 mrg Exp $
 
 # Link the gallium mega driver.
 
@@ -90,14 +90,16 @@
 BUILD_I915=0
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 BUILD_I915=1
-.if ${MKLLVMRT} != "no"
+. if ${MKLLVMRT} != "no"
 BUILD_RADEON=1
-BUILD_LLVMPIPE=1
-.endif
+. endif
 .endif
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
 BUILD_NOUVEAU=1
 BUILD_VDPAU=1
+. if ${MKLLVMRT} != "no"
+BUILD_LLVMPIPE=1
+. endif
 .endif
 
 DRIVERS=               kms_swrast swrast
@@ -994,6 +996,19 @@
                X86TargetInfo \
                X86Utils
 .endif
+
+.if ${MACHINE_CPU} == "aarch64"
+# XXX duplicates
+LLVMRT_LIBS+=  \
+               AArch64AsmParser \
+               AArch64CodeGen \
+               AArch64MCTargetDesc \
+               AArch64Utils \
+               AArch64AsmPrinter \
+               AArch64Disassembler \
+               AArch64TargetInfo
+.endif
+
 LLVMRT_LIBS+=  \
                GlobalISel \
                MCDisassembler \
@@ -1076,11 +1091,13 @@
 CPPFLAGS.target.c += \
        -DGALLIUM_LLVMPIPE
 .endif  #${BUILD_LLVMPIPE} == 1
+
 .if ${BUILD_I915} == 1
 CPPFLAGS.target.c += \
        -DGALLIUM_I915 \
        -DGALLIUM_ILO
 .endif
+
 .if ${BUILD_RADEON} == 1
 CPPFLAGS.target.c += \
        -DGALLIUM_R200 \