summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/libgcrypt/files/fix-ICE-failure-on-mips-with-option-O-and-g.patch71
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt.inc4
2 files changed, 74 insertions, 1 deletions
diff --git a/meta/recipes-support/libgcrypt/files/fix-ICE-failure-on-mips-with-option-O-and-g.patch b/meta/recipes-support/libgcrypt/files/fix-ICE-failure-on-mips-with-option-O-and-g.patch
new file mode 100644
index 0000000000..56c591f06e
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/files/fix-ICE-failure-on-mips-with-option-O-and-g.patch
@@ -0,0 +1,71 @@
1tests/bench-slope.c: workaround ICE failure on mips with '-O -g'
2
3Hit a ICE and could reduce it to the following minimal example:
4
51. Only the size of array assigned with 2 caused the issue:
6$ cat > mipgcc-test.c << END
7
8int main (int argc, char **argv)
9{
10 char *pStrArry[ARRAY_SIZE_MAX] = {"hello"};
11 int i = 0;
12
13 while(pStrArry[i] && i<ARRAY_SIZE_MAX)
14 {
15 printf("%s\n", pStrArry[i]);
16 i++;
17 }
18
19 return 0;
20}
21
22END
23
242. Only -O1 and -g on mips caused the issue:
25$ mips-poky-linux-gcc -O1 -g -o mipgcc-test mipgcc-test.c
26mipgcc-test.c: In function 'main':
27mipgcc-test.c:18:1: internal compiler error: in dwarf2out_var_location, at dwarf2out.c:20810
28 }
29 ^
30Please submit a full bug report,
31with preprocessed source if appropriate.
32See <http://gcc.gnu.org/bugs.html> for instructions
33
343. The quick workround is trying to enlarge the size of array with larger
35than 2.
36
374. File a bug to GNU, but it could not be reproduced on there environment.
38http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60643
39
40Upstream-Status: [oe specific]
41
42Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
43---
44 tests/bench-slope.c | 4 ++--
45 1 file changed, 2 insertions(+), 2 deletions(-)
46
47diff --git a/tests/bench-slope.c b/tests/bench-slope.c
48index bd05064..28c2438 100644
49--- a/tests/bench-slope.c
50+++ b/tests/bench-slope.c
51@@ -1197,7 +1197,7 @@ static struct bench_ops hash_ops = {
52 };
53
54
55-static struct bench_hash_mode hash_modes[] = {
56+static struct bench_hash_mode hash_modes[3] = {
57 {"", &hash_ops},
58 {0},
59 };
60@@ -1349,7 +1349,7 @@ static struct bench_ops mac_ops = {
61 };
62
63
64-static struct bench_mac_mode mac_modes[] = {
65+static struct bench_mac_mode mac_modes[3] = {
66 {"", &mac_ops},
67 {0},
68 };
69--
701.8.1.2
71
diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
index 8afa945648..e3cd4f8a8b 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt.inc
+++ b/meta/recipes-support/libgcrypt/libgcrypt.inc
@@ -12,7 +12,9 @@ DEPENDS = "libgpg-error libcap"
12 12
13SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \ 13SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
14 file://add-pkgconfig-support.patch \ 14 file://add-pkgconfig-support.patch \
15 file://libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch" 15 file://libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
16 file://fix-ICE-failure-on-mips-with-option-O-and-g.patch \
17"
16 18
17inherit autotools-brokensep texinfo binconfig pkgconfig 19inherit autotools-brokensep texinfo binconfig pkgconfig
18 20