Attachment 160959 Details for Bug 194766 – Makefile diffs between 10.1-RELEASE-p19 and 10.2-RELEASE-p2

Makefile diffs between 10.1-RELEASE-p19 and 10.2-RELEASE-p2

makediffs-10.1-10.2.txt (text/plain), 5.83 KB, created by Kenneth Salerno on 2015-09-12 20:21:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kenneth Salerno

Created: 2015-09-12 20:21:08 UTC

Size: 5.83 KB

patch

obsolete

>diff -ur mydrm2/Makefile /usr/src/sys/modules/drm2/Makefile
>--- mydrm2/Makefile	2015-09-12 16:15:28.000000000 -0400
>+++ /usr/src/sys/modules/drm2/Makefile	2015-08-13 08:38:01.000000000 -0400
>@@ -1,8 +1,11 @@
>-# $FreeBSD: releng/10.1/sys/modules/drm2/Makefile 254899 2013-08-26 09:17:21Z dumbbell $
>+# $FreeBSD: releng/10.2/sys/modules/drm2/Makefile 282217 2015-04-29 12:54:21Z dumbbell $
> 
> .include <bsd.own.mk>
> 
>+SUBDIR_PARALLEL=
>+
> .if ${MACHINE_CPUARCH} == "amd64"
>+_i915kms=	i915kms
> _radeonkms=	radeonkms
> . if ${MK_SOURCELESS_UCODE} != "no"
> _radeonkmsfw=	radeonkmsfw
>@@ -11,6 +14,7 @@
> 
> .if ${MACHINE_CPUARCH} == "i386"
> . if ${MACHINE} != "pc98"
>+_i915kms=	i915kms
> _radeonkms=	radeonkms
> .  if ${MK_SOURCELESS_UCODE} != "no"
> _radeonkmsfw=	radeonkmsfw
>@@ -18,9 +22,16 @@
> . endif
> .endif
> 
>+.if ${MACHINE_CPUARCH} == "powerpc"
>+_radeonkms=	radeonkms
>+. if ${MK_SOURCELESS_UCODE} != "no"
>+_radeonkmsfw=	radeonkmsfw
>+. endif
>+.endif
>+
> SUBDIR = \
> 	drm2 \
>-	i915kms \
>+	${_i915kms} \
> 	${_radeonkms} \
> 	${_radeonkmsfw}
> 
>diff -ur mydrm2/drm2/Makefile /usr/src/sys/modules/drm2/drm2/Makefile
>--- mydrm2/drm2/Makefile	2015-09-12 16:15:28.000000000 -0400
>+++ /usr/src/sys/modules/drm2/drm2/Makefile	2015-08-13 08:38:01.000000000 -0400
>@@ -1,4 +1,4 @@
>-# $FreeBSD: releng/10.1/sys/modules/drm2/drm2/Makefile 262861 2014-03-06 18:30:56Z jhb $
>+# $FreeBSD: releng/10.2/sys/modules/drm2/drm2/Makefile 282199 2015-04-28 19:35:05Z dumbbell $
> 
> .PATH:	${.CURDIR}/../../../dev/drm2 ${.CURDIR}/../../../dev/drm2/ttm
> KMOD	= drm2
>@@ -13,7 +13,6 @@
> 	drm_dma.c \
> 	drm_dp_helper.c \
> 	drm_dp_iic_helper.c \
>-	drm_drawable.c \
> 	drm_drv.c \
> 	drm_edid.c \
> 	drm_fb_helper.c \
>@@ -31,10 +30,11 @@
> 	drm_modes.c \
> 	drm_pci.c \
> 	drm_scatter.c \
>-	drm_sman.c \
> 	drm_stub.c \
> 	drm_sysctl.c \
> 	drm_vm.c \
>+	drm_os_freebsd.c \
>+	ttm_agp_backend.c \
> 	ttm_lock.c \
> 	ttm_object.c \
> 	ttm_tt.c \
>@@ -46,14 +46,18 @@
> 	ttm_page_alloc.c \
> 	ttm_bo_vm.c \
> 	ati_pcigart.c
>-#ttm_agp_backend.c
> #ttm_page_alloc_dma.c
> 
>-.if ${MACHINE_CPUARCH} == "amd64"
>+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
> SRCS	+= drm_ioc32.c
> .endif
> 
> SRCS	+=device_if.h bus_if.h pci_if.h device_if.h iicbus_if.h opt_drm.h \
> 	opt_vm.h opt_compat.h opt_syscons.h
> 
>+
>+.if ${MACHINE_CPUARCH} == "powerpc"
>+CWARNFLAGS+=-Wno-cast-qual
>+.endif
>+
> .include <bsd.kmod.mk>
>diff -ur mydrm2/i915kms/Makefile /usr/src/sys/modules/drm2/i915kms/Makefile
>--- mydrm2/i915kms/Makefile	2015-09-12 16:15:28.000000000 -0400
>+++ /usr/src/sys/modules/drm2/i915kms/Makefile	2015-08-13 08:38:01.000000000 -0400
>@@ -1,4 +1,4 @@
>-# $FreeBSD: releng/10.1/sys/modules/drm2/i915kms/Makefile 271816 2014-09-18 20:32:40Z dumbbell $
>+# $FreeBSD: releng/10.2/sys/modules/drm2/i915kms/Makefile 280369 2015-03-23 13:38:33Z kib $
> 
> .PATH:	${.CURDIR}/../../../dev/drm2/i915
> KMOD	= i915kms
>@@ -11,11 +11,13 @@
> 	i915_gem_execbuffer.c \
> 	i915_gem_evict.c \
> 	i915_gem_gtt.c \
>+	i915_gem_stolen.c \
> 	i915_gem_tiling.c \
> 	i915_irq.c \
> 	i915_suspend.c \
> 	intel_bios.c \
> 	intel_crt.c \
>+	intel_ddi.c \
> 	intel_display.c \
> 	intel_dp.c \
> 	intel_fb.c \
>@@ -26,6 +28,7 @@
> 	intel_opregion.c \
> 	intel_overlay.c \
> 	intel_panel.c \
>+	intel_pm.c \
> 	intel_ringbuffer.c \
> 	intel_sdvo.c \
> 	intel_sprite.c \
>@@ -35,8 +38,18 @@
> SRCS	+= i915_ioc32.c
> .endif
> 
>-SRCS	+= device_if.h fb_if.h bus_if.h pci_if.h iicbus_if.h iicbb_if.h \
>-	 opt_drm.h opt_compat.h opt_syscons.h
>+SRCS	+=								\
>+	opt_acpi.h							\
>+	opt_compat.h							\
>+	opt_drm.h							\
>+	opt_syscons.h							\
>+	acpi_if.h							\
>+	bus_if.h							\
>+	fb_if.h								\
>+	device_if.h							\
>+	iicbb_if.h							\
>+	iicbus_if.h							\
>+	pci_if.h
> 
> .include <bsd.kmod.mk>
> 
>diff -ur mydrm2/radeonkms/Makefile /usr/src/sys/modules/drm2/radeonkms/Makefile
>--- mydrm2/radeonkms/Makefile	2015-09-12 16:15:28.000000000 -0400
>+++ /usr/src/sys/modules/drm2/radeonkms/Makefile	2015-08-13 08:38:01.000000000 -0400
>@@ -1,4 +1,4 @@
>-# $FreeBSD: releng/10.1/sys/modules/drm2/radeonkms/Makefile 266594 2014-05-23 19:43:20Z dumbbell $
>+# $FreeBSD: releng/10.2/sys/modules/drm2/radeonkms/Makefile 282199 2015-04-28 19:35:05Z dumbbell $
> 
> .include <bsd.own.mk>
> 
>@@ -17,11 +17,11 @@
> 	evergreen_reg_safe.h						\
> 	cayman_reg_safe.h
> SRCS	+=								\
>-	radeon_acpi.c							\
>+	${radeon_acpi}							\
> 	radeon_agp.c							\
> 	radeon_asic.c							\
> 	radeon_atombios.c						\
>-	radeon_atpx_handler.c						\
>+	${radeon_atpx_handler}						\
> 	radeon_benchmark.c						\
> 	radeon_bios.c							\
> 	radeon_clocks.c							\
>@@ -39,6 +39,7 @@
> 	radeon_gart.c							\
> 	radeon_gem.c							\
> 	radeon_i2c.c							\
>+	${radeon_ioc32}							\
> 	radeon_irq.c							\
> 	radeon_irq_kms.c						\
> 	radeon_kms.c							\
>@@ -88,8 +89,13 @@
> 	si.c								\
> 	si_blit_shaders.c
> 
>-.if ${MACHINE_CPUARCH} == "amd64"
>-SRCS	+= radeon_ioc32.c
>+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
>+radeon_acpi=		radeon_acpi.c
>+#radeon_atpx_handler=	radeon_atpx_handler.c
>+.endif
>+
>+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
>+radeon_ioc32=		radeon_ioc32.c
> .endif
> 
> #radeon_prime.c
>@@ -108,6 +114,10 @@
> 	iicbus_if.h							\
> 	pci_if.h
> 
>-CFLAGS  += -I${.CURDIR}/../../../dev/drm2/radeon ${GCC_MS_EXTENSIONS}
>-
> .include <bsd.kmod.mk>
>+
>+CFLAGS+=			-I${.CURDIR}/../../../dev/drm2/radeon ${GCC_MS_EXTENSIONS}
>+
>+CWARNFLAGS.radeon_cp.c=		-Wno-unused-value
>+CWARNFLAGS.r600_cp.c=		-Wno-unused-value
>+CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}
>diff -ur mydrm2/radeonkmsfw/Makefile /usr/src/sys/modules/drm2/radeonkmsfw/Makefile
>--- mydrm2/radeonkmsfw/Makefile	2015-09-12 16:15:28.000000000 -0400
>+++ /usr/src/sys/modules/drm2/radeonkmsfw/Makefile	2015-08-13 08:38:01.000000000 -0400
>@@ -1,4 +1,6 @@
>-# $FreeBSD: releng/10.1/sys/modules/drm2/radeonkmsfw/Makefile 254885 2013-08-25 19:37:15Z dumbbell $
>+# $FreeBSD: releng/10.2/sys/modules/drm2/radeonkmsfw/Makefile 282217 2015-04-29 12:54:21Z dumbbell $
>+
>+SUBDIR_PARALLEL=
> 
> SUBDIR=									\
> 	ARUBA_me							\

Actions: View

Attachments on bug 194766: 148946 | 148947 | 148948 | 148949 | 148950 | 148952 | 148953 | 148954 | 148955 | 148956 | 149332 | 152206 | 160405 | 160406 | 160959 | 160960 | 163422 | 164264 | 170154 | 193086