14368 make debug fails with gcc7

gwr · gwr · commit c95b31e93d85 · 2022-01-05T20:39:00.000-05:00
diff --git a/usr/src/uts/intel/drm/Makefile b/usr/src/uts/intel/drm/Makefile
@@ -57,6 +57,7 @@ include $(UTSBASE)/common/io/drm/Makefile.mod
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-unused-function
 CERRWARN	+= -_gcc=-Wno-unused-variable
+CERRWARN	+= -_gcc=-Wno-unused-but-set-variable
 
 #
 #	Define targets
diff --git a/usr/src/uts/intel/i915/Makefile b/usr/src/uts/intel/i915/Makefile
@@ -60,6 +60,7 @@ include $(UTSBASE)/intel/io/i915/Makefile.mod
 CERRWARN	+= -_gcc=-Wno-parentheses
 CERRWARN	+= -_gcc=-Wno-unused-function
 CERRWARN	+= -_gcc=-Wno-unused-variable
+CERRWARN	+= -_gcc=-Wno-unused-but-set-variable
 CERRWARN	+= -_gcc=-Wno-override-init
 
 #
diff --git a/usr/src/uts/intel/io/i915/i915_irq.c b/usr/src/uts/intel/io/i915/i915_irq.c
@@ -1445,6 +1445,7 @@ static void i915_get_extra_instdone(struct drm_device *dev,
 		break;
 	default:
 		DRM_INFO("Unsupported platform\n");
+		/* FALLTHROUGH */
 	case 7:
 		instdone[0] = I915_READ(GEN7_INSTDONE_1);
 		instdone[1] = I915_READ(GEN7_SC_INSTDONE);
diff --git a/usr/src/uts/intel/io/i915/intel_hdmi.c b/usr/src/uts/intel/io/i915/intel_hdmi.c
@@ -1186,6 +1186,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
 	case PORT_A:
 		intel_encoder->hpd_pin = HPD_PORT_A;
 		/* Internal port only for eDP. */
+		/* FALLTHROUGH */
 	default:
 		BUG();
 	}

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ include $(UTSBASE)/common/io/drm/Makefile.mod`
`57`	`57`	`CERRWARN += -_gcc=-Wno-parentheses`
`58`	`58`	`CERRWARN += -_gcc=-Wno-unused-function`
`59`	`59`	`CERRWARN += -_gcc=-Wno-unused-variable`
	`60`	`+CERRWARN += -_gcc=-Wno-unused-but-set-variable`
`60`	`61`
`61`	`62`	`#`
`62`	`63`	`# Define targets`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ include $(UTSBASE)/intel/io/i915/Makefile.mod`
`60`	`60`	`CERRWARN += -_gcc=-Wno-parentheses`
`61`	`61`	`CERRWARN += -_gcc=-Wno-unused-function`
`62`	`62`	`CERRWARN += -_gcc=-Wno-unused-variable`
	`63`	`+CERRWARN += -_gcc=-Wno-unused-but-set-variable`
`63`	`64`	`CERRWARN += -_gcc=-Wno-override-init`
`64`	`65`
`65`	`66`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1186,6 +1186,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,`
`1186`	`1186`	`case PORT_A:`
`1187`	`1187`	`intel_encoder->hpd_pin = HPD_PORT_A;`
`1188`	`1188`	`/* Internal port only for eDP. */`
	`1189`	`+ /* FALLTHROUGH */`
`1189`	`1190`	`default:`
`1190`	`1191`	`BUG();`
`1191`	`1192`	`}`