diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-11 17:54:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-12 13:10:17 +0100 |
commit | 2d09cb28f25080ed337d37d2d4381b846bbe6247 (patch) | |
tree | e8ea35f139ed5d11043a23a7dcaf257a75f2c88a /meta/recipes-devtools | |
parent | e6bb5dbb62257a7de730ea9085dfd89520f3e47d (diff) | |
download | poky-2d09cb28f25080ed337d37d2d4381b846bbe6247.tar.gz |
gcc5: Add PR65779 patch to fix powerpc compile issues
This fixes compile issues on powerpc with gcc 5 which show up with
errors like:
| make[2]: Entering directory '/media/build1/poky/build/tmp/work/ppc7400-poky-linux/xprop/1_1.2.2-r0/build'
| powerpc-poky-linux-gcc -m32 -mhard-float -mcpu=7400 --sysroot=/media/build1/poky/build/tmp/sysroots/qemuppc -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wlogical-op -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -O2 -pipe -g -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o xprop dsimple.o clientwin.o xprop.o -lX11
| /media/build1/poky/build/tmp/sysroots/qemuppc/usr/lib/../lib/libX11.so: undefined reference to `.LCL2'
| collect2: error: ld returned 1 exit status
[YOCTO #7721]
(From OE-Core rev: 1702f52b5860336d36fb912fbe2851437e74a7d5)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-5.1.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-5.1/0037-pr65779.patch | 173 |
2 files changed, 174 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-5.1.inc b/meta/recipes-devtools/gcc/gcc-5.1.inc index db4c795ef9..305736b691 100644 --- a/meta/recipes-devtools/gcc/gcc-5.1.inc +++ b/meta/recipes-devtools/gcc/gcc-5.1.inc | |||
@@ -68,6 +68,7 @@ SRC_URI = "\ | |||
68 | file://0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch \ | 68 | file://0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch \ |
69 | file://0035-Dont-link-the-plugins-with-libgomp-explicitly.patch \ | 69 | file://0035-Dont-link-the-plugins-with-libgomp-explicitly.patch \ |
70 | file://0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \ | 70 | file://0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \ |
71 | file://0037-pr65779.patch \ | ||
71 | " | 72 | " |
72 | 73 | ||
73 | #S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${SNAP}" | 74 | #S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${SNAP}" |
diff --git a/meta/recipes-devtools/gcc/gcc-5.1/0037-pr65779.patch b/meta/recipes-devtools/gcc/gcc-5.1/0037-pr65779.patch new file mode 100644 index 0000000000..1424673df8 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-5.1/0037-pr65779.patch | |||
@@ -0,0 +1,173 @@ | |||
1 | List-Id: <gcc-patches.gcc.gnu.org> | ||
2 | List-Archive: <http://gcc.gnu.org/ml/gcc-patches/> | ||
3 | List-Post: <mailto:gcc-patches at gcc dot gnu dot org> | ||
4 | List-Help: <mailto:gcc-patches-help at gcc dot gnu dot org> | ||
5 | Date: Mon, 20 Apr 2015 12:40:49 +0930 | ||
6 | From: Alan Modra <amodra at gmail dot com> | ||
7 | To: gcc-patches at gcc dot gnu dot org | ||
8 | Subject: [Patch] pr65779 - [5/6 Regression] undefined local symbol on powerpc | ||
9 | |||
10 | This patch removes bogus debug info left around by shrink-wrapping, | ||
11 | which on some powerpc targets with just the right register allocation | ||
12 | led to assembly errors. | ||
13 | |||
14 | Bootstrapped and regression tested powerpc64-linux and x86_64-linux. | ||
15 | |||
16 | https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65779 | ||
17 | |||
18 | gcc/ | ||
19 | PR debug/65779 | ||
20 | * shrink-wrap.c (insn_uses_reg): New function. | ||
21 | (move_insn_for_shrink_wrap): Remove debug insns using regs set | ||
22 | by the moved insn. | ||
23 | gcc/testsuite/ | ||
24 | * gcc.dg/pr65779.c: New. | ||
25 | |||
26 | Upstream-Status: Pending (from mailing list, not merged yet) | ||
27 | |||
28 | Index: a/gcc/shrink-wrap.c | ||
29 | =================================================================== | ||
30 | --- a/gcc/shrink-wrap.c.orig | ||
31 | +++ b/gcc/shrink-wrap.c | ||
32 | @@ -182,6 +182,21 @@ live_edge_for_reg (basic_block bb, int r | ||
33 | return live_edge; | ||
34 | } | ||
35 | |||
36 | +static bool | ||
37 | +insn_uses_reg (rtx_insn *insn, unsigned int regno, unsigned int end_regno) | ||
38 | +{ | ||
39 | + df_ref use; | ||
40 | + | ||
41 | + FOR_EACH_INSN_USE (use, insn) | ||
42 | + { | ||
43 | + rtx reg = DF_REF_REG (use); | ||
44 | + | ||
45 | + if (REG_P (reg) && REGNO (reg) >= regno && REGNO (reg) < end_regno) | ||
46 | + return true; | ||
47 | + } | ||
48 | + return false; | ||
49 | +} | ||
50 | + | ||
51 | /* Try to move INSN from BB to a successor. Return true on success. | ||
52 | USES and DEFS are the set of registers that are used and defined | ||
53 | after INSN in BB. SPLIT_P indicates whether a live edge from BB | ||
54 | @@ -340,10 +355,15 @@ move_insn_for_shrink_wrap (basic_block b | ||
55 | *split_p = true; | ||
56 | } | ||
57 | |||
58 | + vec<basic_block> live_bbs; | ||
59 | + if (MAY_HAVE_DEBUG_INSNS) | ||
60 | + live_bbs.create (5); | ||
61 | /* At this point we are committed to moving INSN, but let's try to | ||
62 | move it as far as we can. */ | ||
63 | do | ||
64 | { | ||
65 | + if (MAY_HAVE_DEBUG_INSNS) | ||
66 | + live_bbs.safe_push (bb); | ||
67 | live_out = df_get_live_out (bb); | ||
68 | live_in = df_get_live_in (next_block); | ||
69 | bb = next_block; | ||
70 | @@ -426,6 +446,34 @@ move_insn_for_shrink_wrap (basic_block b | ||
71 | SET_REGNO_REG_SET (bb_uses, i); | ||
72 | } | ||
73 | |||
74 | + /* Remove debug insns using regs set by the insn we are moving. */ | ||
75 | + if (MAY_HAVE_DEBUG_INSNS) | ||
76 | + { | ||
77 | + while (!live_bbs.is_empty ()) | ||
78 | + { | ||
79 | + rtx_insn *dinsn; | ||
80 | + basic_block tmp_bb = live_bbs.pop (); | ||
81 | + | ||
82 | + FOR_BB_INSNS_REVERSE (tmp_bb, dinsn) | ||
83 | + { | ||
84 | + if (dinsn == insn) | ||
85 | + break; | ||
86 | + if (DEBUG_INSN_P (dinsn) | ||
87 | + && insn_uses_reg (dinsn, dregno, end_dregno)) | ||
88 | + { | ||
89 | + if (*split_p) | ||
90 | + /* If split, then we will be moving insn into a | ||
91 | + newly created block immediately after the entry | ||
92 | + block. Move the debug info there too. */ | ||
93 | + emit_debug_insn_after (PATTERN (dinsn), bb_note (bb)); | ||
94 | + delete_insn (dinsn); | ||
95 | + break; | ||
96 | + } | ||
97 | + } | ||
98 | + } | ||
99 | + live_bbs.release (); | ||
100 | + } | ||
101 | + | ||
102 | emit_insn_after (PATTERN (insn), bb_note (bb)); | ||
103 | delete_insn (insn); | ||
104 | return true; | ||
105 | Index: b/gcc/testsuite/gcc.dg/pr65779.c | ||
106 | =================================================================== | ||
107 | --- /dev/null | ||
108 | +++ b/gcc/testsuite/gcc.dg/pr65779.c | ||
109 | @@ -0,0 +1,64 @@ | ||
110 | +/* { dg-do run } */ | ||
111 | +/* { dg-options "-O2 -g" } */ | ||
112 | +/* { dg-additional-options "-mrelocatable" { target powerpc-*-rtems* } } */ | ||
113 | + | ||
114 | +unsigned long __attribute__ ((noinline)) | ||
115 | +adler32 (unsigned long adler, unsigned char *buf, unsigned int len) | ||
116 | +{ | ||
117 | + unsigned long s1 = adler & 0xffff; | ||
118 | + unsigned long s2 = (adler >> 16) & 0xffff; | ||
119 | + int k; | ||
120 | + | ||
121 | + if (buf == 0) | ||
122 | + return 1L; | ||
123 | + | ||
124 | + while (len > 0) | ||
125 | + { | ||
126 | + k = len < 5552 ? len : 5552; | ||
127 | + len -= k; | ||
128 | + while (k >= 16) | ||
129 | + { | ||
130 | + s1 += *buf++; s2 += s1; | ||
131 | + s1 += *buf++; s2 += s1; | ||
132 | + s1 += *buf++; s2 += s1; | ||
133 | + s1 += *buf++; s2 += s1; | ||
134 | + s1 += *buf++; s2 += s1; | ||
135 | + s1 += *buf++; s2 += s1; | ||
136 | + s1 += *buf++; s2 += s1; | ||
137 | + s1 += *buf++; s2 += s1; | ||
138 | + s1 += *buf++; s2 += s1; | ||
139 | + s1 += *buf++; s2 += s1; | ||
140 | + s1 += *buf++; s2 += s1; | ||
141 | + s1 += *buf++; s2 += s1; | ||
142 | + s1 += *buf++; s2 += s1; | ||
143 | + s1 += *buf++; s2 += s1; | ||
144 | + s1 += *buf++; s2 += s1; | ||
145 | + s1 += *buf++; s2 += s1; | ||
146 | + k -= 16; | ||
147 | + } | ||
148 | + if (k != 0) | ||
149 | + do | ||
150 | + { | ||
151 | + s1 += *buf++; s2 += s1; | ||
152 | + } while (--k); | ||
153 | + s1 &= 0xffffffffUL; | ||
154 | + s2 &= 0xffffffffUL; | ||
155 | + s1 %= 65521L; | ||
156 | + s2 %= 65521L; | ||
157 | + } | ||
158 | + return (s2 << 16) | s1; | ||
159 | +} | ||
160 | + | ||
161 | +unsigned char buf[] = { 0, 1, 2, 3, 4, 5, 6, 7, | ||
162 | + 8, 9, 10, 11, 12, 13, 14, 15, | ||
163 | + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, | ||
164 | + 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, | ||
165 | + 0x55, 0xaa }; | ||
166 | +int | ||
167 | +main () | ||
168 | +{ | ||
169 | + unsigned long x = adler32 (0, buf, sizeof buf); | ||
170 | + if (x != 0x640409efUL) | ||
171 | + __builtin_abort (); | ||
172 | + return 0; | ||
173 | +} | ||