X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=bfd%2Felf32-s390.c;h=56008a13eb2aaf17927e6706126d0351f239b335;hb=fe75810f8e0cc33384f22d0479506711d4014c60;hp=ebda1dacdcc15fced8e4b0839e8a5b2ad2f9f94c;hpb=724436fccb68156ff53b7b03cb7f41547a65c30c;p=binutils-gdb.git

diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index ebda1dacdcc..56008a13eb2 100644
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -3951,16 +3951,18 @@ elf_s390_write_core_note (bfd *abfd, char *buf, int *bufsiz,
 	va_end (ap);
 
 	strncpy (data + 28, fname, 16);
+#if GCC_VERSION == 8001
 	DIAGNOSTIC_PUSH;
 	/* GCC 8.1 warns about 80 equals destination size with
 	   -Wstringop-truncation:
 	   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85643
 	 */
-#if GCC_VERSION == 8001
 	DIAGNOSTIC_IGNORE_STRINGOP_TRUNCATION;
 #endif
 	strncpy (data + 44, psargs, 80);
+#if GCC_VERSION == 8001
 	DIAGNOSTIC_POP;
+#endif
 	return elfcore_write_note (abfd, buf, bufsiz, "CORE", note_type,
 				   &data, sizeof (data));
       }