diff --git a/cross-aarch64-gcc11-bootstrap.spec b/cross-aarch64-gcc11-bootstrap.spec
index 62c0568..035f146 100644
--- a/cross-aarch64-gcc11-bootstrap.spec
+++ b/cross-aarch64-gcc11-bootstrap.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-aarch64-gcc11.spec b/cross-aarch64-gcc11.spec
index 27081d3..eb6d595 100644
--- a/cross-aarch64-gcc11.spec
+++ b/cross-aarch64-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-amdgcn-gcc11.spec b/cross-amdgcn-gcc11.spec
index d78d023..8c71bcb 100644
--- a/cross-amdgcn-gcc11.spec
+++ b/cross-amdgcn-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-arm-gcc11.spec b/cross-arm-gcc11.spec
index 8ac6798..d421e28 100644
--- a/cross-arm-gcc11.spec
+++ b/cross-arm-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-arm-none-gcc11-bootstrap.spec b/cross-arm-none-gcc11-bootstrap.spec
index cf4225b..7a60f7f 100644
--- a/cross-arm-none-gcc11-bootstrap.spec
+++ b/cross-arm-none-gcc11-bootstrap.spec
@@ -534,6 +534,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-arm-none-gcc11.spec b/cross-arm-none-gcc11.spec
index 152d835..7f2cc02 100644
--- a/cross-arm-none-gcc11.spec
+++ b/cross-arm-none-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-avr-gcc11-bootstrap.spec b/cross-avr-gcc11-bootstrap.spec
index 29697eb..536d00b 100644
--- a/cross-avr-gcc11-bootstrap.spec
+++ b/cross-avr-gcc11-bootstrap.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-avr-gcc11.spec b/cross-avr-gcc11.spec
index 935b786..bfe3f75 100644
--- a/cross-avr-gcc11.spec
+++ b/cross-avr-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-epiphany-gcc11-bootstrap.spec b/cross-epiphany-gcc11-bootstrap.spec
index 5ad4638..aae5ef7 100644
--- a/cross-epiphany-gcc11-bootstrap.spec
+++ b/cross-epiphany-gcc11-bootstrap.spec
@@ -534,6 +534,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-epiphany-gcc11.spec b/cross-epiphany-gcc11.spec
index 27854e2..f7bf510 100644
--- a/cross-epiphany-gcc11.spec
+++ b/cross-epiphany-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-hppa-gcc11.spec b/cross-hppa-gcc11.spec
index 6edb6cb..a955ba0 100644
--- a/cross-hppa-gcc11.spec
+++ b/cross-hppa-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-i386-gcc11.spec b/cross-i386-gcc11.spec
index f1b5c7e..a8188be 100644
--- a/cross-i386-gcc11.spec
+++ b/cross-i386-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-m68k-gcc11.spec b/cross-m68k-gcc11.spec
index 9986927..bc36f6c 100644
--- a/cross-m68k-gcc11.spec
+++ b/cross-m68k-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-mips-gcc11.spec b/cross-mips-gcc11.spec
index 666103d..b36095e 100644
--- a/cross-mips-gcc11.spec
+++ b/cross-mips-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-nvptx-gcc11.spec b/cross-nvptx-gcc11.spec
index 0d80588..a752bf7 100644
--- a/cross-nvptx-gcc11.spec
+++ b/cross-nvptx-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-ppc64-gcc11.spec b/cross-ppc64-gcc11.spec
index 269ba4a..5c3b783 100644
--- a/cross-ppc64-gcc11.spec
+++ b/cross-ppc64-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-ppc64le-gcc11.spec b/cross-ppc64le-gcc11.spec
index 7cf7492..1ef7b7c 100644
--- a/cross-ppc64le-gcc11.spec
+++ b/cross-ppc64le-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-riscv64-elf-gcc11-bootstrap.spec b/cross-riscv64-elf-gcc11-bootstrap.spec
index 20a262a..2f1f519 100644
--- a/cross-riscv64-elf-gcc11-bootstrap.spec
+++ b/cross-riscv64-elf-gcc11-bootstrap.spec
@@ -534,6 +534,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-riscv64-elf-gcc11.spec b/cross-riscv64-elf-gcc11.spec
index ae6fda5..e87321a 100644
--- a/cross-riscv64-elf-gcc11.spec
+++ b/cross-riscv64-elf-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-riscv64-gcc11-bootstrap.spec b/cross-riscv64-gcc11-bootstrap.spec
index f4b96d5..06a89c0 100644
--- a/cross-riscv64-gcc11-bootstrap.spec
+++ b/cross-riscv64-gcc11-bootstrap.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-riscv64-gcc11.spec b/cross-riscv64-gcc11.spec
index 755955a..a7bbfab 100644
--- a/cross-riscv64-gcc11.spec
+++ b/cross-riscv64-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-rx-gcc11-bootstrap.spec b/cross-rx-gcc11-bootstrap.spec
index 5b5d4a0..c06641c 100644
--- a/cross-rx-gcc11-bootstrap.spec
+++ b/cross-rx-gcc11-bootstrap.spec
@@ -534,6 +534,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-rx-gcc11.spec b/cross-rx-gcc11.spec
index 207056f..8dcdf2e 100644
--- a/cross-rx-gcc11.spec
+++ b/cross-rx-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-s390x-gcc11.spec b/cross-s390x-gcc11.spec
index 4ad76d7..e39e5c3 100644
--- a/cross-s390x-gcc11.spec
+++ b/cross-s390x-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-sparc-gcc11.spec b/cross-sparc-gcc11.spec
index 902fd49..eb5890b 100644
--- a/cross-sparc-gcc11.spec
+++ b/cross-sparc-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-sparc64-gcc11.spec b/cross-sparc64-gcc11.spec
index 6ecca5b..7603483 100644
--- a/cross-sparc64-gcc11.spec
+++ b/cross-sparc64-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/cross-x86_64-gcc11.spec b/cross-x86_64-gcc11.spec
index 3f5715a..647dd72 100644
--- a/cross-x86_64-gcc11.spec
+++ b/cross-x86_64-gcc11.spec
@@ -533,6 +533,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/gcc.spec.in b/gcc.spec.in
index eafecbd..e00e1c9 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -1382,6 +1382,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/gcc11-testresults.spec b/gcc11-testresults.spec
index 73bd542..e50622b 100644
--- a/gcc11-testresults.spec
+++ b/gcc11-testresults.spec
@@ -722,6 +722,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \
diff --git a/gcc11.spec b/gcc11.spec
index a6ff4f7..3c8eead 100644
--- a/gcc11.spec
+++ b/gcc11.spec
@@ -2141,6 +2141,9 @@ amdgcn-amdhsa,\
 %endif
 %if 0%{?gcc_target_newlib}
 	--with-newlib \
+%if 0%{?gcc_libc_bootstrap:1}
+	--disable-gcov \
+%endif
 %else
 %if 0%{?gcc_libc_bootstrap:1}
 	--disable-gcov --disable-threads --disable-shared \