summaryrefslogtreecommitdiff
path: root/sys/external
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2023-06-03 21:31:45 +0000
committerlukem <lukem@NetBSD.org>2023-06-03 21:31:45 +0000
commit75c33a368a0d60a33857c90e9e9dcd5a6d179831 (patch)
tree271ce1d4f915433abe4c0b7e69faacb33fa18a52 /sys/external
parentbf78d24f392cabe409a8996d69a3aa31cfa05bf5 (diff)
adapt to ${CC_WNO_MAYBE_UNINITIALIZED}
Use ${CC_WNO_MAYBE_UNINITIALIZED} instead of the older style more complex expressions. Remove workarounds if they were for a specific version of gcc < 10.
Diffstat (limited to 'sys/external')
-rw-r--r--sys/external/bsd/drm2/i915drm/files.i915drmkms6
-rw-r--r--sys/external/bsd/drm2/radeon/files.radeon4
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/external/bsd/drm2/i915drm/files.i915drmkms b/sys/external/bsd/drm2/i915drm/files.i915drmkms
index 67797fb95f4..a534c3a35e6 100644
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.89 2023/06/03 21:30:22 lukem Exp $
+# $NetBSD: files.i915drmkms,v 1.90 2023/06/03 21:31:46 lukem Exp $
version 20180827
@@ -48,9 +48,9 @@ makeoptions i915drmkms "CWARNFLAGS.i915_pci.c"+="${${ACTIVE_CC} == gcc:? -Wno-
makeoptions i915drmkms "CWARNFLAGS.i915_pci.c"+="${${ACTIVE_CC} == clang:? -Wno-initializer-overrides :}"
makeoptions i915drmkms "CWARNFLAGS.i915_sw_fence.c"+="${${ACTIVE_CC} == clang :? -Wno-unused-function :}"
-makeoptions i915drmkms "CWARNFLAGS.intel_sprite.c"+="${${ACTIVE_CC} == gcc:? -Wno-maybe-uninitialized :}"
+makeoptions i915drmkms "CWARNFLAGS.intel_sprite.c"+="${CC_WNO_MAYBE_UNINITIALIZED}"
-makeoptions i915drmkms "CWARNFLAGS.intel_ddi.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 10:? -Wno-maybe-uninitialized :} ${CC_WNO_IMPLICIT_FALLTHROUGH}"
+makeoptions i915drmkms "CWARNFLAGS.intel_ddi.c"+="${CC_WNO_MAYBE_UNINITIALIZED} ${CC_WNO_IMPLICIT_FALLTHROUGH}"
makeoptions i915drmkms "CWARNFLAGS.intel_display.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
makeoptions i915drmkms "CWARNFLAGS.intel_guc_submission.c"+="${${ACTIVE_CC} == clang :? -Wno-unused-function :}"
makeoptions i915drmkms "CWARNFLAGS.intel_hdmi.c"+="${${ACTIVE_CC} == clang :? -Wno-unused-function :}"
diff --git a/sys/external/bsd/drm2/radeon/files.radeon b/sys/external/bsd/drm2/radeon/files.radeon
index aa44b5e3cd3..0a05178cc64 100644
--- a/sys/external/bsd/drm2/radeon/files.radeon
+++ b/sys/external/bsd/drm2/radeon/files.radeon
@@ -1,4 +1,4 @@
-# $NetBSD: files.radeon,v 1.38 2023/06/03 21:30:22 lukem Exp $
+# $NetBSD: files.radeon,v 1.39 2023/06/03 21:31:47 lukem Exp $
version 20180827
@@ -34,7 +34,7 @@ makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-pointer-arith"
makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-shadow"
makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-unused-const-variable"
-makeoptions radeon "CWARNFLAGS.radeon"+="${${ACTIVE_CC} == gcc:? -Wno-maybe-uninitialized :}"
+makeoptions radeon "CWARNFLAGS.radeon"+="${CC_WNO_MAYBE_UNINITIALIZED}"
#makeoptions radeon "CWARNFLAGS.radeon_cs.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
makeoptions radeon "CWARNFLAGS.radeon_evergreen_cs.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"