summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-12-14 06:23:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-22 16:08:49 +0000
commit4b83f1fef986b72c59ac438372c4a576745b9d4f (patch)
tree0c7d793e70eb3bd5704bcf8268321a97a31b6016 /meta
parent0381b78aa4dfc0d338fba69502e8f03a0c0f21e7 (diff)
downloadpoky-4b83f1fef986b72c59ac438372c4a576745b9d4f.tar.gz
gcc5: Upgrade gcc-5.2 -> gcc-5.3
Minor bugfix upgrade to gcc 5.3 for detailed list of fixes in 5.3 see https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&list_id=132738&resolution=FIXED&target_milestone=5.3 (From OE-Core rev: 8b664a7d6bba89a8221d7fd1a52915fef0002d71) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.2/0037-pr65779.patch173
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.2/0043-fix-arm-thumb.patch39
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.2/0046-musl-no-fixincludes.patch22
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3.inc (renamed from meta/recipes-devtools/gcc/gcc-5.2.inc)31
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch)10
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0002-uclibc-conf.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0002-uclibc-conf.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0003-gcc-uclibc-locale-ctype_touplow_t.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0003-gcc-uclibc-locale-ctype_touplow_t.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0004-uclibc-locale.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0004-uclibc-locale.patch)18
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0005-uclibc-locale-no__x.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0005-uclibc-locale-no__x.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0006-uclibc-locale-wchar_fix.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0006-uclibc-locale-wchar_fix.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0007-uclibc-locale-update.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0007-uclibc-locale-update.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0008-missing-execinfo_h.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0008-missing-execinfo_h.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0009-c99-snprintf.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0009-c99-snprintf.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0010-gcc-poison-system-directories.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0010-gcc-poison-system-directories.patch)26
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0011-gcc-poison-dir-extend.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0011-gcc-poison-dir-extend.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch)8
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0013-64-bit-multilib-hack.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0013-64-bit-multilib-hack.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0014-optional-libstdc.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0014-optional-libstdc.patch)12
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch)14
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0016-COLLECT_GCC_OPTIONS.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0016-COLLECT_GCC_OPTIONS.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch)14
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0018-fortran-cross-compile-hack.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0018-fortran-cross-compile-hack.patch)10
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0019-libgcc-sjlj-check.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0019-libgcc-sjlj-check.patch)10
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0020-cpp-honor-sysroot.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0020-cpp-honor-sysroot.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0021-MIPS64-Default-to-N64-ABI.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0021-MIPS64-Default-to-N64-ABI.patch)10
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch)8
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0023-gcc-Fix-argument-list-too-long-error.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0023-gcc-Fix-argument-list-too-long-error.patch)10
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0024-Disable-sdt.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0024-Disable-sdt.patch)22
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0025-libtool.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0025-libtool.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch)14
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0029-export-CPP.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0029-export-CPP.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch)10
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0032-Ensure-target-gcc-headers-can-be-included.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0032-Ensure-target-gcc-headers-can-be-included.patch)10
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch)8
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0037-aarch64-Add-support-for-musl-ldso.patch26
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0038-fix-g-sysroot.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0038-fix-g++-sysroot.patch)32
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch)11
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0040-handle-sysroot-support-for-nativesdk-gcc.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0040-nativesdk-gcc-support.patch)21
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0041-Search-target-sysroot-gcc-version-specific-dirs-with.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0041-handle-target-sysroot-multilib.patch)38
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0042-Fix-various-_FOR_BUILD-and-related-variables.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0042-cxxflags-for-build.patch)24
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0043-libstdc-Support-musl.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0043-libstdc-musl.patch)22
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0044-gcc-musl-support.patch)149
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch (renamed from meta/recipes-devtools/gcc/gcc-5.2/0045-musl-dynamic-linker.patch)146
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.3/0046-Get-rid-of-ever-broken-fixincludes-on-musl.patch28
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian_5.3.bb (renamed from meta/recipes-devtools/gcc/gcc-cross-canadian_5.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial_5.3.bb (renamed from meta/recipes-devtools/gcc/gcc-cross-initial_5.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross_5.3.bb (renamed from meta/recipes-devtools/gcc/gcc-cross_5.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk-initial_5.3.bb (renamed from meta/recipes-devtools/gcc/gcc-crosssdk-initial_5.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk_5.3.bb (renamed from meta/recipes-devtools/gcc/gcc-crosssdk_5.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime.inc4
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime_5.3.bb (renamed from meta/recipes-devtools/gcc/gcc-runtime_5.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-sanitizers_5.3.bb (renamed from meta/recipes-devtools/gcc/gcc-sanitizers_5.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-source_5.3.bb (renamed from meta/recipes-devtools/gcc/gcc-source_5.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc_5.3.bb (renamed from meta/recipes-devtools/gcc/gcc_5.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgcc-initial_5.3.bb (renamed from meta/recipes-devtools/gcc/libgcc-initial_5.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgcc_5.3.bb (renamed from meta/recipes-devtools/gcc/libgcc_5.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgfortran_5.3.bb (renamed from meta/recipes-devtools/gcc/libgfortran_5.2.bb)0
63 files changed, 502 insertions, 592 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0037-pr65779.patch b/meta/recipes-devtools/gcc/gcc-5.2/0037-pr65779.patch
deleted file mode 100644
index 1424673df8..0000000000
--- a/meta/recipes-devtools/gcc/gcc-5.2/0037-pr65779.patch
+++ /dev/null
@@ -1,173 +0,0 @@
1List-Id: <gcc-patches.gcc.gnu.org>
2List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
3List-Post: <mailto:gcc-patches at gcc dot gnu dot org>
4List-Help: <mailto:gcc-patches-help at gcc dot gnu dot org>
5Date: Mon, 20 Apr 2015 12:40:49 +0930
6From: Alan Modra <amodra at gmail dot com>
7To: gcc-patches at gcc dot gnu dot org
8Subject: [Patch] pr65779 - [5/6 Regression] undefined local symbol on powerpc
9
10This patch removes bogus debug info left around by shrink-wrapping,
11which on some powerpc targets with just the right register allocation
12led to assembly errors.
13
14Bootstrapped and regression tested powerpc64-linux and x86_64-linux.
15
16https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65779
17
18gcc/
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.
23gcc/testsuite/
24 * gcc.dg/pr65779.c: New.
25
26Upstream-Status: Pending (from mailing list, not merged yet)
27
28Index: 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;
105Index: 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+}
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0043-fix-arm-thumb.patch b/meta/recipes-devtools/gcc/gcc-5.2/0043-fix-arm-thumb.patch
deleted file mode 100644
index 2f262e3a3a..0000000000
--- a/meta/recipes-devtools/gcc/gcc-5.2/0043-fix-arm-thumb.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1Upstream-Status: Accepted
2
3Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
4---
5
62015-11-25 Vladimir Makarov <vmakarov@redhat.com>
7
8 PR rtl-optimization/67954
9 * lra-constraints.c (curr_insn_transform): Add check on scratch
10 pseudo when change class to NO_REGS. Add an assert.
11
12
13
14git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230894 138bc75d-0d04-0410-961f-82ee72b054a4
15---
16
17diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
18index 4670e81..c62bf6a 100644
19--- a/gcc/lra-constraints.c
20+++ b/gcc/lra-constraints.c
21@@ -3725,7 +3725,8 @@ curr_insn_transform (bool check_only_p)
22 assigment pass and the scratch pseudo will be
23 spilled. Spilled scratch pseudos are transformed
24 back to scratches at the LRA end. */
25- && lra_former_scratch_operand_p (curr_insn, i))
26+ && lra_former_scratch_operand_p (curr_insn, i)
27+ && lra_former_scratch_p (REGNO (op)))
28 {
29 int regno = REGNO (op);
30 lra_change_class (regno, NO_REGS, " Change to", true);
31@@ -3734,6 +3735,8 @@ curr_insn_transform (bool check_only_p)
32 spilled pseudo as there is only one such insn, the
33 current one. */
34 reg_renumber[regno] = -1;
35+ lra_assert (bitmap_single_bit_set_p
36+ (&lra_reg_info[REGNO (op)].insn_bitmap));
37 }
38 /* We can do an optional reload. If the pseudo got a hard
39 reg, we might improve the code through inheritance. If
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0046-musl-no-fixincludes.patch b/meta/recipes-devtools/gcc/gcc-5.2/0046-musl-no-fixincludes.patch
deleted file mode 100644
index 05fe52f5f5..0000000000
--- a/meta/recipes-devtools/gcc/gcc-5.2/0046-musl-no-fixincludes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1# HG changeset patch
2# Parent 600a8a422ccaf5627ad1f5a138e7398df2b9e9d8
3Get rid of ever-broken fixincludes on musl.
4
5Upstream-Status: Pending
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8
9Index: gcc-4.9-20140316/fixincludes/mkfixinc.sh
10===================================================================
11--- gcc-4.9-20140316.orig/fixincludes/mkfixinc.sh
12+++ gcc-4.9-20140316/fixincludes/mkfixinc.sh
13@@ -19,7 +19,8 @@ case $machine in
14 powerpc-*-eabi* | \
15 powerpc-*-rtems* | \
16 powerpcle-*-eabisim* | \
17- powerpcle-*-eabi* )
18+ powerpcle-*-eabi* | \
19+ *-musl* )
20 # IF there is no include fixing,
21 # THEN create a no-op fixer and exit
22 (echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
diff --git a/meta/recipes-devtools/gcc/gcc-5.2.inc b/meta/recipes-devtools/gcc/gcc-5.3.inc
index 2ebc675d9d..3ce089325f 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2.inc
+++ b/meta/recipes-devtools/gcc/gcc-5.3.inc
@@ -2,15 +2,15 @@ require gcc-common.inc
2 2
3# Third digit in PV should be incremented after a minor release 3# Third digit in PV should be incremented after a minor release
4 4
5PV = "5.2.0" 5PV = "5.3.0"
6 6
7#SNAP = "5-20150405" 7#SNAP = "5-20150405"
8 8
9# BINV should be incremented to a revision after a minor gcc release 9# BINV should be incremented to a revision after a minor gcc release
10 10
11BINV = "5.2.0" 11BINV = "5.3.0"
12 12
13FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-5.2:${FILE_DIRNAME}/gcc-5.2/backport:" 13FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-5.3:${FILE_DIRNAME}/gcc-5.3/backport:"
14 14
15DEPENDS =+ "mpfr gmp libmpc zlib" 15DEPENDS =+ "mpfr gmp libmpc zlib"
16NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native" 16NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native"
@@ -26,8 +26,6 @@ LIC_FILES_CHKSUM = "\
26" 26"
27#BASEURI = "http://www.netgull.com/gcc/snapshots/${SNAP}/gcc-${SNAP}.tar.bz2" 27#BASEURI = "http://www.netgull.com/gcc/snapshots/${SNAP}/gcc-${SNAP}.tar.bz2"
28BASEURI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2" 28BASEURI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2"
29SRC_URI[md5sum] = "a51bcfeb3da7dd4c623e27207ed43467"
30SRC_URI[sha256sum] = "5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad"
31 29
32SRC_URI = "\ 30SRC_URI = "\
33 ${BASEURI} \ 31 ${BASEURI} \
@@ -68,20 +66,23 @@ SRC_URI = "\
68 file://0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch \ 66 file://0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch \
69 file://0035-Dont-link-the-plugins-with-libgomp-explicitly.patch \ 67 file://0035-Dont-link-the-plugins-with-libgomp-explicitly.patch \
70 file://0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \ 68 file://0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \
71 file://0037-pr65779.patch \ 69 file://0037-aarch64-Add-support-for-musl-ldso.patch \
72 file://0038-fix-g++-sysroot.patch \ 70 file://0038-fix-g-sysroot.patch \
73 file://0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch \ 71 file://0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch \
74 file://0040-nativesdk-gcc-support.patch \ 72 file://0040-handle-sysroot-support-for-nativesdk-gcc.patch \
75 file://0041-handle-target-sysroot-multilib.patch \ 73 file://0041-Search-target-sysroot-gcc-version-specific-dirs-with.patch \
76 file://0042-cxxflags-for-build.patch \ 74 file://0042-Fix-various-_FOR_BUILD-and-related-variables.patch \
77 file://0043-fix-arm-thumb.patch \ 75 file://0043-libstdc-Support-musl.patch \
78 file://0043-libstdc-musl.patch \ 76 file://0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch \
79 file://0044-gcc-musl-support.patch \ 77 file://0045-Support-for-arm-linux-musl.patch \
80 file://0045-musl-dynamic-linker.patch \ 78 file://0046-Get-rid-of-ever-broken-fixincludes-on-musl.patch \
81 file://0046-musl-no-fixincludes.patch \
82 " 79 "
83 80
84BACKPORTS = "" 81BACKPORTS = ""
82
83SRC_URI[md5sum] = "c9616fd448f980259c31de613e575719"
84SRC_URI[sha256sum] = "b84f5592e9218b73dbae612b5253035a7b34a9a1f7688d2e1bfaaf7267d5c4db"
85
85#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${SNAP}" 86#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${SNAP}"
86S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" 87S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
87B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" 88B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-5.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
index 2c766f425d..1aead9691a 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
@@ -1,7 +1,7 @@
1From a0fee0cee3d4bd4aab1e3a8e04446f99d918c4ff Mon Sep 17 00:00:00 2001 1From 6029bb338305a5d1403ee23427ed8d58eae1ff53 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 08:37:11 +0400 3Date: Fri, 29 Mar 2013 08:37:11 +0400
4Subject: [PATCH 01/35] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET 4Subject: [PATCH 01/46] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7 7
@@ -12,7 +12,7 @@ Upstream-Status: Inappropriate [embedded specific]
12 2 files changed, 2 insertions(+), 2 deletions(-) 12 2 files changed, 2 insertions(+), 2 deletions(-)
13 13
14diff --git a/configure b/configure 14diff --git a/configure b/configure
15index 7616f88..50e7cbc 100755 15index a3f66ba..1cba3a9 100755
16--- a/configure 16--- a/configure
17+++ b/configure 17+++ b/configure
18@@ -7464,7 +7464,7 @@ fi 18@@ -7464,7 +7464,7 @@ fi
@@ -25,7 +25,7 @@ index 7616f88..50e7cbc 100755
25 *" newlib "*) 25 *" newlib "*)
26 case " $target_configargs " in 26 case " $target_configargs " in
27diff --git a/configure.ac b/configure.ac 27diff --git a/configure.ac b/configure.ac
28index 8c85a08..f34af7e 100644 28index 987dfab..d3adb95 100644
29--- a/configure.ac 29--- a/configure.ac
30+++ b/configure.ac 30+++ b/configure.ac
31@@ -3104,7 +3104,7 @@ fi 31@@ -3104,7 +3104,7 @@ fi
@@ -38,5 +38,5 @@ index 8c85a08..f34af7e 100644
38 *" newlib "*) 38 *" newlib "*)
39 case " $target_configargs " in 39 case " $target_configargs " in
40-- 40--
412.1.4 412.6.3
42 42
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0002-uclibc-conf.patch b/meta/recipes-devtools/gcc/gcc-5.3/0002-uclibc-conf.patch
index 69d33a0d6e..8d6aeb5e43 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0002-uclibc-conf.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0002-uclibc-conf.patch
@@ -1,7 +1,7 @@
1From 7635248a4c9b51d723d721acaeeb5f2f11957987 Mon Sep 17 00:00:00 2001 1From b67c3a844bccec1766a7ec120e2d18cdcbc5f114 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 08:38:25 +0400 3Date: Fri, 29 Mar 2013 08:38:25 +0400
4Subject: [PATCH 02/35] uclibc-conf 4Subject: [PATCH 02/46] uclibc-conf
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7 7
@@ -49,5 +49,5 @@ index 743d951..ae4ea60 100755
49 need_lib_prefix=no 49 need_lib_prefix=no
50 need_version=no 50 need_version=no
51-- 51--
522.1.4 522.6.3
53 53
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0003-gcc-uclibc-locale-ctype_touplow_t.patch b/meta/recipes-devtools/gcc/gcc-5.3/0003-gcc-uclibc-locale-ctype_touplow_t.patch
index bca254d5a2..bd0326343e 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0003-gcc-uclibc-locale-ctype_touplow_t.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0003-gcc-uclibc-locale-ctype_touplow_t.patch
@@ -1,7 +1,7 @@
1From 3aee58ad043af33ab00c9cd7bc88f0cade83f236 Mon Sep 17 00:00:00 2001 1From 9bcb3a1848ff0f8990301ca09a25b15c2cf90c6f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 08:40:12 +0400 3Date: Fri, 29 Mar 2013 08:40:12 +0400
4Subject: [PATCH 03/35] gcc-uclibc-locale-ctype_touplow_t 4Subject: [PATCH 03/46] gcc-uclibc-locale-ctype_touplow_t
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7 7
@@ -83,5 +83,5 @@ index fd52b73..2627cf3 100644
83 // NB: Offsets into ctype<char>::_M_table force a particular size 83 // NB: Offsets into ctype<char>::_M_table force a particular size
84 // on the mask type. Because of this, we don't use an enum. 84 // on the mask type. Because of this, we don't use an enum.
85-- 85--
862.1.4 862.6.3
87 87
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0004-uclibc-locale.patch b/meta/recipes-devtools/gcc/gcc-5.3/0004-uclibc-locale.patch
index 03947a7989..656265a285 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0004-uclibc-locale.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0004-uclibc-locale.patch
@@ -1,7 +1,7 @@
1From 9f73e06315c94629fb902bd94219667cf8307b8f Mon Sep 17 00:00:00 2001 1From bd9dd472d162fc72522f96f70f6391c7c63d2bf7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 08:41:39 +0400 3Date: Fri, 29 Mar 2013 08:41:39 +0400
4Subject: [PATCH 04/35] uclibc-locale 4Subject: [PATCH 04/46] uclibc-locale
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7 7
@@ -38,10 +38,10 @@ Upstream-Status: Pending
38 create mode 100644 libstdc++-v3/config/locale/uclibc/time_members.h 38 create mode 100644 libstdc++-v3/config/locale/uclibc/time_members.h
39 39
40diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 40diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
41index a1e301f..0fe9326 100644 41index 826ef86..79cc716 100644
42--- a/libstdc++-v3/acinclude.m4 42--- a/libstdc++-v3/acinclude.m4
43+++ b/libstdc++-v3/acinclude.m4 43+++ b/libstdc++-v3/acinclude.m4
44@@ -1983,6 +1983,9 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [ 44@@ -2029,6 +2029,9 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
45 # Default to "generic". 45 # Default to "generic".
46 if test $enable_clocale_flag = auto; then 46 if test $enable_clocale_flag = auto; then
47 case ${target_os} in 47 case ${target_os} in
@@ -51,7 +51,7 @@ index a1e301f..0fe9326 100644
51 linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu) 51 linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
52 enable_clocale_flag=gnu 52 enable_clocale_flag=gnu
53 ;; 53 ;;
54@@ -2167,6 +2170,40 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [ 54@@ -2213,6 +2216,40 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
55 CTIME_CC=config/locale/generic/time_members.cc 55 CTIME_CC=config/locale/generic/time_members.cc
56 CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h 56 CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
57 ;; 57 ;;
@@ -2737,10 +2737,10 @@ index 0000000..ba8e858
2737+ _S_destroy_c_locale(_M_c_locale_timepunct); 2737+ _S_destroy_c_locale(_M_c_locale_timepunct);
2738+ } 2738+ }
2739diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure 2739diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
2740index f5b28f4..fbad667 100755 2740index 8cd4c76..217012e 100755
2741--- a/libstdc++-v3/configure 2741--- a/libstdc++-v3/configure
2742+++ b/libstdc++-v3/configure 2742+++ b/libstdc++-v3/configure
2743@@ -15913,6 +15913,9 @@ fi 2743@@ -15918,6 +15918,9 @@ fi
2744 # Default to "generic". 2744 # Default to "generic".
2745 if test $enable_clocale_flag = auto; then 2745 if test $enable_clocale_flag = auto; then
2746 case ${target_os} in 2746 case ${target_os} in
@@ -2750,7 +2750,7 @@ index f5b28f4..fbad667 100755
2750 linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu) 2750 linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
2751 enable_clocale_flag=gnu 2751 enable_clocale_flag=gnu
2752 ;; 2752 ;;
2753@@ -16191,6 +16194,78 @@ $as_echo "newlib" >&6; } 2753@@ -16196,6 +16199,78 @@ $as_echo "newlib" >&6; }
2754 CTIME_CC=config/locale/generic/time_members.cc 2754 CTIME_CC=config/locale/generic/time_members.cc
2755 CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h 2755 CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
2756 ;; 2756 ;;
@@ -2858,5 +2858,5 @@ index aa1b2fa..45c4617 100644
2858 using ::wcsncat; 2858 using ::wcsncat;
2859 using ::wcsncmp; 2859 using ::wcsncmp;
2860-- 2860--
28612.1.4 28612.6.3
2862 2862
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0005-uclibc-locale-no__x.patch b/meta/recipes-devtools/gcc/gcc-5.3/0005-uclibc-locale-no__x.patch
index ac053eabd6..19a86a4e1d 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0005-uclibc-locale-no__x.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0005-uclibc-locale-no__x.patch
@@ -1,7 +1,7 @@
1From a8e683917a3e8a6642639e65c06d4d4fc46cc8ab Mon Sep 17 00:00:00 2001 1From 72a1a4af3c18627f59aa5ba1f753a89011b4e4f0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 08:42:36 +0400 3Date: Fri, 29 Mar 2013 08:42:36 +0400
4Subject: [PATCH 05/35] uclibc-locale-no__x 4Subject: [PATCH 05/46] uclibc-locale-no__x
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7 7
@@ -253,5 +253,5 @@ index e0707d7..d848ed5 100644
253 namespace std 253 namespace std
254 { 254 {
255-- 255--
2562.1.4 2562.6.3
257 257
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0006-uclibc-locale-wchar_fix.patch b/meta/recipes-devtools/gcc/gcc-5.3/0006-uclibc-locale-wchar_fix.patch
index 9112a2b1ab..d7dbe68bd2 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0006-uclibc-locale-wchar_fix.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0006-uclibc-locale-wchar_fix.patch
@@ -1,7 +1,7 @@
1From cdb9e9c9440beb59bc20476eea5a9cf2538cd194 Mon Sep 17 00:00:00 2001 1From b1298344f0c221c382a95af689f7f3ecd864f531 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 08:45:57 +0400 3Date: Fri, 29 Mar 2013 08:45:57 +0400
4Subject: [PATCH 06/35] uclibc-locale-wchar_fix 4Subject: [PATCH 06/46] uclibc-locale-wchar_fix
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7 7
@@ -64,5 +64,5 @@ index 2c70642..d5c8961 100644
64 if (_M_data->_M_thousands_sep == L'\0') 64 if (_M_data->_M_thousands_sep == L'\0')
65 _M_data->_M_grouping = ""; 65 _M_data->_M_grouping = "";
66-- 66--
672.1.4 672.6.3
68 68
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0007-uclibc-locale-update.patch b/meta/recipes-devtools/gcc/gcc-5.3/0007-uclibc-locale-update.patch
index 728b790820..cde749931d 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0007-uclibc-locale-update.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0007-uclibc-locale-update.patch
@@ -1,7 +1,7 @@
1From 244b9d1b5cc6d5382935192998531ee70afb262d Mon Sep 17 00:00:00 2001 1From e9d7cb62741c22d667fe56e98d50753d89aefdc3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 08:46:58 +0400 3Date: Fri, 29 Mar 2013 08:46:58 +0400
4Subject: [PATCH 07/35] uclibc-locale-update 4Subject: [PATCH 07/46] uclibc-locale-update
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7 7
@@ -538,5 +538,5 @@ index ba8e858..1665dde 100644
538 538
539 template<typename _CharT> 539 template<typename _CharT>
540-- 540--
5412.1.4 5412.6.3
542 542
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0008-missing-execinfo_h.patch b/meta/recipes-devtools/gcc/gcc-5.3/0008-missing-execinfo_h.patch
index b2f6b18533..9f8793125e 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0008-missing-execinfo_h.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0008-missing-execinfo_h.patch
@@ -1,7 +1,7 @@
1From 0a80f60de08bd5829ca1b3758f70a92b61dda143 Mon Sep 17 00:00:00 2001 1From 9b7442069eb68a42d2437181c1b2e710dd077e8b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 08:48:10 +0400 3Date: Fri, 29 Mar 2013 08:48:10 +0400
4Subject: [PATCH 08/35] missing-execinfo_h 4Subject: [PATCH 08/46] missing-execinfo_h
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7 7
@@ -24,5 +24,5 @@ index 6b38f2d..fca98ff 100644
24 # define GC_HAVE_BUILTIN_BACKTRACE 24 # define GC_HAVE_BUILTIN_BACKTRACE
25 # endif 25 # endif
26-- 26--
272.1.4 272.6.3
28 28
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0009-c99-snprintf.patch b/meta/recipes-devtools/gcc/gcc-5.3/0009-c99-snprintf.patch
index 525b2a1c4e..6b236c62c0 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0009-c99-snprintf.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0009-c99-snprintf.patch
@@ -1,7 +1,7 @@
1From 7b7caf4305a54fa4dfdd0efd5bd41cb94cbcf43d Mon Sep 17 00:00:00 2001 1From fde97f80d2d931ed3fa4a86294799366b2359331 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 08:49:03 +0400 3Date: Fri, 29 Mar 2013 08:49:03 +0400
4Subject: [PATCH 09/35] c99-snprintf 4Subject: [PATCH 09/46] c99-snprintf
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7 7
@@ -24,5 +24,5 @@ index 37f01ca..f00c06d 100644
24 #undef snprintf 24 #undef snprintf
25 #undef vfscanf 25 #undef vfscanf
26-- 26--
272.1.4 272.6.3
28 28
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0010-gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc-5.3/0010-gcc-poison-system-directories.patch
index 4e02ef83c1..2da8877672 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0010-gcc-poison-system-directories.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0010-gcc-poison-system-directories.patch
@@ -1,7 +1,7 @@
1From d1e85a363ffcd259e9b0841b85ca10af2f31bd72 Mon Sep 17 00:00:00 2001 1From 7a90e62d557c78ae52006dff30c99006e10d9357 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 08:59:00 +0400 3Date: Fri, 29 Mar 2013 08:59:00 +0400
4Subject: [PATCH 10/35] gcc: poison-system-directories 4Subject: [PATCH 10/46] gcc: poison-system-directories
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7 7
@@ -17,7 +17,7 @@ Upstream-Status: Inappropriate [distribution: codesourcery]
17 7 files changed, 66 insertions(+) 17 7 files changed, 66 insertions(+)
18 18
19diff --git a/gcc/common.opt b/gcc/common.opt 19diff --git a/gcc/common.opt b/gcc/common.opt
20index b49ac46..783d231 100644 20index 1218a71..bfba114 100644
21--- a/gcc/common.opt 21--- a/gcc/common.opt
22+++ b/gcc/common.opt 22+++ b/gcc/common.opt
23@@ -623,6 +623,10 @@ Wreturn-local-addr 23@@ -623,6 +623,10 @@ Wreturn-local-addr
@@ -32,7 +32,7 @@ index b49ac46..783d231 100644
32 Common Var(warn_shadow) Warning 32 Common Var(warn_shadow) Warning
33 Warn when one local variable shadows another 33 Warn when one local variable shadows another
34diff --git a/gcc/config.in b/gcc/config.in 34diff --git a/gcc/config.in b/gcc/config.in
35index f2ed301..f290c6b 100644 35index 5335258..f079826 100644
36--- a/gcc/config.in 36--- a/gcc/config.in
37+++ b/gcc/config.in 37+++ b/gcc/config.in
38@@ -168,6 +168,12 @@ 38@@ -168,6 +168,12 @@
@@ -49,10 +49,10 @@ index f2ed301..f290c6b 100644
49 optimizer and back end) to be checked for dynamic type safety at runtime. 49 optimizer and back end) to be checked for dynamic type safety at runtime.
50 This is quite expensive. */ 50 This is quite expensive. */
51diff --git a/gcc/configure b/gcc/configure 51diff --git a/gcc/configure b/gcc/configure
52index 9523773..181748e 100755 52index 3c92795..34371a3 100755
53--- a/gcc/configure 53--- a/gcc/configure
54+++ b/gcc/configure 54+++ b/gcc/configure
55@@ -932,6 +932,7 @@ with_system_zlib 55@@ -933,6 +933,7 @@ with_system_zlib
56 enable_maintainer_mode 56 enable_maintainer_mode
57 enable_link_mutex 57 enable_link_mutex
58 enable_version_specific_runtime_libs 58 enable_version_specific_runtime_libs
@@ -60,7 +60,7 @@ index 9523773..181748e 100755
60 enable_plugin 60 enable_plugin
61 enable_host_shared 61 enable_host_shared
62 enable_libquadmath_support 62 enable_libquadmath_support
63@@ -1661,6 +1662,8 @@ Optional Features: 63@@ -1670,6 +1671,8 @@ Optional Features:
64 --enable-version-specific-runtime-libs 64 --enable-version-specific-runtime-libs
65 specify that runtime libraries should be installed 65 specify that runtime libraries should be installed
66 in a compiler-specific directory 66 in a compiler-specific directory
@@ -69,7 +69,7 @@ index 9523773..181748e 100755
69 --enable-plugin enable plugin support 69 --enable-plugin enable plugin support
70 --enable-host-shared build host code as shared libraries 70 --enable-host-shared build host code as shared libraries
71 --disable-libquadmath-support 71 --disable-libquadmath-support
72@@ -28087,6 +28090,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : 72@@ -28211,6 +28214,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
73 fi 73 fi
74 74
75 75
@@ -90,10 +90,10 @@ index 9523773..181748e 100755
90 90
91 91
92diff --git a/gcc/configure.ac b/gcc/configure.ac 92diff --git a/gcc/configure.ac b/gcc/configure.ac
93index 68b0ee8..8b07078 100644 93index d414081..240d322 100644
94--- a/gcc/configure.ac 94--- a/gcc/configure.ac
95+++ b/gcc/configure.ac 95+++ b/gcc/configure.ac
96@@ -5571,6 +5571,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs, 96@@ -5654,6 +5654,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
97 [specify that runtime libraries should be 97 [specify that runtime libraries should be
98 installed in a compiler-specific directory])]) 98 installed in a compiler-specific directory])])
99 99
@@ -111,7 +111,7 @@ index 68b0ee8..8b07078 100644
111 AC_SUBST(subdirs) 111 AC_SUBST(subdirs)
112 AC_SUBST(srcdir) 112 AC_SUBST(srcdir)
113diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi 113diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
114index 520c2c5..0df8a47 100644 114index d3be589..c81b55b 100644
115--- a/gcc/doc/invoke.texi 115--- a/gcc/doc/invoke.texi
116+++ b/gcc/doc/invoke.texi 116+++ b/gcc/doc/invoke.texi
117@@ -269,6 +269,7 @@ Objective-C and Objective-C++ Dialects}. 117@@ -269,6 +269,7 @@ Objective-C and Objective-C++ Dialects}.
@@ -122,7 +122,7 @@ index 520c2c5..0df8a47 100644
122 -Wredundant-decls -Wno-return-local-addr @gol 122 -Wredundant-decls -Wno-return-local-addr @gol
123 -Wreturn-type -Wsequence-point -Wshadow -Wno-shadow-ivar @gol 123 -Wreturn-type -Wsequence-point -Wshadow -Wno-shadow-ivar @gol
124 -Wshift-count-negative -Wshift-count-overflow @gol 124 -Wshift-count-negative -Wshift-count-overflow @gol
125@@ -4432,6 +4433,14 @@ made up of data only and thus requires no special treatment. But, for 125@@ -4433,6 +4434,14 @@ made up of data only and thus requires no special treatment. But, for
126 most targets, it is made up of code and thus requires the stack to be 126 most targets, it is made up of code and thus requires the stack to be
127 made executable in order for the program to work properly. 127 made executable in order for the program to work properly.
128 128
@@ -188,5 +188,5 @@ index 6c54ca6..cc0c921 100644
188 188
189 /* Use given -I paths for #include "..." but not #include <...>, and 189 /* Use given -I paths for #include "..." but not #include <...>, and
190-- 190--
1912.1.4 1912.6.3
192 192
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0011-gcc-poison-dir-extend.patch b/meta/recipes-devtools/gcc/gcc-5.3/0011-gcc-poison-dir-extend.patch
index 067d9852de..511e69481b 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0011-gcc-poison-dir-extend.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0011-gcc-poison-dir-extend.patch
@@ -1,7 +1,7 @@
1From f158fcc084e88b1d8d1ecf5b005d377765aef16e Mon Sep 17 00:00:00 2001 1From db406054de6b0967cd76cbb998f05b0c5af0bd94 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:00:34 +0400 3Date: Fri, 29 Mar 2013 09:00:34 +0400
4Subject: [PATCH 11/35] gcc-poison-dir-extend 4Subject: [PATCH 11/46] gcc-poison-dir-extend
5 5
6Add /sw/include and /opt/include based on the original 6Add /sw/include and /opt/include based on the original
7zecke-no-host-includes.patch patch. The original patch checked for 7zecke-no-host-includes.patch patch. The original patch checked for
@@ -35,5 +35,5 @@ index cc0c921..0bc1f67 100644
35 "include location \"%s\" is unsafe for " 35 "include location \"%s\" is unsafe for "
36 "cross-compilation", 36 "cross-compilation",
37-- 37--
382.1.4 382.6.3
39 39
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-5.3/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
index befca73ace..750bbc8238 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
@@ -1,7 +1,7 @@
1From a54239cbdc6f93c6d74ea6b078f1470770c4f5aa Mon Sep 17 00:00:00 2001 1From 278d293c4cee9482a23aa3443741861ff2f67212 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:08:31 +0400 3Date: Fri, 29 Mar 2013 09:08:31 +0400
4Subject: [PATCH 12/35] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET 4Subject: [PATCH 12/46] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET
5 5
6Before committing, I noticed that PR/32161 was marked as a dup of PR/32009, but my previous patch did not fix it. 6Before committing, I noticed that PR/32161 was marked as a dup of PR/32009, but my previous patch did not fix it.
7 7
@@ -26,7 +26,7 @@ Upstream-Status: Pending
26 1 file changed, 32 insertions(+) 26 1 file changed, 32 insertions(+)
27 27
28diff --git a/configure b/configure 28diff --git a/configure b/configure
29index 50e7cbc..6b97693 100755 29index 1cba3a9..9cae8da 100755
30--- a/configure 30--- a/configure
31+++ b/configure 31+++ b/configure
32@@ -6733,6 +6733,38 @@ fi 32@@ -6733,6 +6733,38 @@ fi
@@ -69,5 +69,5 @@ index 50e7cbc..6b97693 100755
69 # the named directory are copied to $(tooldir)/sys-include. 69 # the named directory are copied to $(tooldir)/sys-include.
70 if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then 70 if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
71-- 71--
722.1.4 722.6.3
73 73
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0013-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc-5.3/0013-64-bit-multilib-hack.patch
index 67c066123d..45aaf4cc22 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0013-64-bit-multilib-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0013-64-bit-multilib-hack.patch
@@ -1,7 +1,7 @@
1From d5151bebd079e981dc710f2a031830d89cb1e72e Mon Sep 17 00:00:00 2001 1From bdde4f5efa3c89ac7ee0bc05f322f27e3dabeab9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:10:06 +0400 3Date: Fri, 29 Mar 2013 09:10:06 +0400
4Subject: [PATCH 13/35] 64-bit multilib hack. 4Subject: [PATCH 13/46] 64-bit multilib hack.
5 5
6GCC has internal multilib handling code but it assumes a very specific rigid directory 6GCC has internal multilib handling code but it assumes a very specific rigid directory
7layout. The build system implementation of multilib layout is very generic and allows 7layout. The build system implementation of multilib layout is very generic and allows
@@ -81,5 +81,5 @@ index b6b351d..1d5b37a 100644
81 rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c 81 rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
82 $(COMPILE) $< 82 $(COMPILE) $<
83-- 83--
842.1.4 842.6.3
85 85
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0014-optional-libstdc.patch b/meta/recipes-devtools/gcc/gcc-5.3/0014-optional-libstdc.patch
index 374fe43881..73741f83cc 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0014-optional-libstdc.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0014-optional-libstdc.patch
@@ -1,7 +1,7 @@
1From d7b42d93d077b2523c26f0dff0b6c44fdfff9d3c Mon Sep 17 00:00:00 2001 1From a13763f8a1d413a432e7b40835a062f86208f29a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:12:56 +0400 3Date: Fri, 29 Mar 2013 09:12:56 +0400
4Subject: [PATCH 14/35] optional libstdc 4Subject: [PATCH 14/46] optional libstdc
5 5
6gcc-runtime builds libstdc++ separately from gcc-cross-*. Its configure tests using g++ 6gcc-runtime builds libstdc++ separately from gcc-cross-*. Its configure tests using g++
7will not run correctly since by default the linker will try to link against libstdc++ 7will not run correctly since by default the linker will try to link against libstdc++
@@ -25,7 +25,7 @@ Upstream-Status: Inappropriate [embedded specific]
25 4 files changed, 13 insertions(+), 1 deletion(-) 25 4 files changed, 13 insertions(+), 1 deletion(-)
26 26
27diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt 27diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
28index 983f4a8..96924f6 100644 28index 4162566..453ec8e 100644
29--- a/gcc/c-family/c.opt 29--- a/gcc/c-family/c.opt
30+++ b/gcc/c-family/c.opt 30+++ b/gcc/c-family/c.opt
31@@ -1543,6 +1543,10 @@ nostdinc++ 31@@ -1543,6 +1543,10 @@ nostdinc++
@@ -52,7 +52,7 @@ index 6536d7e..f57a5d4 100644
52 library = -1; 52 library = -1;
53 break; 53 break;
54diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi 54diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
55index 0df8a47..73856d0 100644 55index c81b55b..6d3f68c 100644
56--- a/gcc/doc/invoke.texi 56--- a/gcc/doc/invoke.texi
57+++ b/gcc/doc/invoke.texi 57+++ b/gcc/doc/invoke.texi
58@@ -195,6 +195,7 @@ in the following sections. 58@@ -195,6 +195,7 @@ in the following sections.
@@ -72,7 +72,7 @@ index 0df8a47..73856d0 100644
72 -T @var{script} -Wl,@var{option} -Xlinker @var{option} @gol 72 -T @var{script} -Wl,@var{option} -Xlinker @var{option} @gol
73 -u @var{symbol} -z @var{keyword}} 73 -u @var{symbol} -z @var{keyword}}
74 74
75@@ -11185,6 +11186,11 @@ These entries are usually resolved by entries in 75@@ -11187,6 +11188,11 @@ These entries are usually resolved by entries in
76 libc. These entry points should be supplied through some other 76 libc. These entry points should be supplied through some other
77 mechanism when this option is specified. 77 mechanism when this option is specified.
78 78
@@ -97,5 +97,5 @@ index 675bcc1..a37ec8b 100644
97 #endif 97 #endif
98 98
99-- 99--
1002.1.4 1002.6.3
101 101
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch b/meta/recipes-devtools/gcc/gcc-5.3/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
index 6cf1e3dd24..1b62ef8065 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
@@ -1,7 +1,7 @@
1From ad1592791698286b80626ddd5679ff2ef457ab76 Mon Sep 17 00:00:00 2001 1From 4bd21a1d63cfb14e261d90adc0c5d4f9462dc555 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:14:20 +0400 3Date: Fri, 29 Mar 2013 09:14:20 +0400
4Subject: [PATCH 15/35] gcc: disable MASK_RELAX_PIC_CALLS bit 4Subject: [PATCH 15/46] gcc: disable MASK_RELAX_PIC_CALLS bit
5 5
6The new feature added after 4.3.3 6The new feature added after 4.3.3
7"http://www.pubbs.net/200909/gcc/94048-patch-add-support-for-rmipsjalr.html" 7"http://www.pubbs.net/200909/gcc/94048-patch-add-support-for-rmipsjalr.html"
@@ -19,10 +19,10 @@ Upstream-Status: Inappropriate [configuration]
19 2 files changed, 14 deletions(-) 19 2 files changed, 14 deletions(-)
20 20
21diff --git a/gcc/configure b/gcc/configure 21diff --git a/gcc/configure b/gcc/configure
22index 181748e..9009064 100755 22index 34371a3..8caecdc 100755
23--- a/gcc/configure 23--- a/gcc/configure
24+++ b/gcc/configure 24+++ b/gcc/configure
25@@ -26451,13 +26451,6 @@ $as_echo_n "checking assembler and linker for explicit JALR relocation... " >&6; 25@@ -26479,13 +26479,6 @@ $as_echo_n "checking assembler and linker for explicit JALR relocation... " >&6;
26 rm -f conftest.* 26 rm -f conftest.*
27 fi 27 fi
28 fi 28 fi
@@ -37,10 +37,10 @@ index 181748e..9009064 100755
37 $as_echo "$gcc_cv_as_ld_jalr_reloc" >&6; } 37 $as_echo "$gcc_cv_as_ld_jalr_reloc" >&6; }
38 38
39diff --git a/gcc/configure.ac b/gcc/configure.ac 39diff --git a/gcc/configure.ac b/gcc/configure.ac
40index 8b07078..c7a28b4 100644 40index 240d322..57819ff 100644
41--- a/gcc/configure.ac 41--- a/gcc/configure.ac
42+++ b/gcc/configure.ac 42+++ b/gcc/configure.ac
43@@ -4361,13 +4361,6 @@ x: 43@@ -4384,13 +4384,6 @@ x:
44 rm -f conftest.* 44 rm -f conftest.*
45 fi 45 fi
46 fi 46 fi
@@ -55,5 +55,5 @@ index 8b07078..c7a28b4 100644
55 55
56 AC_CACHE_CHECK([linker for .eh_frame personality relaxation], 56 AC_CACHE_CHECK([linker for .eh_frame personality relaxation],
57-- 57--
582.1.4 582.6.3
59 59
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0016-COLLECT_GCC_OPTIONS.patch b/meta/recipes-devtools/gcc/gcc-5.3/0016-COLLECT_GCC_OPTIONS.patch
index 359de35ad6..e6ae262e4b 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0016-COLLECT_GCC_OPTIONS.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0016-COLLECT_GCC_OPTIONS.patch
@@ -1,7 +1,7 @@
1From 2b22ee2e44688f8a72b9af76a0431d86bac00d47 Mon Sep 17 00:00:00 2001 1From 92427ebb94dc66f8e64ebf3ffbcd6dd5ce0935c1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:16:28 +0400 3Date: Fri, 29 Mar 2013 09:16:28 +0400
4Subject: [PATCH 16/35] COLLECT_GCC_OPTIONS 4Subject: [PATCH 16/46] COLLECT_GCC_OPTIONS
5 5
6This patch adds --sysroot into COLLECT_GCC_OPTIONS which is used to 6This patch adds --sysroot into COLLECT_GCC_OPTIONS which is used to
7invoke collect2. 7invoke collect2.
@@ -34,5 +34,5 @@ index a37ec8b..87b47c5 100644
34 { 34 {
35 const char *const *args; 35 const char *const *args;
36-- 36--
372.1.4 372.6.3
38 38
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/meta/recipes-devtools/gcc/gcc-5.3/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
index 850613176c..b89a27919e 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
@@ -1,7 +1,7 @@
1From 12f467bc6d8953ba342fe5166b9a2f397b334794 Mon Sep 17 00:00:00 2001 1From b1f3118e439459c26a3e19c617b7b0c93745e77a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:17:25 +0400 3Date: Fri, 29 Mar 2013 09:17:25 +0400
4Subject: [PATCH 17/35] Use the defaults.h in ${B} instead of ${S}, and t-oe in 4Subject: [PATCH 17/46] Use the defaults.h in ${B} instead of ${S}, and t-oe in
5 ${B} 5 ${B}
6 6
7Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that 7Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that
@@ -27,7 +27,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
27 4 files changed, 7 insertions(+), 7 deletions(-) 27 4 files changed, 7 insertions(+), 7 deletions(-)
28 28
29diff --git a/gcc/Makefile.in b/gcc/Makefile.in 29diff --git a/gcc/Makefile.in b/gcc/Makefile.in
30index 4ab7405..661ae17 100644 30index 07c6f0a..e1e63e8 100644
31--- a/gcc/Makefile.in 31--- a/gcc/Makefile.in
32+++ b/gcc/Makefile.in 32+++ b/gcc/Makefile.in
33@@ -502,7 +502,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ 33@@ -502,7 +502,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
@@ -40,10 +40,10 @@ index 4ab7405..661ae17 100644
40 TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@ 40 TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@
41 TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@ 41 TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@
42diff --git a/gcc/configure b/gcc/configure 42diff --git a/gcc/configure b/gcc/configure
43index 9009064..f059c2f 100755 43index 8caecdc..8ec3d40 100755
44--- a/gcc/configure 44--- a/gcc/configure
45+++ b/gcc/configure 45+++ b/gcc/configure
46@@ -11841,8 +11841,8 @@ for f in $tm_file; do 46@@ -11850,8 +11850,8 @@ for f in $tm_file; do
47 tm_include_list="${tm_include_list} $f" 47 tm_include_list="${tm_include_list} $f"
48 ;; 48 ;;
49 defaults.h ) 49 defaults.h )
@@ -55,7 +55,7 @@ index 9009064..f059c2f 100755
55 * ) 55 * )
56 tm_file_list="${tm_file_list} \$(srcdir)/config/$f" 56 tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
57diff --git a/gcc/configure.ac b/gcc/configure.ac 57diff --git a/gcc/configure.ac b/gcc/configure.ac
58index c7a28b4..2e668a5 100644 58index 57819ff..643a47e 100644
59--- a/gcc/configure.ac 59--- a/gcc/configure.ac
60+++ b/gcc/configure.ac 60+++ b/gcc/configure.ac
61@@ -1832,8 +1832,8 @@ for f in $tm_file; do 61@@ -1832,8 +1832,8 @@ for f in $tm_file; do
@@ -92,5 +92,5 @@ index c32f087..6803ab9 100644
92 92
93 # Add multiple inclusion protection guard, part two. 93 # Add multiple inclusion protection guard, part two.
94-- 94--
952.1.4 952.6.3
96 96
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0018-fortran-cross-compile-hack.patch b/meta/recipes-devtools/gcc/gcc-5.3/0018-fortran-cross-compile-hack.patch
index da73392cae..e8ba325585 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0018-fortran-cross-compile-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0018-fortran-cross-compile-hack.patch
@@ -1,7 +1,7 @@
1From 95506b44c9ef4725fef52fa864d3d3fcf931e443 Mon Sep 17 00:00:00 2001 1From d11c73c1295565ff3766ae04e2a410a89fc84dd5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:20:01 +0400 3Date: Fri, 29 Mar 2013 09:20:01 +0400
4Subject: [PATCH 18/35] fortran cross-compile hack. 4Subject: [PATCH 18/46] fortran cross-compile hack.
5 5
6* Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used 6* Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used
7used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross 7used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross
@@ -16,7 +16,7 @@ Upstream-Status: Inappropriate [embedded specific]
16 2 files changed, 2 insertions(+), 2 deletions(-) 16 2 files changed, 2 insertions(+), 2 deletions(-)
17 17
18diff --git a/libgfortran/configure b/libgfortran/configure 18diff --git a/libgfortran/configure b/libgfortran/configure
19index e1592f7..76d19b3 100755 19index bb3107b..5d47e65 100755
20--- a/libgfortran/configure 20--- a/libgfortran/configure
21+++ b/libgfortran/configure 21+++ b/libgfortran/configure
22@@ -12747,7 +12747,7 @@ esac 22@@ -12747,7 +12747,7 @@ esac
@@ -29,7 +29,7 @@ index e1592f7..76d19b3 100755
29 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' 29 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
30 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' 30 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
31diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac 31diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
32index 35a8b39..6a0d8a9 100644 32index adafb3f..b4ade28 100644
33--- a/libgfortran/configure.ac 33--- a/libgfortran/configure.ac
34+++ b/libgfortran/configure.ac 34+++ b/libgfortran/configure.ac
35@@ -240,7 +240,7 @@ AC_SUBST(enable_static) 35@@ -240,7 +240,7 @@ AC_SUBST(enable_static)
@@ -42,5 +42,5 @@ index 35a8b39..6a0d8a9 100644
42 42
43 # extra LD Flags which are required for targets 43 # extra LD Flags which are required for targets
44-- 44--
452.1.4 452.6.3
46 46
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0019-libgcc-sjlj-check.patch b/meta/recipes-devtools/gcc/gcc-5.3/0019-libgcc-sjlj-check.patch
index ec5394a416..01a4d1fdab 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0019-libgcc-sjlj-check.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0019-libgcc-sjlj-check.patch
@@ -1,7 +1,7 @@
1From 94f619cd3257e35e20a877640d0cb90c2b3efc15 Mon Sep 17 00:00:00 2001 1From 7b40212ed6c0c9fe4efe51f31bccd3d9f892f238 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:20:50 +0400 3Date: Fri, 29 Mar 2013 09:20:50 +0400
4Subject: [PATCH 19/35] libgcc-sjlj-check 4Subject: [PATCH 19/46] libgcc-sjlj-check
5 5
6ac_fn_c_try_compile doesnt seem to keep the intermediate files 6ac_fn_c_try_compile doesnt seem to keep the intermediate files
7which are needed for sjlj test to pass since it greps into the 7which are needed for sjlj test to pass since it greps into the
@@ -17,7 +17,7 @@ Upstream-Status: Pending
17 2 files changed, 10 insertions(+), 10 deletions(-) 17 2 files changed, 10 insertions(+), 10 deletions(-)
18 18
19diff --git a/libgcc/configure b/libgcc/configure 19diff --git a/libgcc/configure b/libgcc/configure
20index 08c9319..5ffaeb3 100644 20index 203d384..6aef3e7 100644
21--- a/libgcc/configure 21--- a/libgcc/configure
22+++ b/libgcc/configure 22+++ b/libgcc/configure
23@@ -4570,17 +4570,19 @@ void foo () 23@@ -4570,17 +4570,19 @@ void foo ()
@@ -45,7 +45,7 @@ index 08c9319..5ffaeb3 100644
45 45
46 fi 46 fi
47diff --git a/libgcc/configure.ac b/libgcc/configure.ac 47diff --git a/libgcc/configure.ac b/libgcc/configure.ac
48index 1c405e8..f52975d 100644 48index a10a952..cc324f3 100644
49--- a/libgcc/configure.ac 49--- a/libgcc/configure.ac
50+++ b/libgcc/configure.ac 50+++ b/libgcc/configure.ac
51@@ -255,16 +255,14 @@ void foo () 51@@ -255,16 +255,14 @@ void foo ()
@@ -70,5 +70,5 @@ index 1c405e8..f52975d 100644
70 ]) 70 ])
71 71
72-- 72--
732.1.4 732.6.3
74 74
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0020-cpp-honor-sysroot.patch b/meta/recipes-devtools/gcc/gcc-5.3/0020-cpp-honor-sysroot.patch
index 71bc68b5c1..13f66d4136 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0020-cpp-honor-sysroot.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0020-cpp-honor-sysroot.patch
@@ -1,7 +1,7 @@
1From 6e6283d645c83ca534219a02ae882a3d7be95ff1 Mon Sep 17 00:00:00 2001 1From 5f9759a85fff3d78e3f71ae01c970b10d326c406 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:22:00 +0400 3Date: Fri, 29 Mar 2013 09:22:00 +0400
4Subject: [PATCH 20/35] cpp: honor sysroot. 4Subject: [PATCH 20/46] cpp: honor sysroot.
5 5
6Currently, if the gcc toolchain is relocated and installed from sstate, then you try and compile 6Currently, if the gcc toolchain is relocated and installed from sstate, then you try and compile
7preprocessed source (.i or .ii files), the compiler will try and access the builtin sysroot location 7preprocessed source (.i or .ii files), the compiler will try and access the builtin sysroot location
@@ -50,5 +50,5 @@ index 87b47c5..e6efae7 100644
50 {"@assembler", 50 {"@assembler",
51 "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0}, 51 "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
52-- 52--
532.1.4 532.6.3
54 54
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0021-MIPS64-Default-to-N64-ABI.patch b/meta/recipes-devtools/gcc/gcc-5.3/0021-MIPS64-Default-to-N64-ABI.patch
index caad4899f5..c7cffe417d 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0021-MIPS64-Default-to-N64-ABI.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0021-MIPS64-Default-to-N64-ABI.patch
@@ -1,7 +1,7 @@
1From 7f766fc47f9388dd0094852a43f1af2568b4b9b2 Mon Sep 17 00:00:00 2001 1From 34d22ab6cfd2dfe6dd171c8d0b31cafcdeb86298 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:23:08 +0400 3Date: Fri, 29 Mar 2013 09:23:08 +0400
4Subject: [PATCH 21/35] MIPS64: Default to N64 ABI 4Subject: [PATCH 21/46] MIPS64: Default to N64 ABI
5 5
6MIPS64 defaults to n32 ABI, this patch makes it 6MIPS64 defaults to n32 ABI, this patch makes it
7so that it defaults to N64 ABI 7so that it defaults to N64 ABI
@@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [OE config specific]
14 1 file changed, 5 insertions(+), 5 deletions(-) 14 1 file changed, 5 insertions(+), 5 deletions(-)
15 15
16diff --git a/gcc/config.gcc b/gcc/config.gcc 16diff --git a/gcc/config.gcc b/gcc/config.gcc
17index cb08a5c..b155744 100644 17index c835734..dd0739d 100644
18--- a/gcc/config.gcc 18--- a/gcc/config.gcc
19+++ b/gcc/config.gcc 19+++ b/gcc/config.gcc
20@@ -2011,29 +2011,29 @@ mips*-*-linux*) # Linux MIPS, either endian. 20@@ -2017,29 +2017,29 @@ mips*-*-linux*) # Linux MIPS, either endian.
21 default_mips_arch=mips32 21 default_mips_arch=mips32
22 ;; 22 ;;
23 mips64el-st-linux-gnu) 23 mips64el-st-linux-gnu)
@@ -53,5 +53,5 @@ index cb08a5c..b155744 100644
53 ;; 53 ;;
54 esac 54 esac
55-- 55--
562.1.4 562.6.3
57 57
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc-5.3/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
index 54520d0912..6208351324 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
@@ -1,7 +1,7 @@
1From 4f94added8b7043642386b31ed4c3a1bd016f316 Mon Sep 17 00:00:00 2001 1From f6b41b62ea62a0f1447d9fc235f7fd2bbf3fe7c2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:24:50 +0400 3Date: Fri, 29 Mar 2013 09:24:50 +0400
4Subject: [PATCH 22/35] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER 4Subject: [PATCH 22/46] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
5 relative to SYSTEMLIBS_DIR 5 relative to SYSTEMLIBS_DIR
6 6
7This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER 7This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
@@ -60,7 +60,7 @@ index e9d65dc..cfdf3f0 100644
60 60
61 #define GLIBC_DYNAMIC_LINKER \ 61 #define GLIBC_DYNAMIC_LINKER \
62diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h 62diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
63index 1279cba..1dde747 100644 63index 49ad954..a5ab559 100644
64--- a/gcc/config/arm/linux-elf.h 64--- a/gcc/config/arm/linux-elf.h
65+++ b/gcc/config/arm/linux-elf.h 65+++ b/gcc/config/arm/linux-elf.h
66@@ -62,7 +62,7 @@ 66@@ -62,7 +62,7 @@
@@ -212,5 +212,5 @@ index fa805fd..0eb4acd 100644
212 #ifdef SPARC_BI_ARCH 212 #ifdef SPARC_BI_ARCH
213 213
214-- 214--
2152.1.4 2152.6.3
216 216
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0023-gcc-Fix-argument-list-too-long-error.patch b/meta/recipes-devtools/gcc/gcc-5.3/0023-gcc-Fix-argument-list-too-long-error.patch
index b337df5b0f..be91c9e638 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0023-gcc-Fix-argument-list-too-long-error.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0023-gcc-Fix-argument-list-too-long-error.patch
@@ -1,7 +1,7 @@
1From 8db606205487ebb03eae788826faf64bd6918450 Mon Sep 17 00:00:00 2001 1From 9701f596bbe5bf51bbf48661bc515b45d4b6f4d2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:26:37 +0400 3Date: Fri, 29 Mar 2013 09:26:37 +0400
4Subject: [PATCH 23/35] gcc: Fix argument list too long error. 4Subject: [PATCH 23/46] gcc: Fix argument list too long error.
5 5
6There would be an "Argument list too long" error when the 6There would be an "Argument list too long" error when the
7build directory is longer than 200, this is caused by: 7build directory is longer than 200, this is caused by:
@@ -23,10 +23,10 @@ Upstream-Status: Pending
23 1 file changed, 1 insertion(+), 1 deletion(-) 23 1 file changed, 1 insertion(+), 1 deletion(-)
24 24
25diff --git a/gcc/Makefile.in b/gcc/Makefile.in 25diff --git a/gcc/Makefile.in b/gcc/Makefile.in
26index 661ae17..9470a92 100644 26index e1e63e8..7b49f88 100644
27--- a/gcc/Makefile.in 27--- a/gcc/Makefile.in
28+++ b/gcc/Makefile.in 28+++ b/gcc/Makefile.in
29@@ -3255,7 +3255,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype 29@@ -3262,7 +3262,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype
30 # We keep the directory structure for files in config or c-family and .def 30 # We keep the directory structure for files in config or c-family and .def
31 # files. All other files are flattened to a single directory. 31 # files. All other files are flattened to a single directory.
32 $(mkinstalldirs) $(DESTDIR)$(plugin_includedir) 32 $(mkinstalldirs) $(DESTDIR)$(plugin_includedir)
@@ -36,5 +36,5 @@ index 661ae17..9470a92 100644
36 for file in $$headers; do \ 36 for file in $$headers; do \
37 if [ -f $$file ] ; then \ 37 if [ -f $$file ] ; then \
38-- 38--
392.1.4 392.6.3
40 40
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0024-Disable-sdt.patch b/meta/recipes-devtools/gcc/gcc-5.3/0024-Disable-sdt.patch
index 9f219ca6dc..b23ce97563 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0024-Disable-sdt.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0024-Disable-sdt.patch
@@ -1,7 +1,7 @@
1From e136342d2f7c0bdb1cf4b57ad3440d3c9e710322 Mon Sep 17 00:00:00 2001 1From 946e047614103e1f2982613c7aa5f76587500c0e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:28:10 +0400 3Date: Fri, 29 Mar 2013 09:28:10 +0400
4Subject: [PATCH 24/35] Disable sdt. 4Subject: [PATCH 24/46] Disable sdt.
5 5
6We don't list dtrace in DEPENDS so we shouldn't be depending on this header. 6We don't list dtrace in DEPENDS so we shouldn't be depending on this header.
7It may or may not exist from preivous builds though. To be determinstic, disable 7It may or may not exist from preivous builds though. To be determinstic, disable
@@ -25,10 +25,10 @@ Upstream-Status: Inappropriate [hack]
25 4 files changed, 19 insertions(+), 19 deletions(-) 25 4 files changed, 19 insertions(+), 19 deletions(-)
26 26
27diff --git a/gcc/configure b/gcc/configure 27diff --git a/gcc/configure b/gcc/configure
28index f059c2f..98853b3 100755 28index 8ec3d40..eaa3b07 100755
29--- a/gcc/configure 29--- a/gcc/configure
30+++ b/gcc/configure 30+++ b/gcc/configure
31@@ -27733,12 +27733,12 @@ fi 31@@ -27857,12 +27857,12 @@ fi
32 { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5 32 { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5
33 $as_echo_n "checking sys/sdt.h in the target C library... " >&6; } 33 $as_echo_n "checking sys/sdt.h in the target C library... " >&6; }
34 have_sys_sdt_h=no 34 have_sys_sdt_h=no
@@ -48,10 +48,10 @@ index f059c2f..98853b3 100755
48 $as_echo "$have_sys_sdt_h" >&6; } 48 $as_echo "$have_sys_sdt_h" >&6; }
49 49
50diff --git a/gcc/configure.ac b/gcc/configure.ac 50diff --git a/gcc/configure.ac b/gcc/configure.ac
51index 2e668a5..52cdcb8 100644 51index 643a47e..9f6cacb 100644
52--- a/gcc/configure.ac 52--- a/gcc/configure.ac
53+++ b/gcc/configure.ac 53+++ b/gcc/configure.ac
54@@ -5232,15 +5232,15 @@ if test x$gcc_cv_libc_provides_ssp = xyes; then 54@@ -5315,15 +5315,15 @@ if test x$gcc_cv_libc_provides_ssp = xyes; then
55 fi 55 fi
56 56
57 # Test for <sys/sdt.h> on the target. 57 # Test for <sys/sdt.h> on the target.
@@ -77,10 +77,10 @@ index 2e668a5..52cdcb8 100644
77 # Check if TFmode long double should be used by default or not. 77 # Check if TFmode long double should be used by default or not.
78 # Some glibc targets used DFmode long double, but with glibc 2.4 78 # Some glibc targets used DFmode long double, but with glibc 2.4
79diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure 79diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
80index fbad667..7d5a6c6 100755 80index 217012e..81240b9 100755
81--- a/libstdc++-v3/configure 81--- a/libstdc++-v3/configure
82+++ b/libstdc++-v3/configure 82+++ b/libstdc++-v3/configure
83@@ -20897,11 +20897,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 83@@ -20964,11 +20964,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
84 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 84 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
85 ac_compiler_gnu=$ac_cv_c_compiler_gnu 85 ac_compiler_gnu=$ac_cv_c_compiler_gnu
86 86
@@ -96,10 +96,10 @@ index fbad667..7d5a6c6 100755
96 $as_echo "$glibcxx_cv_sys_sdt_h" >&6; } 96 $as_echo "$glibcxx_cv_sys_sdt_h" >&6; }
97 97
98diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac 98diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
99index 7a7c1d8..b13eabc 100644 99index 580fb8b..5a41083 100644
100--- a/libstdc++-v3/configure.ac 100--- a/libstdc++-v3/configure.ac
101+++ b/libstdc++-v3/configure.ac 101+++ b/libstdc++-v3/configure.ac
102@@ -229,7 +229,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN 102@@ -230,7 +230,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN
103 GLIBCXX_CHECK_SC_NPROC_ONLN 103 GLIBCXX_CHECK_SC_NPROC_ONLN
104 GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP 104 GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP
105 GLIBCXX_CHECK_SYSCTL_HW_NCPU 105 GLIBCXX_CHECK_SYSCTL_HW_NCPU
@@ -109,5 +109,5 @@ index 7a7c1d8..b13eabc 100644
109 # Check for available headers. 109 # Check for available headers.
110 AC_CHECK_HEADERS([endian.h execinfo.h float.h fp.h ieeefp.h inttypes.h \ 110 AC_CHECK_HEADERS([endian.h execinfo.h float.h fp.h ieeefp.h inttypes.h \
111-- 111--
1122.1.4 1122.6.3
113 113
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0025-libtool.patch b/meta/recipes-devtools/gcc/gcc-5.3/0025-libtool.patch
index b8977d64f2..8d5eb973bc 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0025-libtool.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0025-libtool.patch
@@ -1,7 +1,7 @@
1From 1ca54967d8f67ab0eca772334e5c925a5e8c80cc Mon Sep 17 00:00:00 2001 1From f68c5b78751660505b22b46dad99240db0df3456 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:29:11 +0400 3Date: Fri, 29 Mar 2013 09:29:11 +0400
4Subject: [PATCH 25/35] libtool 4Subject: [PATCH 25/46] libtool
5 5
6libstdc++ from gcc-runtime gets created with -rpath=/usr/lib/../lib for qemux86-64 6libstdc++ from gcc-runtime gets created with -rpath=/usr/lib/../lib for qemux86-64
7when running on am x86_64 build host. 7when running on am x86_64 build host.
@@ -38,5 +38,5 @@ index 9503ec8..0121fba 100644
38 oldlibs= 38 oldlibs=
39 if test -z "$rpath"; then 39 if test -z "$rpath"; then
40-- 40--
412.1.4 412.6.3
42 42
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/meta/recipes-devtools/gcc/gcc-5.3/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
index a8a652aaf1..a22d95f721 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
@@ -1,7 +1,7 @@
1From 5f5ca57fcec4bafe3780371d1342acd40c608697 Mon Sep 17 00:00:00 2001 1From 4c75e349aa7abd1e285720328b23690636bea242 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:30:32 +0400 3Date: Fri, 29 Mar 2013 09:30:32 +0400
4Subject: [PATCH 26/35] gcc: armv4: pass fix-v4bx to linker to support EABI. 4Subject: [PATCH 26/46] gcc: armv4: pass fix-v4bx to linker to support EABI.
5 5
6The LINK_SPEC for linux gets overwritten by linux-eabi.h which 6The LINK_SPEC for linux gets overwritten by linux-eabi.h which
7means the value of TARGET_FIX_V4BX_SPEC gets lost and as a result 7means the value of TARGET_FIX_V4BX_SPEC gets lost and as a result
@@ -39,5 +39,5 @@ index cfdf3f0..048a062 100644
39 LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC) 39 LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
40 40
41-- 41--
422.1.4 422.6.3
43 43
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/meta/recipes-devtools/gcc/gcc-5.3/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch
index 445da37d7d..46815d1569 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch
@@ -1,7 +1,7 @@
1From 484e8c1e8d43e626ee2ddbde9eb8e0af7a176aef Mon Sep 17 00:00:00 2001 1From 8217dd7fb318f9abc6564f67b424c433d8398d61 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:33:04 +0400 3Date: Fri, 29 Mar 2013 09:33:04 +0400
4Subject: [PATCH 27/35] Use the multilib config files from ${B} instead of 4Subject: [PATCH 27/46] Use the multilib config files from ${B} instead of
5 using the ones from ${S} 5 using the ones from ${S}
6 6
7Use the multilib config files from ${B} instead of using the ones from ${S} 7Use the multilib config files from ${B} instead of using the ones from ${S}
@@ -18,10 +18,10 @@ Upstream-Status: Inappropriate [configuration]
18 2 files changed, 36 insertions(+), 8 deletions(-) 18 2 files changed, 36 insertions(+), 8 deletions(-)
19 19
20diff --git a/gcc/configure b/gcc/configure 20diff --git a/gcc/configure b/gcc/configure
21index 98853b3..d0ec50f 100755 21index eaa3b07..9b60aad 100755
22--- a/gcc/configure 22--- a/gcc/configure
23+++ b/gcc/configure 23+++ b/gcc/configure
24@@ -11821,10 +11821,20 @@ done 24@@ -11830,10 +11830,20 @@ done
25 tmake_file_= 25 tmake_file_=
26 for f in ${tmake_file} 26 for f in ${tmake_file}
27 do 27 do
@@ -46,7 +46,7 @@ index 98853b3..d0ec50f 100755
46 done 46 done
47 tmake_file="${tmake_file_}" 47 tmake_file="${tmake_file_}"
48 48
49@@ -11835,6 +11845,10 @@ tm_file_list="options.h" 49@@ -11844,6 +11854,10 @@ tm_file_list="options.h"
50 tm_include_list="options.h insn-constants.h" 50 tm_include_list="options.h insn-constants.h"
51 for f in $tm_file; do 51 for f in $tm_file; do
52 case $f in 52 case $f in
@@ -58,7 +58,7 @@ index 98853b3..d0ec50f 100755
58 f=`echo $f | sed 's/^..//'` 58 f=`echo $f | sed 's/^..//'`
59 tm_file_list="${tm_file_list} $f" 59 tm_file_list="${tm_file_list} $f"
60diff --git a/gcc/configure.ac b/gcc/configure.ac 60diff --git a/gcc/configure.ac b/gcc/configure.ac
61index 52cdcb8..3cf606a 100644 61index 9f6cacb..e1e54f2 100644
62--- a/gcc/configure.ac 62--- a/gcc/configure.ac
63+++ b/gcc/configure.ac 63+++ b/gcc/configure.ac
64@@ -1812,10 +1812,20 @@ done 64@@ -1812,10 +1812,20 @@ done
@@ -98,5 +98,5 @@ index 52cdcb8..3cf606a 100644
98 f=`echo $f | sed 's/^..//'` 98 f=`echo $f | sed 's/^..//'`
99 tm_file_list="${tm_file_list} $f" 99 tm_file_list="${tm_file_list} $f"
100-- 100--
1012.1.4 1012.6.3
102 102
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/meta/recipes-devtools/gcc/gcc-5.3/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
index 4902e903b8..60ddd9cee7 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
@@ -1,7 +1,7 @@
1From 112ca9f860114bc79273a79ed42722fdc9ded6ea Mon Sep 17 00:00:00 2001 1From 08a0e45b308fc97d06f5c3ef77a257e7a6bd1a48 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 09:39:38 +0000 3Date: Fri, 20 Feb 2015 09:39:38 +0000
4Subject: [PATCH 28/35] Avoid using libdir from .la which usually points to a 4Subject: [PATCH 28/46] Avoid using libdir from .la which usually points to a
5 host path 5 host path
6 6
7Upstream-Status: Inappropriate [embedded specific] 7Upstream-Status: Inappropriate [embedded specific]
@@ -27,5 +27,5 @@ index 0121fba..52bdbdb 100644
27 absdir="$libdir" 27 absdir="$libdir"
28 fi 28 fi
29-- 29--
302.1.4 302.6.3
31 31
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0029-export-CPP.patch b/meta/recipes-devtools/gcc/gcc-5.3/0029-export-CPP.patch
index 0a05ae59ed..62195aa872 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0029-export-CPP.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0029-export-CPP.patch
@@ -1,7 +1,7 @@
1From a983033f1327a692af55be8d1aa61aede18c4afb Mon Sep 17 00:00:00 2001 1From 95f494d1544857ad38949a7da37e2d7264475233 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 09:40:59 +0000 3Date: Fri, 20 Feb 2015 09:40:59 +0000
4Subject: [PATCH 29/35] export CPP 4Subject: [PATCH 29/46] export CPP
5 5
6The OE environment sets and exports CPP as being the target gcc. When 6The OE environment sets and exports CPP as being the target gcc. When
7building gcc-cross-canadian for a mingw targetted sdk, the following can be found 7building gcc-cross-canadian for a mingw targetted sdk, the following can be found
@@ -49,5 +49,5 @@ index 36b4008..a783e1e 100644
49 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ 49 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
50 CXX="$(CXX_FOR_BUILD)"; export CXX; \ 50 CXX="$(CXX_FOR_BUILD)"; export CXX; \
51-- 51--
522.1.4 522.6.3
53 53
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch b/meta/recipes-devtools/gcc/gcc-5.3/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
index 873dca9716..e7ca360ae5 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
@@ -1,7 +1,7 @@
1From 3d870a184c05df1338db1870301c4144ba99fc3d Mon Sep 17 00:00:00 2001 1From 4ed8c1fd9dc05f7a9db9298a55396c8f0ff549a7 Mon Sep 17 00:00:00 2001
2From: Alexandru-Cezar Sardan <alexandru.sardan@freescale.com> 2From: Alexandru-Cezar Sardan <alexandru.sardan@freescale.com>
3Date: Wed, 5 Feb 2014 16:52:31 +0200 3Date: Wed, 5 Feb 2014 16:52:31 +0200
4Subject: [PATCH 30/35] Enable SPE & AltiVec generation on powepc*linux target 4Subject: [PATCH 30/46] Enable SPE & AltiVec generation on powepc*linux target
5 5
6When is configured with --target=powerpc-linux, the resulting GCC will 6When is configured with --target=powerpc-linux, the resulting GCC will
7not be able to generate code for SPE targets (e500v1/v2). 7not be able to generate code for SPE targets (e500v1/v2).
@@ -20,10 +20,10 @@ Signed-off-by: Alexandru-Cezar Sardan <alexandru.sardan@freescale.com>
20 1 file changed, 8 insertions(+), 1 deletion(-) 20 1 file changed, 8 insertions(+), 1 deletion(-)
21 21
22diff --git a/gcc/config.gcc b/gcc/config.gcc 22diff --git a/gcc/config.gcc b/gcc/config.gcc
23index b155744..0541b8a 100644 23index dd0739d..3825bd5 100644
24--- a/gcc/config.gcc 24--- a/gcc/config.gcc
25+++ b/gcc/config.gcc 25+++ b/gcc/config.gcc
26@@ -2337,7 +2337,14 @@ powerpc-*-rtems*) 26@@ -2343,7 +2343,14 @@ powerpc-*-rtems*)
27 tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-rtems rs6000/t-ppccomm" 27 tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-rtems rs6000/t-ppccomm"
28 ;; 28 ;;
29 powerpc*-*-linux*) 29 powerpc*-*-linux*)
@@ -40,5 +40,5 @@ index b155744..0541b8a 100644
40 tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-ppccomm" 40 tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-ppccomm"
41 extra_objs="$extra_objs rs6000-linux.o" 41 extra_objs="$extra_objs rs6000-linux.o"
42-- 42--
432.1.4 432.6.3
44 44
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch b/meta/recipes-devtools/gcc/gcc-5.3/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
index f06cba8824..f2bc66432c 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
@@ -1,7 +1,7 @@
1From a824cd3f45875f6c1c47ccdbf33534947bd2b587 Mon Sep 17 00:00:00 2001 1From bb6fea821483aa3259b34e101a39c993edd01411 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 10:21:55 +0000 3Date: Fri, 20 Feb 2015 10:21:55 +0000
4Subject: [PATCH 31/35] Disable the MULTILIB_OSDIRNAMES and other multilib 4Subject: [PATCH 31/46] Disable the MULTILIB_OSDIRNAMES and other multilib
5 options. 5 options.
6 6
7Hard coding the MULTILIB_OSDIRNAMES with ../lib64 is causing problems on 7Hard coding the MULTILIB_OSDIRNAMES with ../lib64 is causing problems on
@@ -38,5 +38,5 @@ index c296376..3bb59bf 100644
38-MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32 38-MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32
39+#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32 39+#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32
40-- 40--
412.1.4 412.6.3
42 42
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0032-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc-5.3/0032-Ensure-target-gcc-headers-can-be-included.patch
index 45133062a7..89503ff60e 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0032-Ensure-target-gcc-headers-can-be-included.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0032-Ensure-target-gcc-headers-can-be-included.patch
@@ -1,7 +1,7 @@
1From e60090f7c537c84fd1b22307edd9f386228c7339 Mon Sep 17 00:00:00 2001 1From bb26f90f5e0accc3539f62b6fec663682959dd36 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 10:25:11 +0000 3Date: Fri, 20 Feb 2015 10:25:11 +0000
4Subject: [PATCH 32/35] Ensure target gcc headers can be included 4Subject: [PATCH 32/46] Ensure target gcc headers can be included
5 5
6There are a few headers installed as part of the OpenEmbedded 6There are a few headers installed as part of the OpenEmbedded
7gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe 7gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe
@@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
23 4 files changed, 15 insertions(+), 7 deletions(-) 23 4 files changed, 15 insertions(+), 7 deletions(-)
24 24
25diff --git a/gcc/Makefile.in b/gcc/Makefile.in 25diff --git a/gcc/Makefile.in b/gcc/Makefile.in
26index 9470a92..1497ede 100644 26index 7b49f88..cd5bc4a 100644
27--- a/gcc/Makefile.in 27--- a/gcc/Makefile.in
28+++ b/gcc/Makefile.in 28+++ b/gcc/Makefile.in
29@@ -582,6 +582,7 @@ libexecdir = @libexecdir@ 29@@ -582,6 +582,7 @@ libexecdir = @libexecdir@
@@ -34,7 +34,7 @@ index 9470a92..1497ede 100644
34 # Directory in which the compiler finds executables 34 # Directory in which the compiler finds executables
35 libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) 35 libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
36 # Directory in which all plugin resources are installed 36 # Directory in which all plugin resources are installed
37@@ -2603,6 +2604,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" 37@@ -2610,6 +2611,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\"
38 38
39 PREPROCESSOR_DEFINES = \ 39 PREPROCESSOR_DEFINES = \
40 -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ 40 -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
@@ -94,5 +94,5 @@ index e6efae7..3ca27b9 100644
94 #undef MD_EXEC_PREFIX 94 #undef MD_EXEC_PREFIX
95 #undef MD_STARTFILE_PREFIX 95 #undef MD_STARTFILE_PREFIX
96-- 96--
972.1.4 972.6.3
98 98
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch b/meta/recipes-devtools/gcc/gcc-5.3/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
index 519e413d6b..19d480f3d7 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
@@ -1,7 +1,7 @@
1From 997f9e939f85f651b22a48251cfb1444831d54ca Mon Sep 17 00:00:00 2001 1From 629fcc7d0075c9b4261da6435e122429fb028ec0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 11:17:19 +0000 3Date: Fri, 20 Feb 2015 11:17:19 +0000
4Subject: [PATCH 33/35] gcc 4.8+ won't build with --disable-dependency-tracking 4Subject: [PATCH 33/46] gcc 4.8+ won't build with --disable-dependency-tracking
5 5
6since the *.Ppo files don't get created unless --enable-dependency-tracking is true. 6since the *.Ppo files don't get created unless --enable-dependency-tracking is true.
7 7
@@ -50,5 +50,5 @@ index 9288652..3720256 100644
50 M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT)) 50 M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
51 M_FILE = $(PAT_BASE)_n.c 51 M_FILE = $(PAT_BASE)_n.c
52-- 52--
532.1.4 532.6.3
54 54
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/meta/recipes-devtools/gcc/gcc-5.3/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch
index 207cd7cba1..a453fa6b34 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch
@@ -1,7 +1,7 @@
1From c94da257a219873b946e08306141af7749679f67 Mon Sep 17 00:00:00 2001 1From a4efc9ca85734c283d4da09b628121e1c1f49c4e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 3 Mar 2015 08:21:19 +0000 3Date: Tue, 3 Mar 2015 08:21:19 +0000
4Subject: [PATCH 34/35] Don't search host directory during "relink" if 4Subject: [PATCH 34/46] Don't search host directory during "relink" if
5 $inst_prefix is provided 5 $inst_prefix is provided
6 6
7http://lists.gnu.org/archive/html/libtool-patches/2011-01/msg00026.html 7http://lists.gnu.org/archive/html/libtool-patches/2011-01/msg00026.html
@@ -34,5 +34,5 @@ index 52bdbdb..82bcec3 100644
34 esac 34 esac
35 fi 35 fi
36-- 36--
372.1.4 372.6.3
38 38
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch b/meta/recipes-devtools/gcc/gcc-5.3/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch
index b75f385f40..6ed589beb8 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch
@@ -1,7 +1,7 @@
1From 3a09545f3d18ce492ef55639215a072282de03d0 Mon Sep 17 00:00:00 2001 1From 5b0125a792842ae02df507bc55555661cb10f9a3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 8 Mar 2015 03:41:39 +0000 3Date: Sun, 8 Mar 2015 03:41:39 +0000
4Subject: [PATCH 35/35] Dont link the plugins with libgomp explicitly 4Subject: [PATCH 35/46] Dont link the plugins with libgomp explicitly
5 5
6They are dlopened by libgomp anyway. This fixes 6They are dlopened by libgomp anyway. This fixes
7the libtool relink issue which causes issues during 7the libtool relink issue which causes issues during
@@ -79,5 +79,5 @@ index 167485f..d2c5428 100644
79-libgomp_plugin_host_nonshm_la_LIBADD = libgomp.la 79-libgomp_plugin_host_nonshm_la_LIBADD = libgomp.la
80 libgomp_plugin_host_nonshm_la_LIBTOOLFLAGS = --tag=disable-static 80 libgomp_plugin_host_nonshm_la_LIBTOOLFLAGS = --tag=disable-static
81-- 81--
822.1.4 822.6.3
83 83
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc-5.3/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
index b691946b0e..41c0294da4 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
@@ -1,7 +1,7 @@
1From 861bcfd4ae814f351e0c668ee26d01d1331e0422 Mon Sep 17 00:00:00 2001 1From b0b0688176a9482777e9b2e98408bfc4505d31af Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 28 Apr 2015 23:15:27 -0700 3Date: Tue, 28 Apr 2015 23:15:27 -0700
4Subject: [PATCH 36/37] Use SYSTEMLIBS_DIR replacement instead of hardcoding 4Subject: [PATCH 36/46] Use SYSTEMLIBS_DIR replacement instead of hardcoding
5 base_libdir 5 base_libdir
6 6
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
11 11
12diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h 12diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
13index 9abb252..79525ee 100644 13index 257acf0..abeb948 100644
14--- a/gcc/config/aarch64/aarch64-linux.h 14--- a/gcc/config/aarch64/aarch64-linux.h
15+++ b/gcc/config/aarch64/aarch64-linux.h 15+++ b/gcc/config/aarch64/aarch64-linux.h
16@@ -21,7 +21,7 @@ 16@@ -21,7 +21,7 @@
@@ -23,5 +23,5 @@ index 9abb252..79525ee 100644
23 #undef ASAN_CC1_SPEC 23 #undef ASAN_CC1_SPEC
24 #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" 24 #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
25-- 25--
262.1.4 262.6.3
27 27
diff --git a/meta/recipes-devtools/gcc/gcc-5.3/0037-aarch64-Add-support-for-musl-ldso.patch b/meta/recipes-devtools/gcc/gcc-5.3/0037-aarch64-Add-support-for-musl-ldso.patch
new file mode 100644
index 0000000000..30dbe74ef2
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0037-aarch64-Add-support-for-musl-ldso.patch
@@ -0,0 +1,26 @@
1From 420ca64a86d560a77ee596a9774d672b08ca8278 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 28 Apr 2015 23:18:39 -0700
4Subject: [PATCH 37/46] aarch64: Add support for musl ldso
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 gcc/config/aarch64/aarch64-linux.h | 2 ++
9 1 file changed, 2 insertions(+)
10
11diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
12index abeb948..f9e65fc 100644
13--- a/gcc/config/aarch64/aarch64-linux.h
14+++ b/gcc/config/aarch64/aarch64-linux.h
15@@ -23,6 +23,8 @@
16
17 #define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
18
19+#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64.so.1"
20+
21 #undef ASAN_CC1_SPEC
22 #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
23
24--
252.6.3
26
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0038-fix-g++-sysroot.patch b/meta/recipes-devtools/gcc/gcc-5.3/0038-fix-g-sysroot.patch
index f024dd5a2e..9ba574a5c6 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0038-fix-g++-sysroot.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0038-fix-g-sysroot.patch
@@ -1,3 +1,8 @@
1From 8df3e7007a22c9d6be5d5ae4b9b169c5c8431917 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 27 May 2015 17:06:06 -0700
4Subject: [PATCH 38/46] fix g++ sysroot
5
1Portions of 6Portions of
2 7
3http://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg26013.html 8http://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg26013.html
@@ -11,12 +16,16 @@ with c++ test.cpp fails unable to find the header. strace shows it looking in
11usr/include/xxxx rather than /usr/include/xxxx 16usr/include/xxxx rather than /usr/include/xxxx
12 17
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19---
20 gcc/configure | 4 +++-
21 gcc/configure.ac | 4 +++-
22 2 files changed, 6 insertions(+), 2 deletions(-)
14 23
15Index: gcc-4.8.1/gcc/configure.ac 24diff --git a/gcc/configure b/gcc/configure
16=================================================================== 25index 9b60aad..6df594c 100755
17--- gcc-4.8.1.orig/gcc/configure.ac 2013-07-15 15:55:49.488399132 -0700 26--- a/gcc/configure
18+++ gcc-4.8.1/gcc/configure.ac 2013-07-15 16:02:31.772406679 -0700 27+++ b/gcc/configure
19@@ -148,7 +148,9 @@ 28@@ -3375,7 +3375,9 @@ gcc_gxx_include_dir_add_sysroot=0
20 if test "${with_sysroot+set}" = set; then 29 if test "${with_sysroot+set}" = set; then
21 gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'` 30 gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'`
22 if test "${gcc_gxx_without_sysroot}"; then 31 if test "${gcc_gxx_without_sysroot}"; then
@@ -27,11 +36,11 @@ Index: gcc-4.8.1/gcc/configure.ac
27 gcc_gxx_include_dir_add_sysroot=1 36 gcc_gxx_include_dir_add_sysroot=1
28 fi 37 fi
29 fi 38 fi
30Index: gcc-4.8.1/gcc/configure 39diff --git a/gcc/configure.ac b/gcc/configure.ac
31=================================================================== 40index e1e54f2..3bb2173 100644
32--- gcc-4.8.1.orig/gcc/configure 2013-07-15 15:55:49.472399132 -0700 41--- a/gcc/configure.ac
33+++ gcc-4.8.1/gcc/configure 2013-07-15 16:02:31.780406680 -0700 42+++ b/gcc/configure.ac
34@@ -3325,7 +3325,9 @@ 43@@ -152,7 +152,9 @@ gcc_gxx_include_dir_add_sysroot=0
35 if test "${with_sysroot+set}" = set; then 44 if test "${with_sysroot+set}" = set; then
36 gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'` 45 gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'`
37 if test "${gcc_gxx_without_sysroot}"; then 46 if test "${gcc_gxx_without_sysroot}"; then
@@ -42,3 +51,6 @@ Index: gcc-4.8.1/gcc/configure
42 gcc_gxx_include_dir_add_sysroot=1 51 gcc_gxx_include_dir_add_sysroot=1
43 fi 52 fi
44 fi 53 fi
54--
552.6.3
56
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/meta/recipes-devtools/gcc/gcc-5.3/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch
index 2f025c6d0c..2e0df968bd 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch
@@ -1,7 +1,7 @@
1From acea0df9997a47f8b8224b6ca1618c8c9dfbe6d5 Mon Sep 17 00:00:00 2001 1From 1eede9e4a10d3532db826a6eeced695df3ad5b89 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Sun, 5 Jul 2015 20:25:18 -0700 3Date: Sun, 5 Jul 2015 20:25:18 -0700
4Subject: [PATCH] libcc1: fix libcc1's install path and rpath 4Subject: [PATCH 39/46] libcc1: fix libcc1's install path and rpath
5 5
6* Install libcc1.so and libcc1plugin.so into 6* Install libcc1.so and libcc1plugin.so into
7 $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version), as what we 7 $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version), as what we
@@ -15,8 +15,8 @@ Upstream-Status: Inappropriate [OE configuration]
15 15
16Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 16Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
17--- 17---
18 libcc1/Makefile.am | 4 ++-- 18 libcc1/Makefile.am | 4 ++--
19 libcc1/Makefile.in | 4 ++-- 19 libcc1/Makefile.in | 4 ++--
20 2 files changed, 4 insertions(+), 4 deletions(-) 20 2 files changed, 4 insertions(+), 4 deletions(-)
21 21
22diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am 22diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am
@@ -49,3 +49,6 @@ index 1916134..c8995d2 100644
49 @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la 49 @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la
50 @ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la 50 @ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la
51 BUILT_SOURCES = compiler-name.h 51 BUILT_SOURCES = compiler-name.h
52--
532.6.3
54
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0040-nativesdk-gcc-support.patch b/meta/recipes-devtools/gcc/gcc-5.3/0040-handle-sysroot-support-for-nativesdk-gcc.patch
index fd81ae2449..11e1310f14 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0040-nativesdk-gcc-support.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0040-handle-sysroot-support-for-nativesdk-gcc.patch
@@ -1,3 +1,8 @@
1From b41674d357c4ba320b9860e0f313d2f5a332f27d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 7 Dec 2015 23:39:54 +0000
4Subject: [PATCH 40/46] handle sysroot support for nativesdk-gcc
5
1Being able to build a nativesdk gcc is useful, particularly in cases 6Being able to build a nativesdk gcc is useful, particularly in cases
2where the host compiler may be of an incompatible version (or a 32 7where the host compiler may be of an incompatible version (or a 32
3bit compiler is needed). 8bit compiler is needed).
@@ -15,11 +20,18 @@ a) Add %r into spec file markup which can be used for injected paths
15b) Add other paths which need relocation into a .gccrelocprefix section 20b) Add other paths which need relocation into a .gccrelocprefix section
16 which the relocation code will notice and adjust automatically. 21 which the relocation code will notice and adjust automatically.
17 22
18
19Upstream-Status: Inappropriate 23Upstream-Status: Inappropriate
20RP 2015/7/28 24RP 2015/7/28
21 25
26Signed-off-by: Khem Raj <raj.khem@gmail.com>
27---
28 gcc/cppdefault.c | 50 +++++++++++++++++++++++++++++++++++++-------------
29 gcc/cppdefault.h | 3 ++-
30 gcc/gcc.c | 20 ++++++++++++++------
31 3 files changed, 53 insertions(+), 20 deletions(-)
32
22diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c 33diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c
34index 03a0287..f44c1d8 100644
23--- a/gcc/cppdefault.c 35--- a/gcc/cppdefault.c
24+++ b/gcc/cppdefault.c 36+++ b/gcc/cppdefault.c
25@@ -35,6 +35,30 @@ 37@@ -35,6 +35,30 @@
@@ -123,6 +135,7 @@ diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c
123 { 0, 0, 0, 0, 0, 0 } 135 { 0, 0, 0, 0, 0, 0 }
124 }; 136 };
125diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h 137diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h
138index c98644f..4198669 100644
126--- a/gcc/cppdefault.h 139--- a/gcc/cppdefault.h
127+++ b/gcc/cppdefault.h 140+++ b/gcc/cppdefault.h
128@@ -33,7 +33,8 @@ 141@@ -33,7 +33,8 @@
@@ -136,6 +149,7 @@ diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h
136 (see update_path in prefix.c) */ 149 (see update_path in prefix.c) */
137 const char cplusplus; /* Only look here if we're compiling C++. */ 150 const char cplusplus; /* Only look here if we're compiling C++. */
138diff --git a/gcc/gcc.c b/gcc/gcc.c 151diff --git a/gcc/gcc.c b/gcc/gcc.c
152index 3ca27b9..2b7756e 100644
139--- a/gcc/gcc.c 153--- a/gcc/gcc.c
140+++ b/gcc/gcc.c 154+++ b/gcc/gcc.c
141@@ -120,6 +120,8 @@ static const char *target_system_root = TARGET_SYSTEM_ROOT; 155@@ -120,6 +120,8 @@ static const char *target_system_root = TARGET_SYSTEM_ROOT;
@@ -182,7 +196,7 @@ diff --git a/gcc/gcc.c b/gcc/gcc.c
182 = STANDARD_STARTFILE_PREFIX_2; 196 = STANDARD_STARTFILE_PREFIX_2;
183 197
184 /* A relative path to be used in finding the location of tools 198 /* A relative path to be used in finding the location of tools
185@@ -5550,6 +5553,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) 199@@ -5523,6 +5526,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part)
186 } 200 }
187 break; 201 break;
188 202
@@ -194,3 +208,6 @@ diff --git a/gcc/gcc.c b/gcc/gcc.c
194 case 'S': 208 case 'S':
195 value = do_spec_1 (startfile_spec, 0, NULL); 209 value = do_spec_1 (startfile_spec, 0, NULL);
196 if (value != 0) 210 if (value != 0)
211--
2122.6.3
213
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0041-handle-target-sysroot-multilib.patch b/meta/recipes-devtools/gcc/gcc-5.3/0041-Search-target-sysroot-gcc-version-specific-dirs-with.patch
index 53569847f2..5a504a1f22 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0041-handle-target-sysroot-multilib.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0041-Search-target-sysroot-gcc-version-specific-dirs-with.patch
@@ -1,18 +1,24 @@
1Search target sysroot gcc version specific dirs with multilib. 1From 99cadb4d8415dd5a275d7d6410f20db33d0f8433 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 7 Dec 2015 23:41:45 +0000
4Subject: [PATCH 41/46] Search target sysroot gcc version specific dirs with
5 multilib.
2 6
3We install the gcc libraries (such as crtbegin.p) into 7We install the gcc libraries (such as crtbegin.p) into
4<sysroot><libdir>/<target-sys>/5.2.0/ 8<sysroot><libdir>/<target-sys>/5.2.0/
5which is a default search path for GCC (aka multi_suffix in the 9which is a default search path for GCC (aka multi_suffix in the
6code below). <target-sys> is 'machine' in gcc's terminology. We use 10code below). <target-sys> is 'machine' in gcc's terminology. We use
7these directories so that multiple gcc versions could in theory 11these directories so that multiple gcc versions could in theory
8co-exist on target. 12co-exist on target.
9 13
10We only want to build one gcc-cross-canadian per arch and have this work 14We only want to build one gcc-cross-canadian per arch and have this work
11for all multilibs. <target-sys> can be handled by mapping the multilib 15for all multilibs. <target-sys> can be handled by mapping the multilib
12<target-sys> to the one used by gcc-cross-canadian, e.g. mips64-polkmllib32-linux 16<target-sys> to the one used by gcc-cross-canadian, e.g.
17mips64-polkmllib32-linux
13is symlinked to by mips64-poky-linux. 18is symlinked to by mips64-poky-linux.
14 19
15The default gcc search path in the target sysroot for a "lib64" mutlilib is: 20The default gcc search path in the target sysroot for a "lib64" mutlilib
21is:
16 22
17<sysroot>/lib32/mips64-poky-linux/5.2.0/ 23<sysroot>/lib32/mips64-poky-linux/5.2.0/
18<sysroot>/lib32/../lib64/ 24<sysroot>/lib32/../lib64/
@@ -39,11 +45,16 @@ binaries can be found first. With this change the search path becomes:
39Upstream-Status: Pending 45Upstream-Status: Pending
40RP 2015/7/31 46RP 2015/7/31
41 47
42Index: gcc-5.2.0/gcc/gcc.c 48Signed-off-by: Khem Raj <raj.khem@gmail.com>
43=================================================================== 49---
44--- gcc-5.2.0.orig/gcc/gcc.c 50 gcc/gcc.c | 29 ++++++++++++++++++++++++++++-
45+++ gcc-5.2.0/gcc/gcc.c 51 1 file changed, 28 insertions(+), 1 deletion(-)
46@@ -2305,7 +2305,7 @@ for_each_path (const struct path_prefix 52
53diff --git a/gcc/gcc.c b/gcc/gcc.c
54index 2b7756e..8f53aea 100644
55--- a/gcc/gcc.c
56+++ b/gcc/gcc.c
57@@ -2305,7 +2305,7 @@ for_each_path (const struct path_prefix *paths,
47 if (path == NULL) 58 if (path == NULL)
48 { 59 {
49 len = paths->max_len + extra_space + 1; 60 len = paths->max_len + extra_space + 1;
@@ -52,7 +63,7 @@ Index: gcc-5.2.0/gcc/gcc.c
52 path = XNEWVEC (char, len); 63 path = XNEWVEC (char, len);
53 } 64 }
54 65
55@@ -2317,6 +2317,33 @@ for_each_path (const struct path_prefix 66@@ -2317,6 +2317,33 @@ for_each_path (const struct path_prefix *paths,
56 /* Look first in MACHINE/VERSION subdirectory. */ 67 /* Look first in MACHINE/VERSION subdirectory. */
57 if (!skip_multi_dir) 68 if (!skip_multi_dir)
58 { 69 {
@@ -86,3 +97,6 @@ Index: gcc-5.2.0/gcc/gcc.c
86 memcpy (path + len, multi_suffix, suffix_len + 1); 97 memcpy (path + len, multi_suffix, suffix_len + 1);
87 ret = callback (path, callback_info); 98 ret = callback (path, callback_info);
88 if (ret) 99 if (ret)
100--
1012.6.3
102
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0042-cxxflags-for-build.patch b/meta/recipes-devtools/gcc/gcc-5.3/0042-Fix-various-_FOR_BUILD-and-related-variables.patch
index 1105e29f68..5af764b7c7 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0042-cxxflags-for-build.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0042-Fix-various-_FOR_BUILD-and-related-variables.patch
@@ -1,4 +1,7 @@
1Fix various _FOR_BUILD and related variables 1From 78e77206902349c9256f06c3dd179197a39af2e1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 7 Dec 2015 23:42:45 +0000
4Subject: [PATCH 42/46] Fix various _FOR_BUILD and related variables
2 5
3When doing a FOR_BUILD thing, you have to override CFLAGS with 6When doing a FOR_BUILD thing, you have to override CFLAGS with
4CFLAGS_FOR_BUILD. And if you use C++, you also have to override 7CFLAGS_FOR_BUILD. And if you use C++, you also have to override
@@ -13,9 +16,17 @@ Upstream-Status: Pending
13 16
14Signed-off-by: Peter Seebach <peter.seebach@windriver.com> 17Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
15Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 18Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20---
21 Makefile.in | 6 ++++++
22 Makefile.tpl | 5 +++++
23 gcc/Makefile.in | 2 +-
24 gcc/configure | 2 +-
25 gcc/configure.ac | 2 +-
26 5 files changed, 14 insertions(+), 3 deletions(-)
16 27
17diff --git a/Makefile.in b/Makefile.in 28diff --git a/Makefile.in b/Makefile.in
18index 9370174..011c29a 100644 29index a783e1e..8b6d3d2 100644
19--- a/Makefile.in 30--- a/Makefile.in
20+++ b/Makefile.in 31+++ b/Makefile.in
21@@ -152,6 +152,7 @@ BUILD_EXPORTS = \ 32@@ -152,6 +152,7 @@ BUILD_EXPORTS = \
@@ -44,7 +55,7 @@ index 9370174..011c29a 100644
44 ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \ 55 ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
45 CFLAGS="$(CFLAGS)"; export CFLAGS; \ 56 CFLAGS="$(CFLAGS)"; export CFLAGS; \
46 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ 57 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
47@@ -711,6 +715,7 @@ BASE_FLAGS_TO_PASS = \ 58@@ -710,6 +715,7 @@ BASE_FLAGS_TO_PASS = \
48 "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ 59 "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
49 "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ 60 "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
50 "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \ 61 "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
@@ -96,7 +107,7 @@ index cd5bc4a..98ae4f4 100644
96 # Actual name to use when installing a native compiler. 107 # Actual name to use when installing a native compiler.
97 GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)') 108 GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
98diff --git a/gcc/configure b/gcc/configure 109diff --git a/gcc/configure b/gcc/configure
99index c7ac14b..5ac63e4 100755 110index 6df594c..fcb05e7 100755
100--- a/gcc/configure 111--- a/gcc/configure
101+++ b/gcc/configure 112+++ b/gcc/configure
102@@ -11521,7 +11521,7 @@ else 113@@ -11521,7 +11521,7 @@ else
@@ -109,7 +120,7 @@ index c7ac14b..5ac63e4 100755
109 --enable-languages=${enable_languages-all} \ 120 --enable-languages=${enable_languages-all} \
110 --target=$target_alias --host=$build_alias --build=$build_alias 121 --target=$target_alias --host=$build_alias --build=$build_alias
111diff --git a/gcc/configure.ac b/gcc/configure.ac 122diff --git a/gcc/configure.ac b/gcc/configure.ac
112index 50856e6..17a4dfd 100644 123index 3bb2173..923bc9a 100644
113--- a/gcc/configure.ac 124--- a/gcc/configure.ac
114+++ b/gcc/configure.ac 125+++ b/gcc/configure.ac
115@@ -1633,7 +1633,7 @@ else 126@@ -1633,7 +1633,7 @@ else
@@ -121,3 +132,6 @@ index 50856e6..17a4dfd 100644
121 ${realsrcdir}/configure \ 132 ${realsrcdir}/configure \
122 --enable-languages=${enable_languages-all} \ 133 --enable-languages=${enable_languages-all} \
123 --target=$target_alias --host=$build_alias --build=$build_alias 134 --target=$target_alias --host=$build_alias --build=$build_alias
135--
1362.6.3
137
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0043-libstdc-musl.patch b/meta/recipes-devtools/gcc/gcc-5.3/0043-libstdc-Support-musl.patch
index 048e481dce..bad8402ef8 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0043-libstdc-musl.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0043-libstdc-Support-musl.patch
@@ -1,11 +1,20 @@
1From df430b943a2df6b72054c808d4b93338a82562de Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 8 Dec 2015 08:23:34 +0000
4Subject: [PATCH 43/46] libstdc++: Support musl
5
1Upstream-Status: Pending 6Upstream-Status: Pending
7
2Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 libstdc++-v3/configure.host | 10 ++++++++++
11 1 file changed, 10 insertions(+)
3 12
4Index: gcc-4.9-20140316/libstdc++-v3/configure.host 13diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
5=================================================================== 14index 640199c..1756444 100644
6--- gcc-4.9-20140316.orig/libstdc++-v3/configure.host 2014-03-26 01:12:19.466008193 -0700 15--- a/libstdc++-v3/configure.host
7+++ gcc-4.9-20140316/libstdc++-v3/configure.host 2014-03-26 01:43:48.222684357 -0700 16+++ b/libstdc++-v3/configure.host
8@@ -264,14 +264,24 @@ 17@@ -274,14 +274,24 @@ case "${host_os}" in
9 os_include_dir="os/bsd/freebsd" 18 os_include_dir="os/bsd/freebsd"
10 ;; 19 ;;
11 gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) 20 gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
@@ -30,3 +39,6 @@ Index: gcc-4.9-20140316/libstdc++-v3/configure.host
30 hpux*) 39 hpux*)
31 os_include_dir="os/hpux" 40 os_include_dir="os/hpux"
32 ;; 41 ;;
42--
432.6.3
44
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0044-gcc-musl-support.patch b/meta/recipes-devtools/gcc/gcc-5.3/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch
index 4d1ab872ae..b91c02d0b4 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0044-gcc-musl-support.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch
@@ -1,15 +1,25 @@
1# HG changeset patch 1From 0b54799d80fb859c7b142467e4d42c99db59df50 Mon Sep 17 00:00:00 2001
2# Parent e5b4564f249f8634194bdabef4b3057d0e54ee97 2From: Khem Raj <raj.khem@gmail.com>
3Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker. 3Date: Tue, 8 Dec 2015 08:30:35 +0000
4Subject: [PATCH 44/46] Adding -mmusl as a musl libc specifier, and the
5 necessary hacks for it to know how to find musl's dynamic linker.
4 6
5Upstream-Status: Backport [partial] 7Upstream-Status: Backport [partial]
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 gcc/config.gcc | 10 ++++-
11 gcc/config/linux.h | 100 +++++++++++++++++++++++++++++++++++++-----
12 gcc/config/linux.opt | 4 ++
13 gcc/config/rs6000/secureplt.h | 1 +
14 gcc/config/rs6000/sysv4.h | 5 +++
15 gcc/ginclude/stddef.h | 3 ++
16 6 files changed, 110 insertions(+), 13 deletions(-)
7 17
8Index: gcc-4.9.0/gcc/config.gcc 18diff --git a/gcc/config.gcc b/gcc/config.gcc
9=================================================================== 19index 3825bd5..39ce047 100644
10--- gcc-4.9.0.orig/gcc/config.gcc 2014-04-22 22:44:17.153567150 -0700 20--- a/gcc/config.gcc
11+++ gcc-4.9.0/gcc/config.gcc 2014-04-23 23:54:31.427357051 -0700 21+++ b/gcc/config.gcc
12@@ -594,7 +594,7 @@ 22@@ -575,7 +575,7 @@ case ${target} in
13 esac 23 esac
14 24
15 # Common C libraries. 25 # Common C libraries.
@@ -18,7 +28,7 @@ Index: gcc-4.9.0/gcc/config.gcc
18 28
19 # 32-bit x86 processors supported by --with-arch=. Each processor 29 # 32-bit x86 processors supported by --with-arch=. Each processor
20 # MUST be separated by exactly one space. 30 # MUST be separated by exactly one space.
21@@ -719,6 +719,9 @@ 31@@ -720,6 +720,9 @@ case ${target} in
22 *-*-*uclibc*) 32 *-*-*uclibc*)
23 tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" 33 tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
24 ;; 34 ;;
@@ -28,7 +38,7 @@ Index: gcc-4.9.0/gcc/config.gcc
28 *) 38 *)
29 tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" 39 tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
30 ;; 40 ;;
31@@ -2328,6 +2331,11 @@ 41@@ -2420,6 +2423,11 @@ powerpc*-*-linux*)
32 powerpc*-*-linux*paired*) 42 powerpc*-*-linux*paired*)
33 tm_file="${tm_file} rs6000/750cl.h" ;; 43 tm_file="${tm_file} rs6000/750cl.h" ;;
34 esac 44 esac
@@ -40,11 +50,11 @@ Index: gcc-4.9.0/gcc/config.gcc
40 if test x${enable_secureplt} = xyes; then 50 if test x${enable_secureplt} = xyes; then
41 tm_file="rs6000/secureplt.h ${tm_file}" 51 tm_file="rs6000/secureplt.h ${tm_file}"
42 fi 52 fi
43Index: gcc-4.9.0/gcc/config/linux.h 53diff --git a/gcc/config/linux.h b/gcc/config/linux.h
44=================================================================== 54index 22b9be5..ca9a17f 100644
45--- gcc-4.9.0.orig/gcc/config/linux.h 2014-01-02 14:23:26.000000000 -0800 55--- a/gcc/config/linux.h
46+++ gcc-4.9.0/gcc/config/linux.h 2014-04-24 00:11:29.034028895 -0700 56+++ b/gcc/config/linux.h
47@@ -32,10 +32,12 @@ 57@@ -32,10 +32,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
48 #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) 58 #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
49 #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) 59 #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
50 #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) 60 #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
@@ -57,7 +67,7 @@ Index: gcc-4.9.0/gcc/config/linux.h
57 #endif 67 #endif
58 68
59 #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ 69 #define GNU_USER_TARGET_OS_CPP_BUILTINS() \
60@@ -53,18 +55,21 @@ 70@@ -53,18 +55,21 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
61 uClibc or Bionic is the default C library and whether 71 uClibc or Bionic is the default C library and whether
62 -muclibc or -mglibc or -mbionic has been passed to change the default. */ 72 -muclibc or -mglibc or -mbionic has been passed to change the default. */
63 73
@@ -87,7 +97,7 @@ Index: gcc-4.9.0/gcc/config/linux.h
87 #else 97 #else
88 #error "Unsupported DEFAULT_LIBC" 98 #error "Unsupported DEFAULT_LIBC"
89 #endif /* DEFAULT_LIBC */ 99 #endif /* DEFAULT_LIBC */
90@@ -84,16 +89,16 @@ 100@@ -84,16 +89,16 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
91 101
92 #define GNU_USER_DYNAMIC_LINKER \ 102 #define GNU_USER_DYNAMIC_LINKER \
93 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ 103 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
@@ -108,7 +118,7 @@ Index: gcc-4.9.0/gcc/config/linux.h
108 118
109 /* Whether we have Bionic libc runtime */ 119 /* Whether we have Bionic libc runtime */
110 #undef TARGET_HAS_BIONIC 120 #undef TARGET_HAS_BIONIC
111@@ -127,3 +132,74 @@ 121@@ -123,3 +128,74 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
112 # define TARGET_LIBC_HAS_FUNCTION linux_libc_has_function 122 # define TARGET_LIBC_HAS_FUNCTION linux_libc_has_function
113 123
114 #endif 124 #endif
@@ -183,11 +193,11 @@ Index: gcc-4.9.0/gcc/config/linux.h
183+ { 0, 0, 0, 0, 0, 0 } \ 193+ { 0, 0, 0, 0, 0, 0 } \
184+ } 194+ }
185+#endif 195+#endif
186Index: gcc-4.9.0/gcc/config/linux.opt 196diff --git a/gcc/config/linux.opt b/gcc/config/linux.opt
187=================================================================== 197index c054338..9334f74 100644
188--- gcc-4.9.0.orig/gcc/config/linux.opt 2014-01-02 14:23:26.000000000 -0800 198--- a/gcc/config/linux.opt
189+++ gcc-4.9.0/gcc/config/linux.opt 2014-04-22 22:44:17.280233817 -0700 199+++ b/gcc/config/linux.opt
190@@ -30,3 +30,7 @@ 200@@ -30,3 +30,7 @@ Use GNU C library
191 muclibc 201 muclibc
192 Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) 202 Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
193 Use uClibc C library 203 Use uClibc C library
@@ -195,48 +205,20 @@ Index: gcc-4.9.0/gcc/config/linux.opt
195+mmusl 205+mmusl
196+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) 206+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
197+Use musl C library 207+Use musl C library
198Index: gcc-4.9.0/gcc/ginclude/stddef.h 208diff --git a/gcc/config/rs6000/secureplt.h b/gcc/config/rs6000/secureplt.h
199=================================================================== 209index b463463..77edf2a 100644
200--- gcc-4.9.0.orig/gcc/ginclude/stddef.h 2014-01-02 14:23:26.000000000 -0800 210--- a/gcc/config/rs6000/secureplt.h
201+++ gcc-4.9.0/gcc/ginclude/stddef.h 2014-04-22 22:44:17.280233817 -0700 211+++ b/gcc/config/rs6000/secureplt.h
202@@ -181,6 +181,7 @@ 212@@ -18,3 +18,4 @@ along with GCC; see the file COPYING3. If not see
203 #ifndef _GCC_SIZE_T
204 #ifndef _SIZET_
205 #ifndef __size_t
206+#ifndef __DEFINED_size_t /* musl */
207 #define __size_t__ /* BeOS */
208 #define __SIZE_T__ /* Cray Unicos/Mk */
209 #define _SIZE_T
210@@ -197,6 +198,7 @@
211 #define ___int_size_t_h
212 #define _GCC_SIZE_T
213 #define _SIZET_
214+#define __DEFINED_size_t /* musl */
215 #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
216 || defined(__FreeBSD_kernel__)
217 /* __size_t is a typedef on FreeBSD 5, must not trash it. */
218@@ -214,6 +216,7 @@
219 typedef long ssize_t;
220 #endif /* __BEOS__ */
221 #endif /* !(defined (__GNUG__) && defined (size_t)) */
222+#endif /* __DEFINED_size_t */
223 #endif /* __size_t */
224 #endif /* _SIZET_ */
225 #endif /* _GCC_SIZE_T */
226Index: gcc-4.9.0/gcc/config/rs6000/secureplt.h
227===================================================================
228--- gcc-4.9.0.orig/gcc/config/rs6000/secureplt.h 2014-01-02 14:23:26.000000000 -0800
229+++ gcc-4.9.0/gcc/config/rs6000/secureplt.h 2014-04-23 23:55:15.114024175 -0700
230@@ -18,3 +18,4 @@
231 <http://www.gnu.org/licenses/>. */ 213 <http://www.gnu.org/licenses/>. */
232 214
233 #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" 215 #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
234+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" 216+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
235Index: gcc-4.9.0/gcc/config/rs6000/sysv4.h 217diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
236=================================================================== 218index c6c31dc..7cd07e0 100644
237--- gcc-4.9.0.orig/gcc/config/rs6000/sysv4.h 2014-04-23 23:52:13.854023015 -0700 219--- a/gcc/config/rs6000/sysv4.h
238+++ gcc-4.9.0/gcc/config/rs6000/sysv4.h 2014-04-24 00:10:55.550695334 -0700 220+++ b/gcc/config/rs6000/sysv4.h
239@@ -538,6 +538,10 @@ 221@@ -538,6 +538,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
240 #define CC1_SECURE_PLT_DEFAULT_SPEC "" 222 #define CC1_SECURE_PLT_DEFAULT_SPEC ""
241 #endif 223 #endif
242 224
@@ -245,19 +227,9 @@ Index: gcc-4.9.0/gcc/config/rs6000/sysv4.h
245+#endif 227+#endif
246+ 228+
247 /* Pass -G xxx to the compiler. */ 229 /* Pass -G xxx to the compiler. */
230 #undef CC1_SPEC
248 #define CC1_SPEC "%{G*} %(cc1_cpu)" \ 231 #define CC1_SPEC "%{G*} %(cc1_cpu)" \
249 "%{meabi: %{!mcall-*: -mcall-sysv }} \ 232@@ -889,6 +893,7 @@ ncrtn.o%s"
250@@ -585,7 +589,8 @@
251
252 /* Override the default target of the linker. */
253 #define LINK_TARGET_SPEC \
254- ENDIAN_SELECT("", " --oformat elf32-powerpcle", "")
255+ ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \
256+ "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
257
258 /* Any specific OS flags. */
259 #define LINK_OS_SPEC "\
260@@ -894,6 +899,7 @@
261 { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ 233 { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \
262 { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ 234 { "link_os_default", LINK_OS_DEFAULT_SPEC }, \
263 { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ 235 { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
@@ -265,3 +237,34 @@ Index: gcc-4.9.0/gcc/config/rs6000/sysv4.h
265 { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ 237 { "cpp_os_ads", CPP_OS_ADS_SPEC }, \
266 { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ 238 { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
267 { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ 239 { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
240diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h
241index f20a41b..eb879ef 100644
242--- a/gcc/ginclude/stddef.h
243+++ b/gcc/ginclude/stddef.h
244@@ -184,6 +184,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
245 #ifndef _GCC_SIZE_T
246 #ifndef _SIZET_
247 #ifndef __size_t
248+#ifndef __DEFINED_size_t /* musl */
249 #define __size_t__ /* BeOS */
250 #define __SIZE_T__ /* Cray Unicos/Mk */
251 #define _SIZE_T
252@@ -200,6 +201,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
253 #define ___int_size_t_h
254 #define _GCC_SIZE_T
255 #define _SIZET_
256+#define __DEFINED_size_t /* musl */
257 #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
258 || defined(__DragonFly__) \
259 || defined(__FreeBSD_kernel__)
260@@ -218,6 +220,7 @@ typedef __SIZE_TYPE__ size_t;
261 typedef long ssize_t;
262 #endif /* __BEOS__ */
263 #endif /* !(defined (__GNUG__) && defined (size_t)) */
264+#endif /* __DEFINED_size_t */
265 #endif /* __size_t */
266 #endif /* _SIZET_ */
267 #endif /* _GCC_SIZE_T */
268--
2692.6.3
270
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0045-musl-dynamic-linker.patch b/meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch
index 3dadb9504f..7f7307b1e0 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0045-musl-dynamic-linker.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch
@@ -1,15 +1,38 @@
1# HG changeset patch 1From a32a7901315bf01d0605e43cb7d0427a6d7e4b75 Mon Sep 17 00:00:00 2001
2# Parent 6738fd6f6fcc2a72f2ba527bda3325642af26885 2From: Khem Raj <raj.khem@gmail.com>
3Support for arm-linux-musl. 3Date: Tue, 8 Dec 2015 08:31:52 +0000
4Subject: [PATCH 45/46] Support for arm-linux-musl.
4 5
5Upstream-Status: backport [partial] 6Upstream-Status: backport [partial]
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 gcc/config/aarch64/aarch64-linux.h | 1 +
10 gcc/config/arm/linux-eabi.h | 17 +++++++++++++++++
11 gcc/config/i386/linux.h | 1 +
12 gcc/config/i386/linux64.h | 5 +++++
13 gcc/config/mips/linux.h | 6 +++++-
14 gcc/config/rs6000/linux64.h | 13 +++++++++----
15 gcc/config/rs6000/sysv4.h | 10 +++++++---
16 libitm/config/arm/hwcap.cc | 4 ++++
17 libitm/config/linux/x86/tls.h | 8 ++++++--
18 9 files changed, 55 insertions(+), 10 deletions(-)
7 19
8 20diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
9Index: gcc-5.1.0/gcc/config/arm/linux-eabi.h 21index f9e65fc..1b2d0c0 100644
10=================================================================== 22--- a/gcc/config/aarch64/aarch64-linux.h
11--- gcc-5.1.0.orig/gcc/config/arm/linux-eabi.h 23+++ b/gcc/config/aarch64/aarch64-linux.h
12+++ gcc-5.1.0/gcc/config/arm/linux-eabi.h 24@@ -22,6 +22,7 @@
25 #define GCC_AARCH64_LINUX_H
26
27 #define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
28+#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64.so.1"
29
30 #define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64.so.1"
31
32diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
33index 048a062..adb9c44 100644
34--- a/gcc/config/arm/linux-eabi.h
35+++ b/gcc/config/arm/linux-eabi.h
13@@ -81,6 +81,23 @@ 36@@ -81,6 +81,23 @@
14 #undef TARGET_FIX_V4BX_SPEC 37 #undef TARGET_FIX_V4BX_SPEC
15 #define TARGET_FIX_V4BX_SPEC "%{mcpu=arm8|mcpu=arm810|mcpu=strongarm*|march=armv4: --fix-v4bx}" 38 #define TARGET_FIX_V4BX_SPEC "%{mcpu=arm8|mcpu=arm810|mcpu=strongarm*|march=armv4: --fix-v4bx}"
@@ -34,36 +57,20 @@ Index: gcc-5.1.0/gcc/config/arm/linux-eabi.h
34 /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to 57 /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
35 use the GNU/Linux version, not the generic BPABI version. */ 58 use the GNU/Linux version, not the generic BPABI version. */
36 #undef LINK_SPEC 59 #undef LINK_SPEC
37Index: gcc-5.1.0/libitm/config/arm/hwcap.cc 60diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
38=================================================================== 61index 21ba2b2..e2b81e5 100644
39--- gcc-5.1.0.orig/libitm/config/arm/hwcap.cc 62--- a/gcc/config/i386/linux.h
40+++ gcc-5.1.0/libitm/config/arm/hwcap.cc 63+++ b/gcc/config/i386/linux.h
41@@ -40,7 +40,11 @@ int GTM_hwcap HIDDEN = 0 64@@ -21,3 +21,4 @@ along with GCC; see the file COPYING3. If not see
42
43 #ifdef __linux__
44 #include <unistd.h>
45+#ifdef __GLIBC__
46 #include <sys/fcntl.h>
47+#else
48+#include <fcntl.h>
49+#endif
50 #include <elf.h>
51
52 static void __attribute__((constructor))
53Index: gcc-5.1.0/gcc/config/i386/linux.h
54===================================================================
55--- gcc-5.1.0.orig/gcc/config/i386/linux.h
56+++ gcc-5.1.0/gcc/config/i386/linux.h
57@@ -21,3 +21,4 @@ along with GCC; see the file COPYING3.
58 65
59 #define GNU_USER_LINK_EMULATION "elf_i386" 66 #define GNU_USER_LINK_EMULATION "elf_i386"
60 #define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" 67 #define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
61+#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-i386.so.1" 68+#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-i386.so.1"
62Index: gcc-5.1.0/gcc/config/i386/linux64.h 69diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
63=================================================================== 70index 6185cce..5a3a977 100644
64--- gcc-5.1.0.orig/gcc/config/i386/linux64.h 71--- a/gcc/config/i386/linux64.h
65+++ gcc-5.1.0/gcc/config/i386/linux64.h 72+++ b/gcc/config/i386/linux64.h
66@@ -30,3 +30,8 @@ see the files COPYING3 and COPYING.RUNTI 73@@ -30,3 +30,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
67 #define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2" 74 #define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2"
68 #define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2" 75 #define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2"
69 #define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2" 76 #define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2"
@@ -72,11 +79,11 @@ Index: gcc-5.1.0/gcc/config/i386/linux64.h
72+#define MUSL_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-musl-x86_64.so.1" 79+#define MUSL_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-musl-x86_64.so.1"
73+#define MUSL_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-musl-x32.so.1" 80+#define MUSL_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-musl-x32.so.1"
74+ 81+
75Index: gcc-5.1.0/gcc/config/mips/linux.h 82diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
76=================================================================== 83index c306afb..44d4c12 100644
77--- gcc-5.1.0.orig/gcc/config/mips/linux.h 84--- a/gcc/config/mips/linux.h
78+++ gcc-5.1.0/gcc/config/mips/linux.h 85+++ b/gcc/config/mips/linux.h
79@@ -21,6 +21,10 @@ along with GCC; see the file COPYING3. 86@@ -21,6 +21,10 @@ along with GCC; see the file COPYING3. If not see
80 #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip" 87 #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip"
81 #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" 88 #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
82 89
@@ -87,16 +94,16 @@ Index: gcc-5.1.0/gcc/config/mips/linux.h
87 #define GLIBC_DYNAMIC_LINKER32 \ 94 #define GLIBC_DYNAMIC_LINKER32 \
88 "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}" 95 "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}"
89 #define GLIBC_DYNAMIC_LINKER64 \ 96 #define GLIBC_DYNAMIC_LINKER64 \
90@@ -40,4 +44,4 @@ along with GCC; see the file COPYING3. 97@@ -40,4 +44,4 @@ along with GCC; see the file COPYING3. If not see
91 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" 98 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
92 #define GNU_USER_DYNAMIC_LINKERN32 \ 99 #define GNU_USER_DYNAMIC_LINKERN32 \
93 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ 100 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
94- BIONIC_DYNAMIC_LINKERN32) 101- BIONIC_DYNAMIC_LINKERN32)
95+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32) 102+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)
96Index: gcc-5.1.0/gcc/config/rs6000/linux64.h 103diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
97=================================================================== 104index 31c4338..679da4b 100644
98--- gcc-5.1.0.orig/gcc/config/rs6000/linux64.h 105--- a/gcc/config/rs6000/linux64.h
99+++ gcc-5.1.0/gcc/config/rs6000/linux64.h 106+++ b/gcc/config/rs6000/linux64.h
100@@ -365,17 +365,22 @@ extern int dot_symbols; 107@@ -365,17 +365,22 @@ extern int dot_symbols;
101 #endif 108 #endif
102 #define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0" 109 #define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0"
@@ -124,11 +131,11 @@ Index: gcc-5.1.0/gcc/config/rs6000/linux64.h
124 131
125 #undef DEFAULT_ASM_ENDIAN 132 #undef DEFAULT_ASM_ENDIAN
126 #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) 133 #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
127Index: gcc-5.1.0/gcc/config/rs6000/sysv4.h 134diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
128=================================================================== 135index 7cd07e0..8794fa5 100644
129--- gcc-5.1.0.orig/gcc/config/rs6000/sysv4.h 136--- a/gcc/config/rs6000/sysv4.h
130+++ gcc-5.1.0/gcc/config/rs6000/sysv4.h 137+++ b/gcc/config/rs6000/sysv4.h
131@@ -769,15 +769,19 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF 138@@ -763,15 +763,19 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
132 139
133 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" 140 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
134 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" 141 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
@@ -151,10 +158,26 @@ Index: gcc-5.1.0/gcc/config/rs6000/sysv4.h
151 158
152 #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ 159 #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
153 %{rdynamic:-export-dynamic} \ 160 %{rdynamic:-export-dynamic} \
154Index: gcc-5.1.0/libitm/config/linux/x86/tls.h 161diff --git a/libitm/config/arm/hwcap.cc b/libitm/config/arm/hwcap.cc
155=================================================================== 162index a1c2cfd..dd4fad2 100644
156--- gcc-5.1.0.orig/libitm/config/linux/x86/tls.h 163--- a/libitm/config/arm/hwcap.cc
157+++ gcc-5.1.0/libitm/config/linux/x86/tls.h 164+++ b/libitm/config/arm/hwcap.cc
165@@ -40,7 +40,11 @@ int GTM_hwcap HIDDEN = 0
166
167 #ifdef __linux__
168 #include <unistd.h>
169+#ifdef __GLIBC__
170 #include <sys/fcntl.h>
171+#else
172+#include <fcntl.h>
173+#endif
174 #include <elf.h>
175
176 static void __attribute__((constructor))
177diff --git a/libitm/config/linux/x86/tls.h b/libitm/config/linux/x86/tls.h
178index e731ab7..54ad8b6 100644
179--- a/libitm/config/linux/x86/tls.h
180+++ b/libitm/config/linux/x86/tls.h
158@@ -25,16 +25,19 @@ 181@@ -25,16 +25,19 @@
159 #ifndef LIBITM_X86_TLS_H 182 #ifndef LIBITM_X86_TLS_H
160 #define LIBITM_X86_TLS_H 1 183 #define LIBITM_X86_TLS_H 1
@@ -177,22 +200,13 @@ Index: gcc-5.1.0/libitm/config/linux/x86/tls.h
177 namespace GTM HIDDEN { 200 namespace GTM HIDDEN {
178 201
179 #ifdef __x86_64__ 202 #ifdef __x86_64__
180@@ -101,5 +104,6 @@ static inline void set_abi_disp(struct a 203@@ -101,5 +104,6 @@ static inline void set_abi_disp(struct abi_dispatch *x)
181 204
182 } // namespace GTM 205 } // namespace GTM
183 #endif /* >= GLIBC 2.10 */ 206 #endif /* >= GLIBC 2.10 */
184+#endif 207+#endif
185 208
186 #endif // LIBITM_X86_TLS_H 209 #endif // LIBITM_X86_TLS_H
187Index: gcc-5.1.0/gcc/config/aarch64/aarch64-linux.h 210--
188=================================================================== 2112.6.3
189--- gcc-5.1.0.orig/gcc/config/aarch64/aarch64-linux.h 212
190+++ gcc-5.1.0/gcc/config/aarch64/aarch64-linux.h
191@@ -22,6 +22,7 @@
192 #define GCC_AARCH64_LINUX_H
193
194 #define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
195+#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64.so.1"
196
197 #undef ASAN_CC1_SPEC
198 #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
diff --git a/meta/recipes-devtools/gcc/gcc-5.3/0046-Get-rid-of-ever-broken-fixincludes-on-musl.patch b/meta/recipes-devtools/gcc/gcc-5.3/0046-Get-rid-of-ever-broken-fixincludes-on-musl.patch
new file mode 100644
index 0000000000..ddb0fc4f40
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0046-Get-rid-of-ever-broken-fixincludes-on-musl.patch
@@ -0,0 +1,28 @@
1From 047116e8c9cbb340264f4f28db3f21a68ba57ff3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 8 Dec 2015 08:32:24 +0000
4Subject: [PATCH 46/46] Get rid of ever-broken fixincludes on musl.
5
6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 fixincludes/mkfixinc.sh | 3 ++-
10 1 file changed, 2 insertions(+), 1 deletion(-)
11
12diff --git a/fixincludes/mkfixinc.sh b/fixincludes/mkfixinc.sh
13index 6653fedb..0d96c8c 100755
14--- a/fixincludes/mkfixinc.sh
15+++ b/fixincludes/mkfixinc.sh
16@@ -19,7 +19,8 @@ case $machine in
17 powerpc-*-eabi* | \
18 powerpc-*-rtems* | \
19 powerpcle-*-eabisim* | \
20- powerpcle-*-eabi* )
21+ powerpcle-*-eabi* | \
22+ *-musl* )
23 # IF there is no include fixing,
24 # THEN create a no-op fixer and exit
25 (echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
26--
272.6.3
28
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_5.2.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_5.3.bb
index bf53c5cd78..bf53c5cd78 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_5.2.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_5.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial_5.2.bb b/meta/recipes-devtools/gcc/gcc-cross-initial_5.3.bb
index 4c73e5ce61..4c73e5ce61 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial_5.2.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial_5.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross_5.2.bb b/meta/recipes-devtools/gcc/gcc-cross_5.3.bb
index b43cca0c52..b43cca0c52 100644
--- a/meta/recipes-devtools/gcc/gcc-cross_5.2.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross_5.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_5.2.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_5.3.bb
index fd90e1140f..fd90e1140f 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_5.2.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_5.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_5.2.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_5.3.bb
index 40a6c4feff..40a6c4feff 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk_5.2.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk_5.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 690d78012d..c31072a390 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -143,11 +143,11 @@ FILES_libstdc++ = "${libdir}/libstdc++.so.*"
143FILES_libstdc++-dev = "\ 143FILES_libstdc++-dev = "\
144 ${includedir}/c++/ \ 144 ${includedir}/c++/ \
145 ${libdir}/libstdc++.so \ 145 ${libdir}/libstdc++.so \
146 ${libdir}/libstdc++.la \ 146 ${libdir}/libstdc++*.la \
147 ${libdir}/libsupc++.la \ 147 ${libdir}/libsupc++.la \
148" 148"
149FILES_libstdc++-staticdev = "\ 149FILES_libstdc++-staticdev = "\
150 ${libdir}/libstdc++.a \ 150 ${libdir}/libstdc++*.a \
151 ${libdir}/libsupc++.a \ 151 ${libdir}/libsupc++.a \
152" 152"
153 153
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_5.2.bb b/meta/recipes-devtools/gcc/gcc-runtime_5.3.bb
index 8f31e7792e..8f31e7792e 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime_5.2.bb
+++ b/meta/recipes-devtools/gcc/gcc-runtime_5.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_5.2.bb b/meta/recipes-devtools/gcc/gcc-sanitizers_5.3.bb
index 601f666023..601f666023 100644
--- a/meta/recipes-devtools/gcc/gcc-sanitizers_5.2.bb
+++ b/meta/recipes-devtools/gcc/gcc-sanitizers_5.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-source_5.2.bb b/meta/recipes-devtools/gcc/gcc-source_5.3.bb
index b890fa33ea..b890fa33ea 100644
--- a/meta/recipes-devtools/gcc/gcc-source_5.2.bb
+++ b/meta/recipes-devtools/gcc/gcc-source_5.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc_5.2.bb b/meta/recipes-devtools/gcc/gcc_5.3.bb
index b0a523cae2..b0a523cae2 100644
--- a/meta/recipes-devtools/gcc/gcc_5.2.bb
+++ b/meta/recipes-devtools/gcc/gcc_5.3.bb
diff --git a/meta/recipes-devtools/gcc/libgcc-initial_5.2.bb b/meta/recipes-devtools/gcc/libgcc-initial_5.3.bb
index 19f253fce8..19f253fce8 100644
--- a/meta/recipes-devtools/gcc/libgcc-initial_5.2.bb
+++ b/meta/recipes-devtools/gcc/libgcc-initial_5.3.bb
diff --git a/meta/recipes-devtools/gcc/libgcc_5.2.bb b/meta/recipes-devtools/gcc/libgcc_5.3.bb
index a5152f28e9..a5152f28e9 100644
--- a/meta/recipes-devtools/gcc/libgcc_5.2.bb
+++ b/meta/recipes-devtools/gcc/libgcc_5.3.bb
diff --git a/meta/recipes-devtools/gcc/libgfortran_5.2.bb b/meta/recipes-devtools/gcc/libgfortran_5.3.bb
index 71dd8b4bdc..71dd8b4bdc 100644
--- a/meta/recipes-devtools/gcc/libgfortran_5.2.bb
+++ b/meta/recipes-devtools/gcc/libgfortran_5.3.bb