39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
https://bugs.gentoo.org/706098
|
|
|
|
From 4667bddd365bcc1dc66c483835971f0083b44b1d Mon Sep 17 00:00:00 2001
|
|
From: Sergei Trofimovich <slyfox@gentoo.org>
|
|
Date: Wed, 22 Jan 2020 19:38:23 +0000
|
|
Subject: [PATCH] icd_generator.rb: fix build failure against gcc-10
|
|
|
|
On gcc-10 (and gcc-9 -fno-common) build fails as:
|
|
|
|
```
|
|
libtool: link: gcc -shared -fPIC -DPIC .libs/libdummy_icd.o .libs/libdummy_icd_gen.o \
|
|
-ldl -g -O2 -Wl,-soname -Wl,libdummycl.so.0 -o .libs/libdummycl.so.0.0.0
|
|
ld: .libs/libdummy_icd_gen.o:/home/slyfox/dev/git/ocl-icd/libdummy_icd_gen.h:226:
|
|
multiple definition of `master_dispatch'; .libs/libdummy_icd.o:/home/slyfox/dev/git/ocl-icd/libdummy_icd_gen.h:226: 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: Anthony Parsons
|
|
Bug: https://bugs.gentoo.org/706098
|
|
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
|
|
---
|
|
icd_generator.rb | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/icd_generator.rb
|
|
+++ b/icd_generator.rb
|
|
@@ -207,7 +207,7 @@ def self.generate_libdummy_icd_header
|
|
}
|
|
libdummy_icd_structures += "};\n\n"
|
|
libdummy_icd_structures += "#pragma GCC visibility push(hidden)\n\n"
|
|
- libdummy_icd_structures += "struct _cl_icd_dispatch master_dispatch; \n\n"
|
|
+ libdummy_icd_structures += "extern struct _cl_icd_dispatch master_dispatch; \n\n"
|
|
$use_name_in_test.each { |k, f|
|
|
libdummy_icd_structures += "typeof(#{f}) INT#{f};\n"
|
|
}
|