Module Name: src
Committed By: mrg
Date: Fri Jun 7 06:00:05 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/mit/xorg/lib/gallium/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.29 src/external/mit/xorg/lib/gallium/Makefile:1.30
--- src/external/mit/xorg/lib/gallium/Makefile:1.29 Sun Jun 2 11:35:55 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Fri Jun 7 06:00:05 2019
@@ -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_LLVMPIPE=0
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 @@ LLVMRT_LIBS+= \
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 += \
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 \
