CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: christos
Date: Wed May 1 21:34:48 UTC 2024
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Allow c99 array designators
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 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.54 src/external/mit/xorg/lib/gallium/Makefile:1.55
--- src/external/mit/xorg/lib/gallium/Makefile:1.54 Fri Apr 26 12:34:17 2024
+++ src/external/mit/xorg/lib/gallium/Makefile Wed May 1 17:34:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2024/04/26 16:34:17 rillig Exp $
+# $NetBSD: Makefile,v 1.55 2024/05/01 21:34:48 christos Exp $
# Link the gallium mega driver.
@@ -19,7 +19,7 @@ DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/
LLVM_INCLUDE_OBJDIR!= cd ${NETBSDSRCDIR}/external/apache2/llvm/include && ${PRINTOBJDIR}
-CWARNFLAGS.clang += -Wno-atomic-alignment -Wno-unknown-warning-option -Wno-implicit-int-float-conversion
+CWARNFLAGS.clang += -Wno-atomic-alignment -Wno-unknown-warning-option -Wno-implicit-int-float-conversion -Wno-c99-designator
CXXFLAGS+= -std=c++14
CFLAGS+= -std=gnu11
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: christos Date: Wed May 1 21:34:48 UTC 2024 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Allow c99 array designators To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 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.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: rillig Date: Fri Apr 26 16:34:18 UTC 2024 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: gallium: disable lint To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 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.53 src/external/mit/xorg/lib/gallium/Makefile:1.54 --- src/external/mit/xorg/lib/gallium/Makefile:1.53 Sat Nov 25 20:00:25 2023 +++ src/external/mit/xorg/lib/gallium/Makefile Fri Apr 26 16:34:17 2024 @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.53 2023/11/25 20:00:25 rjs Exp $ +# $NetBSD: Makefile,v 1.54 2024/04/26 16:34:17 rillig Exp $ # Link the gallium mega driver. LIBISMODULE= yes LIBISCXX= yes +NOLINT= # Lots of "Unsupported platform" due to undefined __GNUC__ + .include .include "../mesa-which.mk"
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: rillig Date: Fri Apr 26 16:34:18 UTC 2024 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: gallium: disable lint To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 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.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: rjs Date: Sat Nov 25 20:00:25 UTC 2023 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Make building of more files conditional on MKLLVMRT. Make r300_state_derived.c compile with gcc 12. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 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.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: rjs
Date: Sat Nov 25 20:00:25 UTC 2023
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Make building of more files conditional on MKLLVMRT.
Make r300_state_derived.c compile with gcc 12.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 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.52 src/external/mit/xorg/lib/gallium/Makefile:1.53
--- src/external/mit/xorg/lib/gallium/Makefile:1.52 Wed Nov 22 17:48:35 2023
+++ src/external/mit/xorg/lib/gallium/Makefile Sat Nov 25 20:00:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2023/11/22 17:48:35 rjs Exp $
+# $NetBSD: Makefile,v 1.53 2023/11/25 20:00:25 rjs Exp $
# Link the gallium mega driver.
@@ -343,8 +343,12 @@ GALLIUM_SOURCES.auxiliary/util= \
GALLIUM_SOURCES.auxiliary/nir = \
nir_draw_helpers.c \
nir_to_tgsi.c \
- nir_to_tgsi_info.c \
tgsi_to_nir.c
+
+.if ${MKLLVMRT} != "no"
+GALLIUM_SOURCES.auxiliary/nir+= nir_to_tgsi_info.c
+.endif
+
GALLIUM_SOURCES.auxiliary/vl= \
vl_bicubic_filter.c \
vl_compositor.c \
@@ -384,6 +388,7 @@ CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/sr
GALLIUM_SOURCES.auxiliary/renderonly= \
renderonly.c
+.if ${MKLLVMRT} != "no"
GALLIUM_SOURCES.auxiliary/gallivm= \
lp_bld_arit.c \
lp_bld_arit_overflow.c \
@@ -422,8 +427,9 @@ GALLIUM_SOURCES.auxiliary/gallivm= \
lp_bld_tgsi.c \
lp_bld_tgsi_info.c \
lp_bld_tgsi_soa.c \
- lp_bld_type.c
- #lp_bld_debug.cpp
+ lp_bld_type.c \
+ lp_bld_debug.cpp
+.endif
.for _f in ${GALLIUM_SOURCES.auxiliary/gallivm}
CPPFLAGS.${_f} += -I${X11SRCDIR.Mesa}/src/gallium/auxiliary/util
@@ -736,6 +742,8 @@ GALLIUM_SOURCES.drivers/r300 = \
r300_vs.c \
r300_vs_draw.c
+CPPFLAGS.r300_state_derived.c = ${CC_WNO_STRINGOP_OVERREAD}
+
GALLIUM_SOURCES.drivers/r300/compiler = \
memory_pool.c \
r300_fragprog.c \
Re: CVS commit: src/external/mit/xorg/lib/gallium
On Fri, Jan 31, 2020 at 09:13:40PM +, Jared D. McNeill wrote:
> Module Name: src
> Committed By: jmcneill
> Date: Fri Jan 31 21:13:40 UTC 2020
>
> Modified Files:
> src/external/mit/xorg/lib/gallium: Makefile
>
> Log Message:
> Bump MESA_LLVM_VERSION_STRING
Directly use ${LLVM_VERSION}?
Joerg
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: martin Date: Wed Nov 20 06:23:31 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Restrict -Wl,-z,defs to x86 and aarch64 for now to avoid global build lossage. Suggested by mrg. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 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.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: martin
Date: Wed Nov 20 06:23:31 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Restrict -Wl,-z,defs to x86 and aarch64 for now to avoid global build
lossage. Suggested by mrg.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 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.39 src/external/mit/xorg/lib/gallium/Makefile:1.40
--- src/external/mit/xorg/lib/gallium/Makefile:1.39 Tue Nov 19 08:59:18 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Wed Nov 20 06:23:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/11/19 08:59:18 martin Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/20 06:23:31 martin Exp $
# Link the gallium mega driver.
@@ -1086,7 +1086,10 @@ LLVMRT_LIBS+= \
.endif # ${BUILD_LLVM_PIPE} == 1 || ${BUILD_RADEON} == 1
-LDFLAGS+= -Wl,--version-script=${X11SRCDIR.Mesa}/src/gallium/targets/dri/dri.sym -Wl,-z,defs
+LDFLAGS+= -Wl,--version-script=${X11SRCDIR.Mesa}/src/gallium/targets/dri/dri.sym
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_CPU} == "aarch64"
+LDFLAGS+= -Wl,-z,defs
+.endif
## build mesagallium parts
MESA_SRC_MODULES= main math vbo state_tracker program asm_s
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: martin
Date: Tue Nov 19 08:59:18 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Looks like this requires pthread.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 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.38 src/external/mit/xorg/lib/gallium/Makefile:1.39
--- src/external/mit/xorg/lib/gallium/Makefile:1.38 Mon Nov 18 22:26:15 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Tue Nov 19 08:59:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/11/18 22:26:15 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2019/11/19 08:59:18 martin Exp $
# Link the gallium mega driver.
@@ -23,6 +23,10 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libd
-I${NETBSDSRCDIR}/external/apache2/llvm/dist/llvm/include \
-I${LLVM_INCLUDE_OBJDIR} -I${NETBSDSRCDIR}/external/apache2/llvm/config
+CFLAGS+= -pthread
+LDFLAGS+= -pthread
+LIBDPLIBS+= pthread ${.CURDIR}/../../../../../lib/libpthread
+
GALLIUM_SUBDIRS= \
auxiliary \
auxiliary/cso_cache \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: martin Date: Tue Nov 19 08:59:18 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Looks like this requires pthread. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 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.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: christos Date: Mon Oct 28 18:38:54 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: another vax optimizer hack. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 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.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: christos
Date: Mon Oct 28 18:38:54 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
another vax optimizer hack.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 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.35 src/external/mit/xorg/lib/gallium/Makefile:1.36
--- src/external/mit/xorg/lib/gallium/Makefile:1.35 Tue Sep 24 15:29:41 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Mon Oct 28 14:38:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2019/09/24 19:29:41 maya Exp $
+# $NetBSD: Makefile,v 1.36 2019/10/28 18:38:54 christos Exp $
# Link the gallium mega driver.
@@ -1186,6 +1186,9 @@ SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR}
COPTS+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
.endif
+.if ${MACHINE_ARCH} == "vax"
+COPTS.nir.c += -O1
+.endif
.include
# Don't regenerate c files
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: mrg
Date: Sun Jul 7 17:50:34 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
re-add arm64 to the list of llvm-ok platforms. fixes gallium_dri.so:
swrast_dri.so: Undefined symbol "lp_native_vector_width" (symnum = 388))
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 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.33 src/external/mit/xorg/lib/gallium/Makefile:1.34
--- src/external/mit/xorg/lib/gallium/Makefile:1.33 Wed Jun 19 05:17:05 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Sun Jul 7 17:50:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/06/19 05:17:05 mrg Exp $
+# $NetBSD: Makefile,v 1.34 2019/07/07 17:50:34 mrg Exp $
# Link the gallium mega driver.
@@ -103,6 +103,7 @@ BUILD_VDPAU=1
${MACHINE_ARCH} == "x86_64" || \
${MACHINE_ARCH} == "powerpc" || \
${MACHINE_ARCH} == "powerpc64" || \
+!empty(MACHINE_ARCH:Maarch64*) || \
!empty(MACHINE_ARCH:Mmips*) || \
!empty(MACHINE_ARCH:Mearm*) || \
!empty(MACHINE_ARCH:Marm*)
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: mrg Date: Sun Jul 7 17:50:34 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: re-add arm64 to the list of llvm-ok platforms. fixes gallium_dri.so: swrast_dri.so: Undefined symbol "lp_native_vector_width" (symnum = 388)) To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 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.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: mrg Date: Wed Jun 19 05:17:05 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: allow all arm platforms, not just evbarm, to build with MKLLVMRT. allow mips and powerpc platforms as well. amusingly, this allows my shark to finally have functional if not usable GL :-) glxgears gets 1fps. status: - arm32 and ppc have llvm dynamic linker patches. - ppc is not yet working. - mips untested. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 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.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: mrg
Date: Wed Jun 19 05:17:05 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
allow all arm platforms, not just evbarm, to build with MKLLVMRT.
allow mips and powerpc platforms as well.
amusingly, this allows my shark to finally have functional
if not usable GL :-) glxgears gets 1fps.
status:
- arm32 and ppc have llvm dynamic linker patches.
- ppc is not yet working.
- mips untested.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 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.32 src/external/mit/xorg/lib/gallium/Makefile:1.33
--- src/external/mit/xorg/lib/gallium/Makefile:1.32 Sun Jun 9 01:56:49 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Wed Jun 19 05:17:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/06/09 01:56:49 mrg Exp $
+# $NetBSD: Makefile,v 1.33 2019/06/19 05:17:05 mrg Exp $
# Link the gallium mega driver.
@@ -97,6 +97,15 @@ BUILD_RADEON=1
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
BUILD_NOUVEAU=1
BUILD_VDPAU=1
+.endif
+
+.if ${MACHINE_ARCH} == "i386" || \
+${MACHINE_ARCH} == "x86_64" || \
+${MACHINE_ARCH} == "powerpc" || \
+${MACHINE_ARCH} == "powerpc64" || \
+!empty(MACHINE_ARCH:Mmips*) || \
+!empty(MACHINE_ARCH:Mearm*) || \
+!empty(MACHINE_ARCH:Marm*)
. if ${MKLLVMRT} != "no"
BUILD_LLVMPIPE=1
. endif
@@ -998,7 +1007,6 @@ LLVMRT_LIBS+= \
.endif
.if ${MACHINE_CPU} == "aarch64"
-# XXX duplicates
LLVMRT_LIBS+= \
AArch64AsmParser \
AArch64CodeGen \
@@ -1010,7 +1018,6 @@ LLVMRT_LIBS+= \
.endif
.if ${MACHINE_CPU} == "arm"
-# XXX duplicates
LLVMRT_LIBS+= \
ARMCodeGen \
ARMDisassembler \
@@ -1021,6 +1028,26 @@ LLVMRT_LIBS+= \
ARMUtils
.endif
+.if ${MACHINE_CPU} == "mips"
+LLVMRT_LIBS+= \
+ MipsCodeGen \
+ MipsDisassembler \
+ MipsAsmParser \
+ MipsMCTargetDesc \
+ MipsAsmPrinter \
+ MipsTargetInfo
+.endif
+
+.if ${MACHINE_CPU} == "powerpc"
+LLVMRT_LIBS+= \
+ PowerPCCodeGen \
+ PowerPCDisassembler \
+ PowerPCTargetInfo \
+ PowerPCMCTargetDesc \
+ PowerPCAsmParser \
+ PowerPCAsmPrinter
+.endif
+
LLVMRT_LIBS+= \
GlobalISel \
MCDisassembler \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: mrg
Date: Sun Jun 9 01:56:49 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
add ARMDisassembler for the arm section. fixes linkage issue.
unfortunately, this doesn't work. something generates code
with an R_ARM_REL32 relocation and the
llvm::RuntimeDyldELF::resolveARMRelocation() function doesn not
support this and boom:
500 switch (Type) {
501 default:
502 llvm_unreachable("Not implemented relocation type!");
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 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.31 src/external/mit/xorg/lib/gallium/Makefile:1.32
--- src/external/mit/xorg/lib/gallium/Makefile:1.31 Fri Jun 7 12:11:43 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Sun Jun 9 01:56:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/06/07 12:11:43 mrg Exp $
+# $NetBSD: Makefile,v 1.32 2019/06/09 01:56:49 mrg Exp $
# Link the gallium mega driver.
@@ -1013,6 +1013,7 @@ LLVMRT_LIBS+= \
# XXX duplicates
LLVMRT_LIBS+= \
ARMCodeGen \
+ ARMDisassembler \
ARMTargetInfo \
ARMMCTargetDesc \
ARMAsmParser \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: mrg Date: Fri Jun 7 12:11:43 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: allow building arm llvmpipe. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 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.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: mrg
Date: Fri Jun 7 12:11:43 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
allow building arm llvmpipe.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 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.30 src/external/mit/xorg/lib/gallium/Makefile:1.31
--- src/external/mit/xorg/lib/gallium/Makefile:1.30 Fri Jun 7 06:00:05 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Fri Jun 7 12:11:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/06/07 06:00:05 mrg Exp $
+# $NetBSD: Makefile,v 1.31 2019/06/07 12:11:43 mrg Exp $
# Link the gallium mega driver.
@@ -1009,6 +1009,17 @@ LLVMRT_LIBS+= \
AArch64TargetInfo
.endif
+.if ${MACHINE_CPU} == "arm"
+# XXX duplicates
+LLVMRT_LIBS+= \
+ ARMCodeGen \
+ ARMTargetInfo \
+ ARMMCTargetDesc \
+ ARMAsmParser \
+ ARMAsmPrinter \
+ ARMUtils
+.endif
+
LLVMRT_LIBS+= \
GlobalISel \
MCDisassembler \
CVS commit: src/external/mit/xorg/lib/gallium
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 \
CVS commit: src/external/mit/xorg/lib/gallium
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.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: maya
Date: Thu May 30 23:15:46 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Add libraries to resolve missing xcb symbols
Fixes executing 'emulators/nestopia' on r600, reported by nia, thanks!
XXX we might want to get rid of the references instead.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 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.27 src/external/mit/xorg/lib/gallium/Makefile:1.28
--- src/external/mit/xorg/lib/gallium/Makefile:1.27 Thu May 16 01:22:35 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Thu May 30 23:15:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/05/16 01:22:35 christos Exp $
+# $NetBSD: Makefile,v 1.28 2019/05/30 23:15:46 maya Exp $
# Link the gallium mega driver.
@@ -959,6 +959,8 @@ LIBDPLIBS+= expat ${.CURDIR}/../../../.
LIBDPLIBS+= terminfo ${.CURDIR}/../../../../../lib/libterminfo
LIBDPLIBS+= z ${.CURDIR}/../../../../../lib/libz
LIBDPLIBS+= execinfo ${.CURDIR}/../../../../../lib/libexecinfo
+LIBDPLIBS+= X11-xcb ${.CURDIR}/../libX11/libX11-xcb
+LIBDPLIBS+= xcb-dri2${.CURDIR}/../libxcb/dri2
# gallium drivers requiring LLVM
.if ${BUILD_LLVMPIPE} == 1 || ${BUILD_RADEON} == 1
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: maya Date: Thu May 30 23:15:46 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Add libraries to resolve missing xcb symbols Fixes executing 'emulators/nestopia' on r600, reported by nia, thanks! XXX we might want to get rid of the references instead. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 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.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: christos
Date: Sat May 11 17:44:16 UTC 2019
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
elide clang warnings
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 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.25 src/external/mit/xorg/lib/gallium/Makefile:1.26
--- src/external/mit/xorg/lib/gallium/Makefile:1.25 Tue Apr 16 13:29:09 2019
+++ src/external/mit/xorg/lib/gallium/Makefile Sat May 11 13:44:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/04/16 17:29:09 christos Exp $
+# $NetBSD: Makefile,v 1.26 2019/05/11 17:44:16 christos Exp $
# Link the gallium mega driver.
@@ -15,6 +15,8 @@ DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/
LLVM_INCLUDE_OBJDIR!= cd ${NETBSDSRCDIR}/external/bsd/llvm/include && ${PRINTOBJDIR}
+CWARNFLAGS.clang += -Wno-atomic-alignment -Wno-unknown-warning-option
+
CXXFLAGS+= -std=c++11
CFLAGS+= -std=gnu11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm \
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: christos Date: Sat May 11 17:44:16 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: elide clang warnings To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 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.
