summaryrefslogtreecommitdiffstats
path: root/patches/squashfs4.4/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/squashfs4.4/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch')
-rw-r--r--patches/squashfs4.4/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/patches/squashfs4.4/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch b/patches/squashfs4.4/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch
new file mode 100644
index 000000000..3c6db8fff
--- /dev/null
+++ b/patches/squashfs4.4/0001-squashfs-tools-fix-build-failure-against-gcc-10.patch
@@ -0,0 +1,42 @@
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 26 Jan 2020 18:35:13 +0000
+Subject: [PATCH] squashfs-tools: fix build failure against gcc-10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On gcc-10 (and gcc-9 -fno-common) build fails as:
+
+```
+cc ... -o mksquashfs
+ld: read_fs.o:(.bss+0x0):
+ multiple definition of `fwriter_buffer'; mksquashfs.o:(.bss+0x400c90): first defined here
+ld: read_fs.o:(.bss+0x8):
+ multiple definition of `bwriter_buffer'; mksquashfs.o:(.bss+0x400c98): first defined here
+```
+
+gcc-10 will change the default from -fcommon to fno-common:
+https://gcc.gnu.org/PR85678.
+
+The error also happens if CFLAGS=-fno-common passed explicitly.
+
+Reported-by: Toralf Förster
+Bug: https://bugs.gentoo.org/706456
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ squashfs-tools/mksquashfs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h
+index 1beefef70495..b650306360fb 100644
+--- a/squashfs-tools/mksquashfs.h
++++ b/squashfs-tools/mksquashfs.h
+@@ -143,7 +143,7 @@ struct append_file {
+ #endif
+
+ extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
+-struct cache *bwriter_buffer, *fwriter_buffer;
++extern struct cache *bwriter_buffer, *fwriter_buffer;
+ extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
+ *to_frag, *locked_fragment, *to_process_frag;
+ extern struct append_file **file_mapping;