Module Name: src
Committed By: joerg
Date: Wed Apr 3 15:26:35 UTC 2019
Modified Files:
src/external/mit/xorg/lib: libmesa.mk
src/external/mit/xorg/lib/gallium: Makefile
src/share/mk: bsd.README bsd.own.mk
Log Message:
Use and enable MKLLVMRT for HAVE_MESA_VER=18.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libmesa.mk
cvs rdiff -u -r1.19 -r1.20 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.388 -r1.389 src/share/mk/bsd.README
cvs rdiff -u -r1.1121 -r1.1122 src/share/mk/bsd.own.mk
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/libmesa.mk
diff -u src/external/mit/xorg/lib/libmesa.mk:1.5 src/external/mit/xorg/lib/libmesa.mk:1.6
--- src/external/mit/xorg/lib/libmesa.mk:1.5 Fri Mar 15 03:10:25 2019
+++ src/external/mit/xorg/lib/libmesa.mk Wed Apr 3 15:26:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: libmesa.mk,v 1.5 2019/03/15 03:10:25 mrg Exp $
+# $NetBSD: libmesa.mk,v 1.6 2019/04/03 15:26:34 joerg Exp $
#
# Consumer of this Makefile should set MESA_SRC_MODULES.
@@ -527,7 +527,7 @@ CPPFLAGS+= \
-DENABLE_SHADER_CACHE \
-DHAVE_MINCORE
-.if ${MKLLVM} == "yes"
+.if ${MKLLVMRT} != "no"
CPPFLAGS+= \
-DHAVE_LLVM=0x0700 \
-DMESA_LLVM_VERSION_PATCH=0
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.19 src/external/mit/xorg/lib/gallium/Makefile:1.20
--- src/external/mit/xorg/lib/gallium/Makefile:1.19 Sun Mar 10 10:51:58 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Wed Apr 3 15:26:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/03/10 10:51:58 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2019/04/03 15:26:34 joerg Exp $
# Link the gallium mega driver.
@@ -13,15 +13,13 @@ LIB= gallium_dri
DRIDIR= ${X11USRLIBDIR}/modules/dri
DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/modules/dri
-LLVM_TOOLCONF_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm && ${PRINTOBJDIR}
-LLVM_INCLUDE_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm-include && ${PRINTOBJDIR}
+LLVM_INCLUDE_OBJDIR!= cd ${NETBSDSRCDIR}/external/bsd/llvm/include && ${PRINTOBJDIR}
CXXFLAGS+= -std=c++11
CFLAGS+= -std=gnu11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm \
-I${NETBSDSRCDIR}/external/bsd/llvm/dist/llvm/include \
- -I${LLVM_TOOLCONF_OBJDIR}/config/include \
- -I${LLVM_INCLUDE_OBJDIR}
+ -I${LLVM_INCLUDE_OBJDIR} -I${NETBSDSRCDIR}/external/bsd/llvm/config
GALLIUM_SUBDIRS= \
auxiliary \
@@ -91,7 +89,7 @@ BUILD_I915=0
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
BUILD_RADEON=1
BUILD_I915=1
-.if ${MKLLVM} == "yes"
+.if ${MKLLVMRT} != "no"
BUILD_LLVMPIPE=1
.endif
.endif
@@ -160,7 +158,7 @@ GALLIUM_SOURCES.auxiliary/draw= \
draw_vs_exec.c \
draw_vs_variant.c
-.if ${MKLLVM:Uno} != "no"
+.if ${MKLLVMRT} != "no"
GALLIUM_SOURCES.auxiliary/draw+= \
draw_llvm.c \
draw_llvm_sample.c \
@@ -963,7 +961,7 @@ LIBDPLIBS+= execinfo ${.CURDIR}/../../..
# gallium drivers requiring LLVM
.if ${BUILD_LLVMPIPE} == 1 || ${BUILD_RADEON} == 1
-LLVM_LIB_DIR!= cd ${.CURDIR}/../../../../../external/bsd/llvm/lib; ${PRINTOBJDIR}
+LLVM_LIB_DIR!= cd ${.CURDIR}/../../../../../external/bsd/llvm/librt; ${PRINTOBJDIR}
LLVM_LIBS= \
TransformsCoroutines \
@@ -1023,8 +1021,8 @@ LLVM_LIBS+= \
Support
.for llvm_library in ${LLVM_LIBS}
-DPADD+= ${LLVM_LIB_DIR}/libLLVM${llvm_library}/libLLVM${llvm_library}.a
-LDADD+= ${LLVM_LIB_DIR}/libLLVM${llvm_library}/libLLVM${llvm_library}.a
+DPADD+= ${LLVM_LIB_DIR}/libLLVM${llvm_library}/libLLVM${llvm_library}_pic.a
+LDADD+= ${LLVM_LIB_DIR}/libLLVM${llvm_library}/libLLVM${llvm_library}_pic.a
.endfor
.endif # ${BUILD_LLVM_PIPE} == 1 || ${BUILD_RADEON} == 1
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.388 src/share/mk/bsd.README:1.389
--- src/share/mk/bsd.README:1.388 Wed Apr 3 15:17:23 2019
+++ src/share/mk/bsd.README Wed Apr 3 15:26:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.388 2019/04/03 15:17:23 joerg Exp $
+# $NetBSD: bsd.README,v 1.389 2019/04/03 15:26:35 joerg Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -322,6 +322,11 @@ MKLLVM If "yes", build and install clan
(see below for details).
Default: no
+MKLLVMRT If "yes", build the LLVM PIC libraries necessary for the
+ AMDGPU backend and the native JIT of the target architecture,
+ if supported.
+ Default: no, enabled automatically with HAVE_MESA_VER=18.
+
MKLVM If "no", don't build or install the logical volume manager
and device mapper tools and libraries
Default: yes
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1121 src/share/mk/bsd.own.mk:1.1122
--- src/share/mk/bsd.own.mk:1.1121 Wed Apr 3 15:23:29 2019
+++ src/share/mk/bsd.own.mk Wed Apr 3 15:26:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1121 2019/04/03 15:23:29 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.1122 2019/04/03 15:26:35 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1288,6 +1288,17 @@ _NEEDS_LIBCXX.x86_64= yes
MKLIBCXX:= yes
.endif
+# MesaLib.old and MesaLib7 go together, and MesaLib is alone.
+HAVE_MESA_VER?= 10
+.if ${HAVE_MESA_VER} == "10"
+EXTERNAL_MESALIB_DIR?= MesaLib.old
+.elif ${HAVE_MESA_VER} == "18"
+EXTERNAL_MESALIB_DIR?= MesaLib
+. if ${MKX11} != "no"
+MKLLVMRT:= yes
+. endif
+.endif
+
#
# install(1) parameters.
#
@@ -1460,14 +1471,6 @@ HAVE_XORG_SERVER_VER?=110
HAVE_XORG_SERVER_VER?=120
.endif
-# MesaLib.old and MesaLib7 go together, and MesaLib is alone.
-HAVE_MESA_VER?= 10
-.if ${HAVE_MESA_VER} == "10"
-EXTERNAL_MESALIB_DIR?= MesaLib.old
-.else
-EXTERNAL_MESALIB_DIR?= MesaLib
-.endif
-
.if ${HAVE_XORG_SERVER_VER} == "120"
XORG_SERVER_SUBDIR?=xorg-server
. if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
