1*4882a593SmuzhiyunFrom e1cdcfd94172a0b1ba4c9df70f4d69a41c687404 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Sergei Trofimovich <slyfox@gentoo.org> 3*4882a593SmuzhiyunDate: Sun, 26 Jan 2020 18:35:13 +0000 4*4882a593SmuzhiyunSubject: [PATCH] squashfs-tools: fix build failure against gcc-10 5*4882a593SmuzhiyunMIME-Version: 1.0 6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunOn gcc-10 (and gcc-9 -fno-common) build fails as: 10*4882a593Smuzhiyun 11*4882a593Smuzhiyun``` 12*4882a593Smuzhiyuncc ... -o mksquashfs 13*4882a593Smuzhiyunld: read_fs.o:(.bss+0x0): 14*4882a593Smuzhiyun multiple definition of `fwriter_buffer'; mksquashfs.o:(.bss+0x400c90): first defined here 15*4882a593Smuzhiyunld: read_fs.o:(.bss+0x8): 16*4882a593Smuzhiyun multiple definition of `bwriter_buffer'; mksquashfs.o:(.bss+0x400c98): first defined here 17*4882a593Smuzhiyun``` 18*4882a593Smuzhiyun 19*4882a593Smuzhiyungcc-10 will change the default from -fcommon to fno-common: 20*4882a593Smuzhiyunhttps://gcc.gnu.org/PR85678. 21*4882a593Smuzhiyun 22*4882a593SmuzhiyunThe error also happens if CFLAGS=-fno-common passed explicitly. 23*4882a593Smuzhiyun 24*4882a593SmuzhiyunReported-by: Toralf Förster 25*4882a593SmuzhiyunBug: https://bugs.gentoo.org/706456 26*4882a593SmuzhiyunSigned-off-by: Sergei Trofimovich <slyfox@gentoo.org> 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun[Upstream: https://github.com/plougher/squashfs-tools/commit/fe2f5da4b0f8994169c53e84b7cb8a0feefc97b5.patch] 29*4882a593SmuzhiyunSigned-off-by: Peter Seiderer <ps.report@gmx.net> 30*4882a593Smuzhiyun--- 31*4882a593Smuzhiyun squashfs-tools/mksquashfs.h | 2 +- 32*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 33*4882a593Smuzhiyun 34*4882a593Smuzhiyundiff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h 35*4882a593Smuzhiyunindex 1beefef..b650306 100644 36*4882a593Smuzhiyun--- a/squashfs-tools/mksquashfs.h 37*4882a593Smuzhiyun+++ b/squashfs-tools/mksquashfs.h 38*4882a593Smuzhiyun@@ -143,7 +143,7 @@ struct append_file { 39*4882a593Smuzhiyun #endif 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache; 42*4882a593Smuzhiyun-struct cache *bwriter_buffer, *fwriter_buffer; 43*4882a593Smuzhiyun+extern struct cache *bwriter_buffer, *fwriter_buffer; 44*4882a593Smuzhiyun extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer, 45*4882a593Smuzhiyun *to_frag, *locked_fragment, *to_process_frag; 46*4882a593Smuzhiyun extern struct append_file **file_mapping; 47*4882a593Smuzhiyun-- 48*4882a593Smuzhiyun2.26.2 49*4882a593Smuzhiyun 50