summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-03-12 16:08:40 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-13 13:35:16 +0000
commit901a93885fccd2640b1205d84959a4e894f8f224 (patch)
tree9cf52a70102c4043bebdc341f8c9fc5f1ac19581 /meta/recipes-devtools
parent350979b2787a5472a03781b0dbc25e0364136a8d (diff)
downloadpoky-901a93885fccd2640b1205d84959a4e894f8f224.tar.gz
gcc: Upgrade to 9.3 bugfix release
This brings ~157 bugfixes [1] to gcc-9 with no features Drop backports which are already part of the release now [1] https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&list_id=260610&resolution=FIXED&target_milestone=9.3 (From OE-Core rev: caf80e4e245132bdc3bbe219b567013f2c5d2f46) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0037-Fix-up-libsanitizer-build-with-master-glibc.patch70
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_1.patch521
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_2.patch77
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_3.patch62
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3.inc (renamed from meta/recipes-devtools/gcc/gcc-9.2.inc)22
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0002-gcc-poison-system-directories.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0002-gcc-poison-system-directories.patch)24
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0004-64-bit-multilib-hack.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0004-64-bit-multilib-hack.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0005-optional-libstdc.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0005-optional-libstdc.patch)12
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0006-COLLECT_GCC_OPTIONS.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0006-COLLECT_GCC_OPTIONS.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch)14
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0008-fortran-cross-compile-hack.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0008-fortran-cross-compile-hack.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0009-cpp-honor-sysroot.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0009-cpp-honor-sysroot.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0010-MIPS64-Default-to-N64-ABI.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0010-MIPS64-Default-to-N64-ABI.patch)8
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch)7
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0012-gcc-Fix-argument-list-too-long-error.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0012-gcc-Fix-argument-list-too-long-error.patch)10
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0013-Disable-sdt.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0013-Disable-sdt.patch)20
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0014-libtool.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0014-libtool.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch)14
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0018-export-CPP.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0018-export-CPP.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0019-Ensure-target-gcc-headers-can-be-included.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch)19
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0023-aarch64-Add-support-for-musl-ldso.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0023-aarch64-Add-support-for-musl-ldso.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0025-handle-sysroot-support-for-nativesdk-gcc.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0025-handle-sysroot-support-for-nativesdk-gcc.patch)40
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch)12
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0027-Fix-various-_FOR_BUILD-and-related-variables.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0027-Fix-various-_FOR_BUILD-and-related-variables.patch)14
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0030-ldbl128-config.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch)16
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch)10
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0033-sync-gcc-stddef.h-with-musl.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0033-sync-gcc-stddef.h-with-musl.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0034-fix-segmentation-fault-in-precompiled-header-generat.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0034-fix-segmentation-fault-in-precompiled-header-generat.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0035-Fix-for-testsuite-failure.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0035-Fix-for-testsuite-failure.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0036-Re-introduce-spe-commandline-options.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/0036-Re-introduce-spe-commandline-options.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-14250.patch)24
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch)21
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch (renamed from meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch)15
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian_9.3.bb (renamed from meta/recipes-devtools/gcc/gcc-cross-canadian_9.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross_9.3.bb (renamed from meta/recipes-devtools/gcc/gcc-cross_9.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk_9.3.bb (renamed from meta/recipes-devtools/gcc/gcc-crosssdk_9.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime_9.3.bb (renamed from meta/recipes-devtools/gcc/gcc-runtime_9.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-sanitizers_9.3.bb (renamed from meta/recipes-devtools/gcc/gcc-sanitizers_9.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-source_9.3.bb (renamed from meta/recipes-devtools/gcc/gcc-source_9.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc_9.3.bb (renamed from meta/recipes-devtools/gcc/gcc_9.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgcc-initial_9.3.bb (renamed from meta/recipes-devtools/gcc/libgcc-initial_9.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgcc_9.3.bb (renamed from meta/recipes-devtools/gcc/libgcc_9.2.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgfortran_9.3.bb (renamed from meta/recipes-devtools/gcc/libgfortran_9.2.bb)0
54 files changed, 230 insertions, 934 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0037-Fix-up-libsanitizer-build-with-master-glibc.patch b/meta/recipes-devtools/gcc/gcc-9.2/0037-Fix-up-libsanitizer-build-with-master-glibc.patch
deleted file mode 100644
index abe074c289..0000000000
--- a/meta/recipes-devtools/gcc/gcc-9.2/0037-Fix-up-libsanitizer-build-with-master-glibc.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 7ed24d12664319f34625a12fd8c0f729a0e71f5c Mon Sep 17 00:00:00 2001
2From: Auto Builder <ab@rdk>
3Date: Sun, 22 Dec 2019 02:58:24 +0000
4Subject: [PATCH] Fix up libsanitizer build with master glibc
5
62019-11-26 Jakub Jelinek <jakub@redhat.com>
7
8 PR sanitizer/92154
9 * sanitizer_common/sanitizer_platform_limits_posix.h: Cherry-pick
10 llvm-project revision 947f9692440836dcb8d88b74b69dd379d85974ce.
11 * sanitizer_common/sanitizer_platform_limits_posix.cpp: Likewise.
12
13Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b02486e0951bc0ed38310a03be73e479fc6f3e7a;hp=3feeac76ffc38427de2d7d086e2928e63eee2d44]
14Signed-off-by: Auto Builder <ab@rdk>
15---
16 .../sanitizer_platform_limits_posix.cc | 5 +++--
17 .../sanitizer_platform_limits_posix.h | 15 +--------------
18 2 files changed, 4 insertions(+), 16 deletions(-)
19
20diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
21index 6cd4a5bac..d823a1219 100644
22--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
23+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
24@@ -1156,8 +1156,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
25 CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
26 CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
27 CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
28-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
29-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */
30+#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
31+/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
32+ on many architectures. */
33 CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
34 #endif
35
36diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
37index 73af92af1..6a673a7c9 100644
38--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
39+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
40@@ -211,26 +211,13 @@ namespace __sanitizer {
41 u64 __unused1;
42 u64 __unused2;
43 #elif defined(__sparc__)
44-#if defined(__arch64__)
45 unsigned mode;
46- unsigned short __pad1;
47-#else
48- unsigned short __pad1;
49- unsigned short mode;
50 unsigned short __pad2;
51-#endif
52 unsigned short __seq;
53 unsigned long long __unused1;
54 unsigned long long __unused2;
55-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__)
56- unsigned int mode;
57- unsigned short __seq;
58- unsigned short __pad1;
59- unsigned long __unused1;
60- unsigned long __unused2;
61 #else
62- unsigned short mode;
63- unsigned short __pad1;
64+ unsigned int mode;
65 unsigned short __seq;
66 unsigned short __pad2;
67 #if defined(__x86_64__) && !defined(_LP64)
68--
692.17.1
70
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_1.patch b/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_1.patch
deleted file mode 100644
index 227fd47c95..0000000000
--- a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_1.patch
+++ /dev/null
@@ -1,521 +0,0 @@
1From 8c61566116d23063ff597271884f8e00d94ab1a1 Mon Sep 17 00:00:00 2001
2From: segher <segher@138bc75d-0d04-0410-961f-82ee72b054a4>
3Date: Fri, 30 Aug 2019 13:48:48 +0000
4Subject: [PATCH] Backport from trunk 2019-08-22 Segher Boessenkool
5 <segher@kernel.crashing.org>
6
7 * config/rs6000/altivec.md (unspec): Delete UNSPEC_DARN, UNSPEC_DARN_32,
8 UNSPEC_DARN_RAW, UNSPEC_CMPRB, UNSPEC_CMPRB2, UNSPEC_CMPEQB; move to...
9 * config/rs6000/rs6000.md (unspec): ... here.
10 * config/rs6000/altivec.md (darn_32, darn_raw, darn, cmprb,
11 *cmprb_internal, setb_signed, setb_unsigned, cmprb2, *cmprb2_internal,
12 cmpeqb, *cmpeqb_internal): Delete, move to...
13 * config/rs6000/rs6000.md (darn_32, darn_raw, darn, cmprb,
14 *cmprb_internal, setb_signed, setb_unsigned, cmprb2, *cmprb2_internal,
15 cmpeqb, *cmpeqb_internal): ... here.
16
17
18git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@275170 138bc75d-0d04-0410-961f-82ee72b054a4
19
20Upstream-Status: Backport
21CVE: CVE-2019-15847 p1
22Affects <= 9.2.0
23Dropped Changelog changes
24Signed-off-by: Armin Kuster <akuster@mvista.com>
25
26---
27 gcc/config/rs6000/altivec.md | 223 ----------------------------------
28 gcc/config/rs6000/rs6000.md | 224 +++++++++++++++++++++++++++++++++++
29 3 files changed, 239 insertions(+), 223 deletions(-)
30
31Index: gcc-9.2.0/gcc/config/rs6000/altivec.md
32===================================================================
33--- gcc-9.2.0.orig/gcc/config/rs6000/altivec.md
34+++ gcc-9.2.0/gcc/config/rs6000/altivec.md
35@@ -80,9 +80,6 @@
36 UNSPEC_VUPKHPX
37 UNSPEC_VUPKLPX
38 UNSPEC_CONVERT_4F32_8I16
39- UNSPEC_DARN
40- UNSPEC_DARN_32
41- UNSPEC_DARN_RAW
42 UNSPEC_DST
43 UNSPEC_DSTT
44 UNSPEC_DSTST
45@@ -161,9 +158,6 @@
46 UNSPEC_BCDADD
47 UNSPEC_BCDSUB
48 UNSPEC_BCD_OVERFLOW
49- UNSPEC_CMPRB
50- UNSPEC_CMPRB2
51- UNSPEC_CMPEQB
52 UNSPEC_VRLMI
53 UNSPEC_VRLNM
54 ])
55@@ -4101,223 +4095,6 @@
56 "bcd<bcd_add_sub>. %0,%1,%2,%3"
57 [(set_attr "type" "vecsimple")])
58
59-(define_insn "darn_32"
60- [(set (match_operand:SI 0 "register_operand" "=r")
61- (unspec:SI [(const_int 0)] UNSPEC_DARN_32))]
62- "TARGET_P9_MISC"
63- "darn %0,0"
64- [(set_attr "type" "integer")])
65-
66-(define_insn "darn_raw"
67- [(set (match_operand:DI 0 "register_operand" "=r")
68- (unspec:DI [(const_int 0)] UNSPEC_DARN_RAW))]
69- "TARGET_P9_MISC && TARGET_64BIT"
70- "darn %0,2"
71- [(set_attr "type" "integer")])
72-
73-(define_insn "darn"
74- [(set (match_operand:DI 0 "register_operand" "=r")
75- (unspec:DI [(const_int 0)] UNSPEC_DARN))]
76- "TARGET_P9_MISC && TARGET_64BIT"
77- "darn %0,1"
78- [(set_attr "type" "integer")])
79-
80-;; Test byte within range.
81-;;
82-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
83-;; represents a byte whose value is ignored in this context and
84-;; vv, the least significant byte, holds the byte value that is to
85-;; be tested for membership within the range specified by operand 2.
86-;; The bytes of operand 2 are organized as xx:xx:hi:lo.
87-;;
88-;; Return in target register operand 0 a value of 1 if lo <= vv and
89-;; vv <= hi. Otherwise, set register operand 0 to 0.
90-;;
91-;; Though the instructions to which this expansion maps operate on
92-;; 64-bit registers, the current implementation only operates on
93-;; SI-mode operands as the high-order bits provide no information
94-;; that is not already available in the low-order bits. To avoid the
95-;; costs of data widening operations, future enhancements might allow
96-;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
97-(define_expand "cmprb"
98- [(set (match_dup 3)
99- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
100- (match_operand:SI 2 "gpc_reg_operand" "r")]
101- UNSPEC_CMPRB))
102- (set (match_operand:SI 0 "gpc_reg_operand" "=r")
103- (if_then_else:SI (lt (match_dup 3)
104- (const_int 0))
105- (const_int -1)
106- (if_then_else (gt (match_dup 3)
107- (const_int 0))
108- (const_int 1)
109- (const_int 0))))]
110- "TARGET_P9_MISC"
111-{
112- operands[3] = gen_reg_rtx (CCmode);
113-})
114-
115-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
116-;; represents a byte whose value is ignored in this context and
117-;; vv, the least significant byte, holds the byte value that is to
118-;; be tested for membership within the range specified by operand 2.
119-;; The bytes of operand 2 are organized as xx:xx:hi:lo.
120-;;
121-;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if
122-;; lo <= vv and vv <= hi. Otherwise, set the GT bit to 0. The other
123-;; 3 bits of the target CR register are all set to 0.
124-(define_insn "*cmprb_internal"
125- [(set (match_operand:CC 0 "cc_reg_operand" "=y")
126- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
127- (match_operand:SI 2 "gpc_reg_operand" "r")]
128- UNSPEC_CMPRB))]
129- "TARGET_P9_MISC"
130- "cmprb %0,0,%1,%2"
131- [(set_attr "type" "logical")])
132-
133-;; Set operand 0 register to -1 if the LT bit (0x8) of condition
134-;; register operand 1 is on. Otherwise, set operand 0 register to 1
135-;; if the GT bit (0x4) of condition register operand 1 is on.
136-;; Otherwise, set operand 0 to 0. Note that the result stored into
137-;; register operand 0 is non-zero iff either the LT or GT bits are on
138-;; within condition register operand 1.
139-(define_insn "setb_signed"
140- [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
141- (if_then_else:SI (lt (match_operand:CC 1 "cc_reg_operand" "y")
142- (const_int 0))
143- (const_int -1)
144- (if_then_else (gt (match_dup 1)
145- (const_int 0))
146- (const_int 1)
147- (const_int 0))))]
148- "TARGET_P9_MISC"
149- "setb %0,%1"
150- [(set_attr "type" "logical")])
151-
152-(define_insn "setb_unsigned"
153- [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
154- (if_then_else:SI (ltu (match_operand:CCUNS 1 "cc_reg_operand" "y")
155- (const_int 0))
156- (const_int -1)
157- (if_then_else (gtu (match_dup 1)
158- (const_int 0))
159- (const_int 1)
160- (const_int 0))))]
161- "TARGET_P9_MISC"
162- "setb %0,%1"
163- [(set_attr "type" "logical")])
164-
165-;; Test byte within two ranges.
166-;;
167-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
168-;; represents a byte whose value is ignored in this context and
169-;; vv, the least significant byte, holds the byte value that is to
170-;; be tested for membership within the range specified by operand 2.
171-;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2.
172-;;
173-;; Return in target register operand 0 a value of 1 if (lo_1 <= vv and
174-;; vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2). Otherwise, set register
175-;; operand 0 to 0.
176-;;
177-;; Though the instructions to which this expansion maps operate on
178-;; 64-bit registers, the current implementation only operates on
179-;; SI-mode operands as the high-order bits provide no information
180-;; that is not already available in the low-order bits. To avoid the
181-;; costs of data widening operations, future enhancements might allow
182-;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
183-(define_expand "cmprb2"
184- [(set (match_dup 3)
185- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
186- (match_operand:SI 2 "gpc_reg_operand" "r")]
187- UNSPEC_CMPRB2))
188- (set (match_operand:SI 0 "gpc_reg_operand" "=r")
189- (if_then_else:SI (lt (match_dup 3)
190- (const_int 0))
191- (const_int -1)
192- (if_then_else (gt (match_dup 3)
193- (const_int 0))
194- (const_int 1)
195- (const_int 0))))]
196- "TARGET_P9_MISC"
197-{
198- operands[3] = gen_reg_rtx (CCmode);
199-})
200-
201-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
202-;; represents a byte whose value is ignored in this context and
203-;; vv, the least significant byte, holds the byte value that is to
204-;; be tested for membership within the ranges specified by operand 2.
205-;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2.
206-;;
207-;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if
208-;; (lo_1 <= vv and vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2).
209-;; Otherwise, set the GT bit to 0. The other 3 bits of the target
210-;; CR register are all set to 0.
211-(define_insn "*cmprb2_internal"
212- [(set (match_operand:CC 0 "cc_reg_operand" "=y")
213- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
214- (match_operand:SI 2 "gpc_reg_operand" "r")]
215- UNSPEC_CMPRB2))]
216- "TARGET_P9_MISC"
217- "cmprb %0,1,%1,%2"
218- [(set_attr "type" "logical")])
219-
220-;; Test byte membership within set of 8 bytes.
221-;;
222-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
223-;; represents a byte whose value is ignored in this context and
224-;; vv, the least significant byte, holds the byte value that is to
225-;; be tested for membership within the set specified by operand 2.
226-;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7.
227-;;
228-;; Return in target register operand 0 a value of 1 if vv equals one
229-;; of the values e0, e1, e2, e3, e4, e5, e6, or e7. Otherwise, set
230-;; register operand 0 to 0. Note that the 8 byte values held within
231-;; operand 2 need not be unique.
232-;;
233-;; Though the instructions to which this expansion maps operate on
234-;; 64-bit registers, the current implementation requires that operands
235-;; 0 and 1 have mode SI as the high-order bits provide no information
236-;; that is not already available in the low-order bits. To avoid the
237-;; costs of data widening operations, future enhancements might allow
238-;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
239-(define_expand "cmpeqb"
240- [(set (match_dup 3)
241- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
242- (match_operand:DI 2 "gpc_reg_operand" "r")]
243- UNSPEC_CMPEQB))
244- (set (match_operand:SI 0 "gpc_reg_operand" "=r")
245- (if_then_else:SI (lt (match_dup 3)
246- (const_int 0))
247- (const_int -1)
248- (if_then_else (gt (match_dup 3)
249- (const_int 0))
250- (const_int 1)
251- (const_int 0))))]
252- "TARGET_P9_MISC && TARGET_64BIT"
253-{
254- operands[3] = gen_reg_rtx (CCmode);
255-})
256-
257-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
258-;; represents a byte whose value is ignored in this context and
259-;; vv, the least significant byte, holds the byte value that is to
260-;; be tested for membership within the set specified by operand 2.
261-;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7.
262-;;
263-;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if vv
264-;; equals one of the values e0, e1, e2, e3, e4, e5, e6, or e7. Otherwise,
265-;; set the GT bit to zero. The other 3 bits of the target CR register
266-;; are all set to 0.
267-(define_insn "*cmpeqb_internal"
268- [(set (match_operand:CC 0 "cc_reg_operand" "=y")
269- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
270- (match_operand:DI 2 "gpc_reg_operand" "r")]
271- UNSPEC_CMPEQB))]
272- "TARGET_P9_MISC && TARGET_64BIT"
273- "cmpeqb %0,%1,%2"
274- [(set_attr "type" "logical")])
275-
276 (define_expand "bcd<bcd_add_sub>_<code>"
277 [(parallel [(set (reg:CCFP CR6_REGNO)
278 (compare:CCFP
279Index: gcc-9.2.0/gcc/config/rs6000/rs6000.md
280===================================================================
281--- gcc-9.2.0.orig/gcc/config/rs6000/rs6000.md
282+++ gcc-9.2.0/gcc/config/rs6000/rs6000.md
283@@ -137,6 +137,12 @@
284 UNSPEC_LSQ
285 UNSPEC_FUSION_GPR
286 UNSPEC_STACK_CHECK
287+ UNSPEC_DARN
288+ UNSPEC_DARN_32
289+ UNSPEC_DARN_RAW
290+ UNSPEC_CMPRB
291+ UNSPEC_CMPRB2
292+ UNSPEC_CMPEQB
293 UNSPEC_ADD_ROUND_TO_ODD
294 UNSPEC_SUB_ROUND_TO_ODD
295 UNSPEC_MUL_ROUND_TO_ODD
296@@ -14322,7 +14328,225 @@
297 "xscmpuqp %0,%1,%2"
298 [(set_attr "type" "veccmp")
299 (set_attr "size" "128")])
300+
301+;; Miscellaneous ISA 3.0 (power9) instructions
302+
303+(define_insn "darn_32"
304+ [(set (match_operand:SI 0 "register_operand" "=r")
305+ (unspec:SI [(const_int 0)] UNSPEC_DARN_32))]
306+ "TARGET_P9_MISC"
307+ "darn %0,0"
308+ [(set_attr "type" "integer")])
309+
310+(define_insn "darn_raw"
311+ [(set (match_operand:DI 0 "register_operand" "=r")
312+ (unspec:DI [(const_int 0)] UNSPEC_DARN_RAW))]
313+ "TARGET_P9_MISC && TARGET_64BIT"
314+ "darn %0,2"
315+ [(set_attr "type" "integer")])
316+
317+(define_insn "darn"
318+ [(set (match_operand:DI 0 "register_operand" "=r")
319+ (unspec:DI [(const_int 0)] UNSPEC_DARN))]
320+ "TARGET_P9_MISC && TARGET_64BIT"
321+ "darn %0,1"
322+ [(set_attr "type" "integer")])
323+
324+;; Test byte within range.
325+;;
326+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
327+;; represents a byte whose value is ignored in this context and
328+;; vv, the least significant byte, holds the byte value that is to
329+;; be tested for membership within the range specified by operand 2.
330+;; The bytes of operand 2 are organized as xx:xx:hi:lo.
331+;;
332+;; Return in target register operand 0 a value of 1 if lo <= vv and
333+;; vv <= hi. Otherwise, set register operand 0 to 0.
334+;;
335+;; Though the instructions to which this expansion maps operate on
336+;; 64-bit registers, the current implementation only operates on
337+;; SI-mode operands as the high-order bits provide no information
338+;; that is not already available in the low-order bits. To avoid the
339+;; costs of data widening operations, future enhancements might allow
340+;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
341+(define_expand "cmprb"
342+ [(set (match_dup 3)
343+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
344+ (match_operand:SI 2 "gpc_reg_operand" "r")]
345+ UNSPEC_CMPRB))
346+ (set (match_operand:SI 0 "gpc_reg_operand" "=r")
347+ (if_then_else:SI (lt (match_dup 3)
348+ (const_int 0))
349+ (const_int -1)
350+ (if_then_else (gt (match_dup 3)
351+ (const_int 0))
352+ (const_int 1)
353+ (const_int 0))))]
354+ "TARGET_P9_MISC"
355+{
356+ operands[3] = gen_reg_rtx (CCmode);
357+})
358+
359+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
360+;; represents a byte whose value is ignored in this context and
361+;; vv, the least significant byte, holds the byte value that is to
362+;; be tested for membership within the range specified by operand 2.
363+;; The bytes of operand 2 are organized as xx:xx:hi:lo.
364+;;
365+;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if
366+;; lo <= vv and vv <= hi. Otherwise, set the GT bit to 0. The other
367+;; 3 bits of the target CR register are all set to 0.
368+(define_insn "*cmprb_internal"
369+ [(set (match_operand:CC 0 "cc_reg_operand" "=y")
370+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
371+ (match_operand:SI 2 "gpc_reg_operand" "r")]
372+ UNSPEC_CMPRB))]
373+ "TARGET_P9_MISC"
374+ "cmprb %0,0,%1,%2"
375+ [(set_attr "type" "logical")])
376+
377+;; Set operand 0 register to -1 if the LT bit (0x8) of condition
378+;; register operand 1 is on. Otherwise, set operand 0 register to 1
379+;; if the GT bit (0x4) of condition register operand 1 is on.
380+;; Otherwise, set operand 0 to 0. Note that the result stored into
381+;; register operand 0 is non-zero iff either the LT or GT bits are on
382+;; within condition register operand 1.
383+(define_insn "setb_signed"
384+ [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
385+ (if_then_else:SI (lt (match_operand:CC 1 "cc_reg_operand" "y")
386+ (const_int 0))
387+ (const_int -1)
388+ (if_then_else (gt (match_dup 1)
389+ (const_int 0))
390+ (const_int 1)
391+ (const_int 0))))]
392+ "TARGET_P9_MISC"
393+ "setb %0,%1"
394+ [(set_attr "type" "logical")])
395
396+(define_insn "setb_unsigned"
397+ [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
398+ (if_then_else:SI (ltu (match_operand:CCUNS 1 "cc_reg_operand" "y")
399+ (const_int 0))
400+ (const_int -1)
401+ (if_then_else (gtu (match_dup 1)
402+ (const_int 0))
403+ (const_int 1)
404+ (const_int 0))))]
405+ "TARGET_P9_MISC"
406+ "setb %0,%1"
407+ [(set_attr "type" "logical")])
408+
409+;; Test byte within two ranges.
410+;;
411+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
412+;; represents a byte whose value is ignored in this context and
413+;; vv, the least significant byte, holds the byte value that is to
414+;; be tested for membership within the range specified by operand 2.
415+;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2.
416+;;
417+;; Return in target register operand 0 a value of 1 if (lo_1 <= vv and
418+;; vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2). Otherwise, set register
419+;; operand 0 to 0.
420+;;
421+;; Though the instructions to which this expansion maps operate on
422+;; 64-bit registers, the current implementation only operates on
423+;; SI-mode operands as the high-order bits provide no information
424+;; that is not already available in the low-order bits. To avoid the
425+;; costs of data widening operations, future enhancements might allow
426+;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
427+(define_expand "cmprb2"
428+ [(set (match_dup 3)
429+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
430+ (match_operand:SI 2 "gpc_reg_operand" "r")]
431+ UNSPEC_CMPRB2))
432+ (set (match_operand:SI 0 "gpc_reg_operand" "=r")
433+ (if_then_else:SI (lt (match_dup 3)
434+ (const_int 0))
435+ (const_int -1)
436+ (if_then_else (gt (match_dup 3)
437+ (const_int 0))
438+ (const_int 1)
439+ (const_int 0))))]
440+ "TARGET_P9_MISC"
441+{
442+ operands[3] = gen_reg_rtx (CCmode);
443+})
444+
445+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
446+;; represents a byte whose value is ignored in this context and
447+;; vv, the least significant byte, holds the byte value that is to
448+;; be tested for membership within the ranges specified by operand 2.
449+;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2.
450+;;
451+;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if
452+;; (lo_1 <= vv and vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2).
453+;; Otherwise, set the GT bit to 0. The other 3 bits of the target
454+;; CR register are all set to 0.
455+(define_insn "*cmprb2_internal"
456+ [(set (match_operand:CC 0 "cc_reg_operand" "=y")
457+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
458+ (match_operand:SI 2 "gpc_reg_operand" "r")]
459+ UNSPEC_CMPRB2))]
460+ "TARGET_P9_MISC"
461+ "cmprb %0,1,%1,%2"
462+ [(set_attr "type" "logical")])
463+
464+;; Test byte membership within set of 8 bytes.
465+;;
466+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
467+;; represents a byte whose value is ignored in this context and
468+;; vv, the least significant byte, holds the byte value that is to
469+;; be tested for membership within the set specified by operand 2.
470+;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7.
471+;;
472+;; Return in target register operand 0 a value of 1 if vv equals one
473+;; of the values e0, e1, e2, e3, e4, e5, e6, or e7. Otherwise, set
474+;; register operand 0 to 0. Note that the 8 byte values held within
475+;; operand 2 need not be unique.
476+;;
477+;; Though the instructions to which this expansion maps operate on
478+;; 64-bit registers, the current implementation requires that operands
479+;; 0 and 1 have mode SI as the high-order bits provide no information
480+;; that is not already available in the low-order bits. To avoid the
481+;; costs of data widening operations, future enhancements might allow
482+;; DI mode for operand 0 and/or might allow operand 1 to be QI mode.
483+(define_expand "cmpeqb"
484+ [(set (match_dup 3)
485+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
486+ (match_operand:DI 2 "gpc_reg_operand" "r")]
487+ UNSPEC_CMPEQB))
488+ (set (match_operand:SI 0 "gpc_reg_operand" "=r")
489+ (if_then_else:SI (lt (match_dup 3)
490+ (const_int 0))
491+ (const_int -1)
492+ (if_then_else (gt (match_dup 3)
493+ (const_int 0))
494+ (const_int 1)
495+ (const_int 0))))]
496+ "TARGET_P9_MISC && TARGET_64BIT"
497+{
498+ operands[3] = gen_reg_rtx (CCmode);
499+})
500+
501+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
502+;; represents a byte whose value is ignored in this context and
503+;; vv, the least significant byte, holds the byte value that is to
504+;; be tested for membership within the set specified by operand 2.
505+;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7.
506+;;
507+;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if vv
508+;; equals one of the values e0, e1, e2, e3, e4, e5, e6, or e7. Otherwise,
509+;; set the GT bit to zero. The other 3 bits of the target CR register
510+;; are all set to 0.
511+(define_insn "*cmpeqb_internal"
512+ [(set (match_operand:CC 0 "cc_reg_operand" "=y")
513+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r")
514+ (match_operand:DI 2 "gpc_reg_operand" "r")]
515+ UNSPEC_CMPEQB))]
516+ "TARGET_P9_MISC && TARGET_64BIT"
517+ "cmpeqb %0,%1,%2"
518+ [(set_attr "type" "logical")])
519
520
521 (include "sync.md")
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_2.patch b/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_2.patch
deleted file mode 100644
index de7a83c23f..0000000000
--- a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_2.patch
+++ /dev/null
@@ -1,77 +0,0 @@
1From 87bc784a7ca3a43182f7272241597a50d7491342 Mon Sep 17 00:00:00 2001
2From: segher <segher@138bc75d-0d04-0410-961f-82ee72b054a4>
3Date: Fri, 30 Aug 2019 13:51:26 +0000
4Subject: [PATCH] Backport from trunk 2019-08-22 Segher Boessenkool
5 <segher@kernel.crashing.org>
6
7 PR target/91481
8 * config/rs6000/rs6000.md (unspec): Delete UNSPEC_DARN, UNSPEC_DARN_32,
9 and UNSPEC_DARN_RAW.
10 (unspecv): New enumerator values UNSPECV_DARN, UNSPECV_DARN_32, and
11 UNSPECV_DARN_RAW.
12 (darn_32): Use an unspec_volatile, and UNSPECV_DARN_32.
13 (darn_raw): Use an unspec_volatile, and UNSPECV_DARN_RAW.
14 (darn): Use an unspec_volatile, and UNSPECV_DARN.
15
16
17git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@275175 138bc75d-0d04-0410-961f-82ee72b054a4
18
19Upstream-Status: Backport
20CVE: CVE-2019-15847 p2
21Affects <= 9.2.0
22Dropped Changelog changes
23Signed-off-by: Armin Kuster <akuster@mvista.com>
24
25---
26 gcc/config/rs6000/rs6000.md | 12 ++++++------
27 2 files changed, 20 insertions(+), 6 deletions(-)
28
29Index: gcc-9.2.0/gcc/config/rs6000/rs6000.md
30===================================================================
31--- gcc-9.2.0.orig/gcc/config/rs6000/rs6000.md
32+++ gcc-9.2.0/gcc/config/rs6000/rs6000.md
33@@ -137,9 +137,6 @@
34 UNSPEC_LSQ
35 UNSPEC_FUSION_GPR
36 UNSPEC_STACK_CHECK
37- UNSPEC_DARN
38- UNSPEC_DARN_32
39- UNSPEC_DARN_RAW
40 UNSPEC_CMPRB
41 UNSPEC_CMPRB2
42 UNSPEC_CMPEQB
43@@ -170,6 +167,9 @@
44 UNSPECV_EH_RR ; eh_reg_restore
45 UNSPECV_ISYNC ; isync instruction
46 UNSPECV_MFTB ; move from time base
47+ UNSPECV_DARN ; darn 1 (deliver a random number)
48+ UNSPECV_DARN_32 ; darn 2
49+ UNSPECV_DARN_RAW ; darn 0
50 UNSPECV_NLGR ; non-local goto receiver
51 UNSPECV_MFFS ; Move from FPSCR
52 UNSPECV_MFFSL ; Move from FPSCR light instruction version
53@@ -14333,21 +14333,21 @@
54
55 (define_insn "darn_32"
56 [(set (match_operand:SI 0 "register_operand" "=r")
57- (unspec:SI [(const_int 0)] UNSPEC_DARN_32))]
58+ (unspec_volatile:SI [(const_int 0)] UNSPECV_DARN_32))]
59 "TARGET_P9_MISC"
60 "darn %0,0"
61 [(set_attr "type" "integer")])
62
63 (define_insn "darn_raw"
64 [(set (match_operand:DI 0 "register_operand" "=r")
65- (unspec:DI [(const_int 0)] UNSPEC_DARN_RAW))]
66+ (unspec_volatile:DI [(const_int 0)] UNSPECV_DARN_RAW))]
67 "TARGET_P9_MISC && TARGET_64BIT"
68 "darn %0,2"
69 [(set_attr "type" "integer")])
70
71 (define_insn "darn"
72 [(set (match_operand:DI 0 "register_operand" "=r")
73- (unspec:DI [(const_int 0)] UNSPEC_DARN))]
74+ (unspec_volatile:DI [(const_int 0)] UNSPECV_DARN))]
75 "TARGET_P9_MISC && TARGET_64BIT"
76 "darn %0,1"
77 [(set_attr "type" "integer")])
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_3.patch b/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_3.patch
deleted file mode 100644
index ba7130ca7d..0000000000
--- a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_3.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From dc4c8dd9dbe70740ec7a684b0f35620249fb036a Mon Sep 17 00:00:00 2001
2From: segher <segher@138bc75d-0d04-0410-961f-82ee72b054a4>
3Date: Fri, 30 Aug 2019 13:53:11 +0000
4Subject: [PATCH] Backport from trunk 2019-08-23 Segher Boessenkool
5 <segher@kernel.crashing.org>
6
7gcc/testsuite/
8 PR target/91481
9 * gcc.target/powerpc/darn-3.c: New testcase.
10
11
12git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@275176 138bc75d-0d04-0410-961f-82ee72b054a4
13
14Upstream-Status: Backport
15CVE: CVE-2019-15847 p3
16Affects <= 9.2.0
17Dropped Changelog changes
18Signed-off-by: Armin Kuster <akuster@mvista.com>
19
20---
21 gcc/testsuite/ChangeLog | 6 ++++++
22 gcc/testsuite/gcc.target/powerpc/darn-3.c | 16 ++++++++++++++++
23 2 files changed, 22 insertions(+)
24 create mode 100644 gcc/testsuite/gcc.target/powerpc/darn-3.c
25
26Index: gcc-9.2.0/gcc/testsuite/gcc.target/powerpc/darn-3.c
27===================================================================
28--- /dev/null
29+++ gcc-9.2.0/gcc/testsuite/gcc.target/powerpc/darn-3.c
30@@ -0,0 +1,16 @@
31+/* { dg-do compile { target { powerpc*-*-* } } } */
32+/* { dg-skip-if "" { powerpc*-*-aix* } } */
33+/* { dg-options "-O2 -mdejagnu-cpu=power9" } */
34+
35+static int darn32(void) { return __builtin_darn_32(); }
36+
37+int four(void)
38+{
39+ int sum = 0;
40+ int i;
41+ for (i = 0; i < 4; i++)
42+ sum += darn32();
43+ return sum;
44+}
45+
46+/* { dg-final { scan-assembler-times {(?n)\mdarn .*,0\M} 4 } } */
47Index: gcc-9.2.0/gcc/testsuite/ChangeLog
48===================================================================
49--- gcc-9.2.0.orig/gcc/testsuite/ChangeLog
50+++ gcc-9.2.0/gcc/testsuite/ChangeLog
51@@ -1,3 +1,11 @@
52+2019-08-30 Segher Boessenkool <segher@kernel.crashing.org>
53+
54+ Backport from trunk
55+ 2019-08-23 Segher Boessenkool <segher@kernel.crashing.org>
56+
57+ PR target/91481
58+ * gcc.target/powerpc/darn-3.c: New testcase.
59+
60 2019-08-12 Release Manager
61
62 * GCC 9.2.0 released.
diff --git a/meta/recipes-devtools/gcc/gcc-9.2.inc b/meta/recipes-devtools/gcc/gcc-9.3.inc
index 2368f35867..b0411078d3 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2.inc
+++ b/meta/recipes-devtools/gcc/gcc-9.3.inc
@@ -2,13 +2,13 @@ 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 = "9.2.0" 5PV = "9.3.0"
6 6
7# BINV should be incremented to a revision after a minor gcc release 7# BINV should be incremented to a revision after a minor gcc release
8 8
9BINV = "9.2.0" 9BINV = "9.3.0"
10 10
11FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-9.2:${FILE_DIRNAME}/gcc-9.2/backport:" 11FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-9.3:${FILE_DIRNAME}/gcc-9.3/backport:"
12 12
13DEPENDS =+ "mpfr gmp libmpc zlib flex-native" 13DEPENDS =+ "mpfr gmp libmpc zlib flex-native"
14NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native flex-native" 14NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native flex-native"
@@ -57,25 +57,19 @@ SRC_URI = "\
57 file://0027-Fix-various-_FOR_BUILD-and-related-variables.patch \ 57 file://0027-Fix-various-_FOR_BUILD-and-related-variables.patch \
58 file://0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch \ 58 file://0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch \
59 file://0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch \ 59 file://0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch \
60 file://0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch \ 60 file://0030-ldbl128-config.patch \
61 file://0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \ 61 file://0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \
62 file://0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \ 62 file://0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \
63 file://0033-sync-gcc-stddef.h-with-musl.patch \ 63 file://0033-sync-gcc-stddef.h-with-musl.patch \
64 file://0034-fix-segmentation-fault-in-precompiled-header-generat.patch \ 64 file://0034-fix-segmentation-fault-in-precompiled-header-generat.patch \
65 file://0035-Fix-for-testsuite-failure.patch \ 65 file://0035-Fix-for-testsuite-failure.patch \
66 file://0036-Re-introduce-spe-commandline-options.patch \ 66 file://0036-Re-introduce-spe-commandline-options.patch \
67 file://0037-Fix-up-libsanitizer-build-with-master-glibc.patch \ 67 file://0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch \
68 file://CVE-2019-14250.patch \ 68 file://0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \
69 file://CVE-2019-15847_1.patch \ 69 file://0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch \
70 file://CVE-2019-15847_2.patch \
71 file://CVE-2019-15847_3.patch \
72 file://re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch \
73 file://gen-no-line-numbers.patch \
74" 70"
75S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" 71S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
76SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78" 72SRC_URI[sha256sum] = "71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1"
77SRC_URI[sha256sum] = "ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206"
78
79# For dev release snapshotting 73# For dev release snapshotting
80#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/official-gcc-${RELEASE}" 74#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/official-gcc-${RELEASE}"
81#B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" 75#B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-9.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
index 9065c304b5..0d9222df17 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
@@ -1,7 +1,7 @@
1From 863325ec3c6eb4987be63509ac407b2d13617342 Mon Sep 17 00:00:00 2001 1From 02b1789dbbb184726782b5038a4dd96515ec790c 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/36] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET 4Subject: [PATCH 01/39] 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
@@ -38,5 +38,5 @@ index 9db4fd14aa2..aad93c4d183 100644
38 *" newlib "*) 38 *" newlib "*)
39 case " $target_configargs " in 39 case " $target_configargs " in
40-- 40--
412.22.1 412.25.1
42 42
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0002-gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc-9.3/0002-gcc-poison-system-directories.patch
index a1116e7509..f427ee67c1 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0002-gcc-poison-system-directories.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0002-gcc-poison-system-directories.patch
@@ -1,7 +1,7 @@
1From 68e78bc15de215fa15c7d8b56bd2e2b0539b34fa Mon Sep 17 00:00:00 2001 1From 5368cd0293ce50a69ced6e4b25ba6c8d8e014256 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 02/36] gcc: poison-system-directories 4Subject: [PATCH 02/39] gcc: poison-system-directories
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
@@ -58,10 +58,10 @@ index a718ceaf3da..5713342efb1 100644
58 optimizer and back end) to be checked for dynamic type safety at runtime. 58 optimizer and back end) to be checked for dynamic type safety at runtime.
59 This is quite expensive. */ 59 This is quite expensive. */
60diff --git a/gcc/configure b/gcc/configure 60diff --git a/gcc/configure b/gcc/configure
61index 481071b4265..a6ea3a8a84c 100755 61index a065ba23728..2e26dd33310 100755
62--- a/gcc/configure 62--- a/gcc/configure
63+++ b/gcc/configure 63+++ b/gcc/configure
64@@ -995,6 +995,7 @@ with_system_zlib 64@@ -996,6 +996,7 @@ with_system_zlib
65 enable_maintainer_mode 65 enable_maintainer_mode
66 enable_link_mutex 66 enable_link_mutex
67 enable_version_specific_runtime_libs 67 enable_version_specific_runtime_libs
@@ -69,7 +69,7 @@ index 481071b4265..a6ea3a8a84c 100755
69 enable_plugin 69 enable_plugin
70 enable_host_shared 70 enable_host_shared
71 enable_libquadmath_support 71 enable_libquadmath_support
72@@ -1748,6 +1749,8 @@ Optional Features: 72@@ -1749,6 +1750,8 @@ Optional Features:
73 --enable-version-specific-runtime-libs 73 --enable-version-specific-runtime-libs
74 specify that runtime libraries should be installed 74 specify that runtime libraries should be installed
75 in a compiler-specific directory 75 in a compiler-specific directory
@@ -78,7 +78,7 @@ index 481071b4265..a6ea3a8a84c 100755
78 --enable-plugin enable plugin support 78 --enable-plugin enable plugin support
79 --enable-host-shared build host code as shared libraries 79 --enable-host-shared build host code as shared libraries
80 --disable-libquadmath-support 80 --disable-libquadmath-support
81@@ -29750,6 +29753,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : 81@@ -29753,6 +29756,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
82 fi 82 fi
83 83
84 84
@@ -99,10 +99,10 @@ index 481071b4265..a6ea3a8a84c 100755
99 99
100 100
101diff --git a/gcc/configure.ac b/gcc/configure.ac 101diff --git a/gcc/configure.ac b/gcc/configure.ac
102index ce2825580c6..d42bbd4fd1c 100644 102index 3a7251102ef..12d1d04e645 100644
103--- a/gcc/configure.ac 103--- a/gcc/configure.ac
104+++ b/gcc/configure.ac 104+++ b/gcc/configure.ac
105@@ -6378,6 +6378,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs, 105@@ -6380,6 +6380,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
106 [specify that runtime libraries should be 106 [specify that runtime libraries should be
107 installed in a compiler-specific directory])]) 107 installed in a compiler-specific directory])])
108 108
@@ -120,10 +120,10 @@ index ce2825580c6..d42bbd4fd1c 100644
120 AC_SUBST(subdirs) 120 AC_SUBST(subdirs)
121 AC_SUBST(srcdir) 121 AC_SUBST(srcdir)
122diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi 122diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
123index 6ef36ce02aa..09414d8cc05 100644 123index 0ab6c9c6449..c3d3d51a28f 100644
124--- a/gcc/doc/invoke.texi 124--- a/gcc/doc/invoke.texi
125+++ b/gcc/doc/invoke.texi 125+++ b/gcc/doc/invoke.texi
126@@ -332,6 +332,7 @@ Objective-C and Objective-C++ Dialects}. 126@@ -333,6 +333,7 @@ Objective-C and Objective-C++ Dialects}.
127 -Wpacked -Wpacked-bitfield-compat -Wpacked-not-aligned -Wpadded @gol 127 -Wpacked -Wpacked-bitfield-compat -Wpacked-not-aligned -Wpadded @gol
128 -Wparentheses -Wno-pedantic-ms-format @gol 128 -Wparentheses -Wno-pedantic-ms-format @gol
129 -Wplacement-new -Wplacement-new=@var{n} @gol 129 -Wplacement-new -Wplacement-new=@var{n} @gol
@@ -131,7 +131,7 @@ index 6ef36ce02aa..09414d8cc05 100644
131 -Wpointer-arith -Wpointer-compare -Wno-pointer-to-int-cast @gol 131 -Wpointer-arith -Wpointer-compare -Wno-pointer-to-int-cast @gol
132 -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls @gol 132 -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls @gol
133 -Wrestrict -Wno-return-local-addr @gol 133 -Wrestrict -Wno-return-local-addr @gol
134@@ -6289,6 +6290,14 @@ made up of data only and thus requires no special treatment. But, for 134@@ -6290,6 +6291,14 @@ made up of data only and thus requires no special treatment. But, for
135 most targets, it is made up of code and thus requires the stack to be 135 most targets, it is made up of code and thus requires the stack to be
136 made executable in order for the program to work properly. 136 made executable in order for the program to work properly.
137 137
@@ -199,5 +199,5 @@ index bcbe2082905..5752298bbf2 100644
199 199
200 /* Use given -I paths for #include "..." but not #include <...>, and 200 /* Use given -I paths for #include "..." but not #include <...>, and
201-- 201--
2022.22.1 2022.25.1
203 203
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-9.3/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
index 23039d2123..23ec5bce03 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
@@ -1,7 +1,7 @@
1From f8d60c4114acb92361c7b2f4a4561d4661e8da9d Mon Sep 17 00:00:00 2001 1From df90dbdba7a85c20bad95de71525f0f400a849d2 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 03/36] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET 4Subject: [PATCH 03/39] 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
@@ -69,5 +69,5 @@ index b121088d778..93aae5bb26f 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.22.1 722.25.1
73 73
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0004-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc-9.3/0004-64-bit-multilib-hack.patch
index a79c40c1aa..17ec8986c1 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0004-64-bit-multilib-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0004-64-bit-multilib-hack.patch
@@ -1,7 +1,7 @@
1From c2081c51db589471ea713870c72f13999abda815 Mon Sep 17 00:00:00 2001 1From 2e00d0a9a809153f693659e977c1e0550665e65c 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 04/36] 64-bit multilib hack. 4Subject: [PATCH 04/39] 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
@@ -115,5 +115,5 @@ index f3c6e2be1d9..bd0393155fa 100644
115 rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c 115 rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
116 $(COMPILE) $< 116 $(COMPILE) $<
117-- 117--
1182.22.1 1182.25.1
119 119
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0005-optional-libstdc.patch b/meta/recipes-devtools/gcc/gcc-9.3/0005-optional-libstdc.patch
index f4fac91467..3c28aeac63 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0005-optional-libstdc.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0005-optional-libstdc.patch
@@ -1,7 +1,7 @@
1From e7e504f4a90cfa395e7f8ee779f8c3ed687802ca Mon Sep 17 00:00:00 2001 1From 435e45592e944018f33bff32f1202b0872a23141 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 05/36] optional libstdc 4Subject: [PATCH 05/39] 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++
@@ -52,7 +52,7 @@ index 6c4574a837d..0e2657f00ee 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 09414d8cc05..a43969bc9f0 100644 55index c3d3d51a28f..2f7ffe456c3 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@@ -228,6 +228,9 @@ in the following sections. 58@@ -228,6 +228,9 @@ in the following sections.
@@ -65,7 +65,7 @@ index 09414d8cc05..a43969bc9f0 100644
65 -fext-numeric-literals @gol 65 -fext-numeric-literals @gol
66 -Wabi=@var{n} -Wabi-tag -Wconversion-null -Wctor-dtor-privacy @gol 66 -Wabi=@var{n} -Wabi-tag -Wconversion-null -Wctor-dtor-privacy @gol
67 -Wdelete-non-virtual-dtor -Wdeprecated-copy -Wdeprecated-copy-dtor @gol 67 -Wdelete-non-virtual-dtor -Wdeprecated-copy -Wdeprecated-copy-dtor @gol
68@@ -538,7 +541,7 @@ Objective-C and Objective-C++ Dialects}. 68@@ -539,7 +542,7 @@ Objective-C and Objective-C++ Dialects}.
69 -pie -pthread -r -rdynamic @gol 69 -pie -pthread -r -rdynamic @gol
70 -s -static -static-pie -static-libgcc -static-libstdc++ @gol 70 -s -static -static-pie -static-libgcc -static-libstdc++ @gol
71 -static-libasan -static-libtsan -static-liblsan -static-libubsan @gol 71 -static-libasan -static-libtsan -static-liblsan -static-libubsan @gol
@@ -74,7 +74,7 @@ index 09414d8cc05..a43969bc9f0 100644
74 -T @var{script} -Wl,@var{option} -Xlinker @var{option} @gol 74 -T @var{script} -Wl,@var{option} -Xlinker @var{option} @gol
75 -u @var{symbol} -z @var{keyword}} 75 -u @var{symbol} -z @var{keyword}}
76 76
77@@ -13312,6 +13315,33 @@ Specify that the program entry point is @var{entry}. The argument is 77@@ -13321,6 +13324,33 @@ Specify that the program entry point is @var{entry}. The argument is
78 interpreted by the linker; the GNU linker accepts either a symbol name 78 interpreted by the linker; the GNU linker accepts either a symbol name
79 or an address. 79 or an address.
80 80
@@ -121,5 +121,5 @@ index a2601a6bb06..cd6c6fc95db 100644
121 #endif 121 #endif
122 122
123-- 123--
1242.22.1 1242.25.1
125 125
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0006-COLLECT_GCC_OPTIONS.patch b/meta/recipes-devtools/gcc/gcc-9.3/0006-COLLECT_GCC_OPTIONS.patch
index 9f7e603f8c..906f3a7317 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0006-COLLECT_GCC_OPTIONS.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0006-COLLECT_GCC_OPTIONS.patch
@@ -1,7 +1,7 @@
1From b9260cd3ac26b0302824ed466a548464c864d95f Mon Sep 17 00:00:00 2001 1From c99684477ec66f290ec74efe732acd3c24db7dcc 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 06/36] COLLECT_GCC_OPTIONS 4Subject: [PATCH 06/39] 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 cd6c6fc95db..7da9c5d457b 100644
34 { 34 {
35 const char *const *args; 35 const char *const *args;
36-- 36--
372.22.1 372.25.1
38 38
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/meta/recipes-devtools/gcc/gcc-9.3/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
index 28f8fc2674..68a876cb95 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
@@ -1,7 +1,7 @@
1From 88e728dad53d48c4a19f15e19f66fd23f4820b4a Mon Sep 17 00:00:00 2001 1From d6f4edaab0ad0e742fb1e3a6f76908a2ac9927d5 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 07/36] Use the defaults.h in ${B} instead of ${S}, and t-oe in 4Subject: [PATCH 07/39] 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 5f43d9de00e..41f0f592ff4 100644 30index abae872cd63..fef6c4c61e3 100644
31--- a/gcc/Makefile.in 31--- a/gcc/Makefile.in
32+++ b/gcc/Makefile.in 32+++ b/gcc/Makefile.in
33@@ -540,7 +540,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ 33@@ -540,7 +540,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
@@ -40,10 +40,10 @@ index 5f43d9de00e..41f0f592ff4 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 a6ea3a8a84c..e3bcf8abe9a 100755 43index 2e26dd33310..ed7931daed3 100755
44--- a/gcc/configure 44--- a/gcc/configure
45+++ b/gcc/configure 45+++ b/gcc/configure
46@@ -12341,8 +12341,8 @@ for f in $tm_file; do 46@@ -12342,8 +12342,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 a6ea3a8a84c..e3bcf8abe9a 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 d42bbd4fd1c..2ebc377a74d 100644 58index 12d1d04e645..e0500e30d50 100644
59--- a/gcc/configure.ac 59--- a/gcc/configure.ac
60+++ b/gcc/configure.ac 60+++ b/gcc/configure.ac
61@@ -1968,8 +1968,8 @@ for f in $tm_file; do 61@@ -1968,8 +1968,8 @@ for f in $tm_file; do
@@ -92,5 +92,5 @@ index 308b87d0cc1..19068cbc24a 100644
92 92
93 # Add multiple inclusion protection guard, part two. 93 # Add multiple inclusion protection guard, part two.
94-- 94--
952.22.1 952.25.1
96 96
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0008-fortran-cross-compile-hack.patch b/meta/recipes-devtools/gcc/gcc-9.3/0008-fortran-cross-compile-hack.patch
index 24e3abe0bb..6acd2b0cf9 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0008-fortran-cross-compile-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0008-fortran-cross-compile-hack.patch
@@ -1,7 +1,7 @@
1From 010f09f2963ede24e85134e5fab2fa627a9afa05 Mon Sep 17 00:00:00 2001 1From 2c514ada36ffbf70177909f633e9f68811de61e0 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 08/36] fortran cross-compile hack. 4Subject: [PATCH 08/39] 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
@@ -42,5 +42,5 @@ index 7cfce28ab69..6cd515ee1a4 100644
42 42
43 # extra LD Flags which are required for targets 43 # extra LD Flags which are required for targets
44-- 44--
452.22.1 452.25.1
46 46
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0009-cpp-honor-sysroot.patch b/meta/recipes-devtools/gcc/gcc-9.3/0009-cpp-honor-sysroot.patch
index 6af0a0124a..5a9e527606 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0009-cpp-honor-sysroot.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0009-cpp-honor-sysroot.patch
@@ -1,7 +1,7 @@
1From 45e9cd39d9c62454d46b9e9473a0c1034ceca15d Mon Sep 17 00:00:00 2001 1From 0a7c03a9cf925ba09a510a32e684f01ec5a50650 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 09/36] cpp: honor sysroot. 4Subject: [PATCH 09/39] 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 7da9c5d457b..4e7c45b268c 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.22.1 532.25.1
54 54
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0010-MIPS64-Default-to-N64-ABI.patch b/meta/recipes-devtools/gcc/gcc-9.3/0010-MIPS64-Default-to-N64-ABI.patch
index bc0c6d5bed..a8103b951e 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0010-MIPS64-Default-to-N64-ABI.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0010-MIPS64-Default-to-N64-ABI.patch
@@ -1,7 +1,7 @@
1From 1ff4108d707b34e399e9dc418ad1ecc42f72676d Mon Sep 17 00:00:00 2001 1From 374aab6a88200fbd7343467d97f7ee6455bbce61 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 10/36] MIPS64: Default to N64 ABI 4Subject: [PATCH 10/39] 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,7 +14,7 @@ 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 ddd3b8f4d9d..fdfc0bd3e82 100644 17index b2282ecdf0b..69c0e4a005b 100644
18--- a/gcc/config.gcc 18--- a/gcc/config.gcc
19+++ b/gcc/config.gcc 19+++ b/gcc/config.gcc
20@@ -2282,29 +2282,29 @@ mips*-*-linux*) # Linux MIPS, either endian. 20@@ -2282,29 +2282,29 @@ mips*-*-linux*) # Linux MIPS, either endian.
@@ -53,5 +53,5 @@ index ddd3b8f4d9d..fdfc0bd3e82 100644
53 ;; 53 ;;
54 esac 54 esac
55-- 55--
562.22.1 562.25.1
57 57
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc-9.3/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
index 66fb24d4cd..d9d563d0f7 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
@@ -1,7 +1,7 @@
1From 72fc3975bcd720b2f8040fa87cd23d3db4c5975a Mon Sep 17 00:00:00 2001 1From dcd7891d6aea5327969132fea6ca4c199f14e985 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] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER 4Subject: [PATCH 11/39] 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
@@ -241,3 +241,6 @@ index 789d1df4bd5..b920c680fb1 100644
241 241
242 #ifdef SPARC_BI_ARCH 242 #ifdef SPARC_BI_ARCH
243 243
244--
2452.25.1
246
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0012-gcc-Fix-argument-list-too-long-error.patch b/meta/recipes-devtools/gcc/gcc-9.3/0012-gcc-Fix-argument-list-too-long-error.patch
index 60539795c5..9d98878096 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0012-gcc-Fix-argument-list-too-long-error.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0012-gcc-Fix-argument-list-too-long-error.patch
@@ -1,7 +1,7 @@
1From 2cb227cd8069c73242286f64183fb203f8d2618a Mon Sep 17 00:00:00 2001 1From faa0f712a67005ef0260f95eebe7c7c57a6f8360 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 12/36] gcc: Fix argument list too long error. 4Subject: [PATCH 12/39] 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 41f0f592ff4..0064a282488 100644 26index fef6c4c61e3..57cf7804f0a 100644
27--- a/gcc/Makefile.in 27--- a/gcc/Makefile.in
28+++ b/gcc/Makefile.in 28+++ b/gcc/Makefile.in
29@@ -3537,7 +3537,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype 29@@ -3538,7 +3538,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 41f0f592ff4..0064a282488 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.22.1 392.25.1
40 40
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0013-Disable-sdt.patch b/meta/recipes-devtools/gcc/gcc-9.3/0013-Disable-sdt.patch
index a21a63c617..455858354f 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0013-Disable-sdt.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0013-Disable-sdt.patch
@@ -1,7 +1,7 @@
1From aea5ffa9d704f4eb8fa93366884d3c26a1dbec49 Mon Sep 17 00:00:00 2001 1From 4df5a747265983092afd6fbc5329dd808cc1da3c 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 13/36] Disable sdt. 4Subject: [PATCH 13/39] 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 e3bcf8abe9a..1f1d22ca666 100755 28index ed7931daed3..52f52b0ec86 100755
29--- a/gcc/configure 29--- a/gcc/configure
30+++ b/gcc/configure 30+++ b/gcc/configure
31@@ -29332,12 +29332,12 @@ fi 31@@ -29333,12 +29333,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,7 +48,7 @@ index e3bcf8abe9a..1f1d22ca666 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 2ebc377a74d..ddc85197588 100644 51index e0500e30d50..242ad28ec83 100644
52--- a/gcc/configure.ac 52--- a/gcc/configure.ac
53+++ b/gcc/configure.ac 53+++ b/gcc/configure.ac
54@@ -5995,15 +5995,15 @@ fi 54@@ -5995,15 +5995,15 @@ fi
@@ -77,10 +77,10 @@ index 2ebc377a74d..ddc85197588 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 5acf79cba54..191bc6c5796 100755 80index 1225edc596b..3b89b880fc8 100755
81--- a/libstdc++-v3/configure 81--- a/libstdc++-v3/configure
82+++ b/libstdc++-v3/configure 82+++ b/libstdc++-v3/configure
83@@ -22085,11 +22085,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 83@@ -22325,11 +22325,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 5acf79cba54..191bc6c5796 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 dadd8827b49..6b1ce9957d3 100644 99index d8455e41574..844cf1acbce 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@@ -230,7 +230,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN 102@@ -232,7 +232,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 dadd8827b49..6b1ce9957d3 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.22.1 1122.25.1
113 113
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0014-libtool.patch b/meta/recipes-devtools/gcc/gcc-9.3/0014-libtool.patch
index 7a8f3afecf..2953859238 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0014-libtool.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0014-libtool.patch
@@ -1,7 +1,7 @@
1From 6c4d0c303ebc3e1c7e554d54a8bb807d77ed41fd Mon Sep 17 00:00:00 2001 1From 34977d994666a90983c96a9240dfa3540562da35 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 14/36] libtool 4Subject: [PATCH 14/39] 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 79f9ba89af5..8e222f7c16b 100644
38 oldlibs= 38 oldlibs=
39 if test -z "$rpath"; then 39 if test -z "$rpath"; then
40-- 40--
412.22.1 412.25.1
42 42
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/meta/recipes-devtools/gcc/gcc-9.3/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
index d06ae27028..d4445244e2 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
@@ -1,7 +1,7 @@
1From c5662ff1e7dea2291b9cb7a83cfff3001dd31f53 Mon Sep 17 00:00:00 2001 1From 4558ba7fa020c111f9a204021a418c0ce55d77f9 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 15/36] gcc: armv4: pass fix-v4bx to linker to support EABI. 4Subject: [PATCH 15/39] 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 e4ade2e2ab0..108863f69d2 100644
39 LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC) 39 LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
40 40
41-- 41--
422.22.1 422.25.1
43 43
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/meta/recipes-devtools/gcc/gcc-9.3/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch
index 310caec4a1..6f0833ccda 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch
@@ -1,7 +1,7 @@
1From e3b693b9d6dc9496f7c98a13b28182d23084215c Mon Sep 17 00:00:00 2001 1From 7effc632d65c2d72bf6fa32a219ec2f82fef9405 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 16/36] Use the multilib config files from ${B} instead of 4Subject: [PATCH 16/39] 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 1f1d22ca666..911de2cf017 100755 21index 52f52b0ec86..a5f208af7cf 100755
22--- a/gcc/configure 22--- a/gcc/configure
23+++ b/gcc/configure 23+++ b/gcc/configure
24@@ -12321,10 +12321,20 @@ done 24@@ -12322,10 +12322,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 1f1d22ca666..911de2cf017 100755
46 done 46 done
47 tmake_file="${tmake_file_}" 47 tmake_file="${tmake_file_}"
48 48
49@@ -12335,6 +12345,10 @@ tm_file_list="options.h" 49@@ -12336,6 +12346,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 1f1d22ca666..911de2cf017 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 ddc85197588..b413ae9bf25 100644 61index 242ad28ec83..b7a7ead1c02 100644
62--- a/gcc/configure.ac 62--- a/gcc/configure.ac
63+++ b/gcc/configure.ac 63+++ b/gcc/configure.ac
64@@ -1948,10 +1948,20 @@ done 64@@ -1948,10 +1948,20 @@ done
@@ -98,5 +98,5 @@ index ddc85197588..b413ae9bf25 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.22.1 1012.25.1
102 102
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/meta/recipes-devtools/gcc/gcc-9.3/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
index ad1d1d4eb0..96da013bf2 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
@@ -1,7 +1,7 @@
1From 09d9ccc1d471020949d1285a5276f17504fd60dd Mon Sep 17 00:00:00 2001 1From a2b2bf77621f344a849e55ab179ece8587d19234 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 17/36] Avoid using libdir from .la which usually points to a 4Subject: [PATCH 17/39] 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 8e222f7c16b..0a93b4e5c3b 100644
27 absdir="$libdir" 27 absdir="$libdir"
28 fi 28 fi
29-- 29--
302.22.1 302.25.1
31 31
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0018-export-CPP.patch b/meta/recipes-devtools/gcc/gcc-9.3/0018-export-CPP.patch
index 0f728ec542..2385099c25 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0018-export-CPP.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0018-export-CPP.patch
@@ -1,7 +1,7 @@
1From 987338cd847a723de533bb317e452a60b1e52165 Mon Sep 17 00:00:00 2001 1From cafb6a621c05c1f238679d52fc026446f38c8af5 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 18/36] export CPP 4Subject: [PATCH 18/39] 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 64e091ba71d..255822e3f27 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.22.1 522.25.1
53 53
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc-9.3/0019-Ensure-target-gcc-headers-can-be-included.patch
index 53f9e99d07..e0129d1f96 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0019-Ensure-target-gcc-headers-can-be-included.patch
@@ -1,7 +1,7 @@
1From d27ba49e2e5c608c43265462d6831363cc7f565b Mon Sep 17 00:00:00 2001 1From 182057b80891edc0e8d46835e2d8bfd28330a55a 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 19/36] Ensure target gcc headers can be included 4Subject: [PATCH 19/39] 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
@@ -18,10 +18,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
18--- 18---
19 gcc/Makefile.in | 2 ++ 19 gcc/Makefile.in | 2 ++
20 gcc/cppdefault.c | 4 ++++ 20 gcc/cppdefault.c | 4 ++++
21 gcc/defaults.h | 9 +++++++++ 21 2 files changed, 6 insertions(+)
22 gcc/gcc.c | 7 -------
23 4 files changed, 15 insertions(+), 7 deletions(-)
24 22
23diff --git a/gcc/Makefile.in b/gcc/Makefile.in
24index 57cf7804f0a..7772342ad5e 100644
25--- a/gcc/Makefile.in 25--- a/gcc/Makefile.in
26+++ b/gcc/Makefile.in 26+++ b/gcc/Makefile.in
27@@ -618,6 +618,7 @@ libexecdir = @libexecdir@ 27@@ -618,6 +618,7 @@ libexecdir = @libexecdir@
@@ -32,7 +32,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
32 # Directory in which the compiler finds executables 32 # Directory in which the compiler finds executables
33 libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) 33 libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
34 # Directory in which all plugin resources are installed 34 # Directory in which all plugin resources are installed
35@@ -2866,6 +2867,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localed 35@@ -2867,6 +2868,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\"
36 36
37 PREPROCESSOR_DEFINES = \ 37 PREPROCESSOR_DEFINES = \
38 -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ 38 -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
@@ -40,9 +40,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
40 -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ 40 -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \
41 -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ 41 -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
42 -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ 42 -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \
43diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c
44index c4796385643..980e2bd47a7 100644
43--- a/gcc/cppdefault.c 45--- a/gcc/cppdefault.c
44+++ b/gcc/cppdefault.c 46+++ b/gcc/cppdefault.c
45@@ -59,6 +59,10 @@ const struct default_include cpp_include 47@@ -59,6 +59,10 @@ const struct default_include cpp_include_defaults[]
46 /* This is the dir for gcc's private headers. */ 48 /* This is the dir for gcc's private headers. */
47 { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, 49 { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 },
48 #endif 50 #endif
@@ -53,3 +55,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
53 #ifdef LOCAL_INCLUDE_DIR 55 #ifdef LOCAL_INCLUDE_DIR
54 /* /usr/local/include comes before the fixincluded header files. */ 56 /* /usr/local/include comes before the fixincluded header files. */
55 { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, 57 { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },
58--
592.25.1
60
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch b/meta/recipes-devtools/gcc/gcc-9.3/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
index b0f96d06d4..1d2182140f 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
@@ -1,7 +1,7 @@
1From 83bcd4cc47ae63971c888c117abd00dfd506532c Mon Sep 17 00:00:00 2001 1From a4740f1290e6a602fbbfa27b863be2e3b2675685 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 20/36] gcc 4.8+ won't build with --disable-dependency-tracking 4Subject: [PATCH 20/39] 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 29324e3e0ac..d5cdb4259ef 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.22.1 532.25.1
54 54
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/meta/recipes-devtools/gcc/gcc-9.3/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch
index f36ca29b9e..e363c7d445 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch
@@ -1,7 +1,7 @@
1From 667cc8d43e8fb4ac09654ee408da482f96b09580 Mon Sep 17 00:00:00 2001 1From f3edad81d80dde5d64bf77e6abafda54db10b824 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 21/36] Don't search host directory during "relink" if 4Subject: [PATCH 21/39] 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 0a93b4e5c3b..6de6ed2f9a0 100644
34 esac 34 esac
35 fi 35 fi
36-- 36--
372.22.1 372.25.1
38 38
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc-9.3/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
index d5b9150023..846c0de5e8 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
@@ -1,7 +1,7 @@
1From 279c4de48e3fd61e2f268787ed3f1d69ed9224f8 Mon Sep 17 00:00:00 2001 1From b8ea2c2c7d33376f5dd651646c7e822000e47749 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 22/36] Use SYSTEMLIBS_DIR replacement instead of hardcoding 4Subject: [PATCH 22/39] Use SYSTEMLIBS_DIR replacement instead of hardcoding
5 base_libdir 5 base_libdir
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
@@ -25,5 +25,5 @@ index 5e8b34ded03..7e628bf661e 100644
25 #undef MUSL_DYNAMIC_LINKER 25 #undef MUSL_DYNAMIC_LINKER
26 #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" 26 #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
27-- 27--
282.22.1 282.25.1
29 29
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0023-aarch64-Add-support-for-musl-ldso.patch b/meta/recipes-devtools/gcc/gcc-9.3/0023-aarch64-Add-support-for-musl-ldso.patch
index f811306c31..102d6fc742 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0023-aarch64-Add-support-for-musl-ldso.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0023-aarch64-Add-support-for-musl-ldso.patch
@@ -1,7 +1,7 @@
1From 1277d12058334087443828dfd57d44e3b1dfcc9a Mon Sep 17 00:00:00 2001 1From 8645b57e7c0dfd93afee5caeaa534c714f449ba1 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:18:39 -0700 3Date: Tue, 28 Apr 2015 23:18:39 -0700
4Subject: [PATCH 23/36] aarch64: Add support for musl ldso 4Subject: [PATCH 23/39] aarch64: Add support for musl ldso
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -24,5 +24,5 @@ index 7e628bf661e..1717cbe5471 100644
24 #undef ASAN_CC1_SPEC 24 #undef ASAN_CC1_SPEC
25 #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" 25 #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
26-- 26--
272.22.1 272.25.1
28 28
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/meta/recipes-devtools/gcc/gcc-9.3/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch
index 298b0962f6..443e0a2ca6 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch
@@ -1,7 +1,7 @@
1From 4a0487ad75accd780dd155aa59086cc4b11cfc47 Mon Sep 17 00:00:00 2001 1From b1666565e4e133ee41f32fa8032165bcb06afe9a 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 24/36] libcc1: fix libcc1's install path and rpath 4Subject: [PATCH 24/39] 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
@@ -50,5 +50,5 @@ index 7104b649026..2103c477468 100644
50 @ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la 50 @ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la
51 shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \ 51 shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \
52-- 52--
532.22.1 532.25.1
54 54
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0025-handle-sysroot-support-for-nativesdk-gcc.patch b/meta/recipes-devtools/gcc/gcc-9.3/0025-handle-sysroot-support-for-nativesdk-gcc.patch
index 2e7a444b58..59ac97eaed 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0025-handle-sysroot-support-for-nativesdk-gcc.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0025-handle-sysroot-support-for-nativesdk-gcc.patch
@@ -1,7 +1,7 @@
1From a183c82ea2af934a8d30055a791dc1d80c9067a9 Mon Sep 17 00:00:00 2001 1From 7d614a84709d7dc4a2529c3d529e2da8541f9fd4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 7 Dec 2015 23:39:54 +0000 3Date: Mon, 7 Dec 2015 23:39:54 +0000
4Subject: [PATCH 25/36] handle sysroot support for nativesdk-gcc 4Subject: [PATCH 25/39] handle sysroot support for nativesdk-gcc
5 5
6Being able to build a nativesdk gcc is useful, particularly in cases 6Being able to build a nativesdk gcc is useful, particularly in cases
7where 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
@@ -40,10 +40,10 @@ Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
40 prefix.c | 4 +-- 40 prefix.c | 4 +--
41 6 files changed, 68 insertions(+), 48 deletions(-) 41 6 files changed, 68 insertions(+), 48 deletions(-)
42 42
43Index: gcc-9.2.0/gcc/cppdefault.c 43Index: gcc-9.3.0/gcc/cppdefault.c
44=================================================================== 44===================================================================
45--- gcc-9.2.0.orig/gcc/cppdefault.c 45--- gcc-9.3.0.orig/gcc/cppdefault.c
46+++ gcc-9.2.0/gcc/cppdefault.c 46+++ gcc-9.3.0/gcc/cppdefault.c
47@@ -35,6 +35,30 @@ 47@@ -35,6 +35,30 @@
48 # undef CROSS_INCLUDE_DIR 48 # undef CROSS_INCLUDE_DIR
49 #endif 49 #endif
@@ -163,10 +163,10 @@ Index: gcc-9.2.0/gcc/cppdefault.c
163 163
164 /* This value is set by cpp_relocated at runtime */ 164 /* This value is set by cpp_relocated at runtime */
165 const char *gcc_exec_prefix; 165 const char *gcc_exec_prefix;
166Index: gcc-9.2.0/gcc/cppdefault.h 166Index: gcc-9.3.0/gcc/cppdefault.h
167=================================================================== 167===================================================================
168--- gcc-9.2.0.orig/gcc/cppdefault.h 168--- gcc-9.3.0.orig/gcc/cppdefault.h
169+++ gcc-9.2.0/gcc/cppdefault.h 169+++ gcc-9.3.0/gcc/cppdefault.h
170@@ -33,7 +33,8 @@ 170@@ -33,7 +33,8 @@
171 171
172 struct default_include 172 struct default_include
@@ -198,10 +198,10 @@ Index: gcc-9.2.0/gcc/cppdefault.h
198 /* The run-time execution prefix. This is typically the lib/gcc 198 /* The run-time execution prefix. This is typically the lib/gcc
199 subdirectory of the actual installation. */ 199 subdirectory of the actual installation. */
200 extern const char *gcc_exec_prefix; 200 extern const char *gcc_exec_prefix;
201Index: gcc-9.2.0/gcc/gcc.c 201Index: gcc-9.3.0/gcc/gcc.c
202=================================================================== 202===================================================================
203--- gcc-9.2.0.orig/gcc/gcc.c 203--- gcc-9.3.0.orig/gcc/gcc.c
204+++ gcc-9.2.0/gcc/gcc.c 204+++ gcc-9.3.0/gcc/gcc.c
205@@ -253,6 +253,8 @@ FILE *report_times_to_file = NULL; 205@@ -253,6 +253,8 @@ FILE *report_times_to_file = NULL;
206 #endif 206 #endif
207 static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT; 207 static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT;
@@ -258,10 +258,10 @@ Index: gcc-9.2.0/gcc/gcc.c
258 case 'S': 258 case 'S':
259 value = do_spec_1 (startfile_spec, 0, NULL); 259 value = do_spec_1 (startfile_spec, 0, NULL);
260 if (value != 0) 260 if (value != 0)
261Index: gcc-9.2.0/gcc/c-family/c-opts.c 261Index: gcc-9.3.0/gcc/c-family/c-opts.c
262=================================================================== 262===================================================================
263--- gcc-9.2.0.orig/gcc/c-family/c-opts.c 263--- gcc-9.3.0.orig/gcc/c-family/c-opts.c
264+++ gcc-9.2.0/gcc/c-family/c-opts.c 264+++ gcc-9.3.0/gcc/c-family/c-opts.c
265@@ -1382,8 +1382,8 @@ add_prefixed_path (const char *suffix, i 265@@ -1382,8 +1382,8 @@ add_prefixed_path (const char *suffix, i
266 size_t prefix_len, suffix_len; 266 size_t prefix_len, suffix_len;
267 267
@@ -273,10 +273,10 @@ Index: gcc-9.2.0/gcc/c-family/c-opts.c
273 273
274 path = (char *) xmalloc (prefix_len + suffix_len + 1); 274 path = (char *) xmalloc (prefix_len + suffix_len + 1);
275 memcpy (path, prefix, prefix_len); 275 memcpy (path, prefix, prefix_len);
276Index: gcc-9.2.0/gcc/incpath.c 276Index: gcc-9.3.0/gcc/incpath.c
277=================================================================== 277===================================================================
278--- gcc-9.2.0.orig/gcc/incpath.c 278--- gcc-9.3.0.orig/gcc/incpath.c
279+++ gcc-9.2.0/gcc/incpath.c 279+++ gcc-9.3.0/gcc/incpath.c
280@@ -131,7 +131,7 @@ add_standard_paths (const char *sysroot, 280@@ -131,7 +131,7 @@ add_standard_paths (const char *sysroot,
281 int relocated = cpp_relocated (); 281 int relocated = cpp_relocated ();
282 size_t len; 282 size_t len;
@@ -320,10 +320,10 @@ Index: gcc-9.2.0/gcc/incpath.c
320 NULL); 320 NULL);
321 str = update_path (ostr, p->component); 321 str = update_path (ostr, p->component);
322 free (ostr); 322 free (ostr);
323Index: gcc-9.2.0/gcc/prefix.c 323Index: gcc-9.3.0/gcc/prefix.c
324=================================================================== 324===================================================================
325--- gcc-9.2.0.orig/gcc/prefix.c 325--- gcc-9.3.0.orig/gcc/prefix.c
326+++ gcc-9.2.0/gcc/prefix.c 326+++ gcc-9.3.0/gcc/prefix.c
327@@ -72,7 +72,9 @@ License along with GCC; see the file COP 327@@ -72,7 +72,9 @@ License along with GCC; see the file COP
328 #include "prefix.h" 328 #include "prefix.h"
329 #include "common/common-target.h" 329 #include "common/common-target.h"
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/meta/recipes-devtools/gcc/gcc-9.3/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch
index fde206eb71..abfa7516da 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch
@@ -1,7 +1,7 @@
1From dab4db14e319f3239a2b4c7d1fbf2971936e27ba Mon Sep 17 00:00:00 2001 1From 6c39a22c3e85d20dee9e2fc2274e95da980de4d0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 7 Dec 2015 23:41:45 +0000 3Date: Mon, 7 Dec 2015 23:41:45 +0000
4Subject: [PATCH 26/36] Search target sysroot gcc version specific dirs with 4Subject: [PATCH 26/39] Search target sysroot gcc version specific dirs with
5 multilib. 5 multilib.
6 6
7We install the gcc libraries (such as crtbegin.p) into 7We install the gcc libraries (such as crtbegin.p) into
@@ -51,10 +51,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
51 1 file changed, 28 insertions(+), 1 deletion(-) 51 1 file changed, 28 insertions(+), 1 deletion(-)
52 52
53diff --git a/gcc/gcc.c b/gcc/gcc.c 53diff --git a/gcc/gcc.c b/gcc/gcc.c
54index db0e2934038..1c21d1b08eb 100644 54index 59fb64f5fd5..3e79da4238c 100644
55--- a/gcc/gcc.c 55--- a/gcc/gcc.c
56+++ b/gcc/gcc.c 56+++ b/gcc/gcc.c
57@@ -2610,7 +2610,7 @@ for_each_path (const struct path_prefix *paths, 57@@ -2617,7 +2617,7 @@ for_each_path (const struct path_prefix *paths,
58 if (path == NULL) 58 if (path == NULL)
59 { 59 {
60 len = paths->max_len + extra_space + 1; 60 len = paths->max_len + extra_space + 1;
@@ -63,7 +63,7 @@ index db0e2934038..1c21d1b08eb 100644
63 path = XNEWVEC (char, len); 63 path = XNEWVEC (char, len);
64 } 64 }
65 65
66@@ -2622,6 +2622,33 @@ for_each_path (const struct path_prefix *paths, 66@@ -2629,6 +2629,33 @@ for_each_path (const struct path_prefix *paths,
67 /* Look first in MACHINE/VERSION subdirectory. */ 67 /* Look first in MACHINE/VERSION subdirectory. */
68 if (!skip_multi_dir) 68 if (!skip_multi_dir)
69 { 69 {
@@ -98,5 +98,5 @@ index db0e2934038..1c21d1b08eb 100644
98 ret = callback (path, callback_info); 98 ret = callback (path, callback_info);
99 if (ret) 99 if (ret)
100-- 100--
1012.22.1 1012.25.1
102 102
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0027-Fix-various-_FOR_BUILD-and-related-variables.patch b/meta/recipes-devtools/gcc/gcc-9.3/0027-Fix-various-_FOR_BUILD-and-related-variables.patch
index 5d89e8e7e2..ae8acc7f13 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0027-Fix-various-_FOR_BUILD-and-related-variables.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0027-Fix-various-_FOR_BUILD-and-related-variables.patch
@@ -1,7 +1,7 @@
1From 8e84bb09d2b7a60487a30e438bb109f31c2c254b Mon Sep 17 00:00:00 2001 1From 07db34b16b6c8e3d948b417f2fc052500ffb77d3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 7 Dec 2015 23:42:45 +0000 3Date: Mon, 7 Dec 2015 23:42:45 +0000
4Subject: [PATCH 27/36] Fix various _FOR_BUILD and related variables 4Subject: [PATCH 27/39] Fix various _FOR_BUILD and related variables
5 5
6When doing a FOR_BUILD thing, you have to override CFLAGS with 6When doing a FOR_BUILD thing, you have to override CFLAGS with
7CFLAGS_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
@@ -94,7 +94,7 @@ index 41cae58a267..d3f6b79acdc 100644
94 CFLAGS="$(CFLAGS)"; export CFLAGS; \ 94 CFLAGS="$(CFLAGS)"; export CFLAGS; \
95 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ 95 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
96diff --git a/gcc/Makefile.in b/gcc/Makefile.in 96diff --git a/gcc/Makefile.in b/gcc/Makefile.in
97index 21472745c2c..8c93f03ffdc 100644 97index 7772342ad5e..02fec881b6d 100644
98--- a/gcc/Makefile.in 98--- a/gcc/Makefile.in
99+++ b/gcc/Makefile.in 99+++ b/gcc/Makefile.in
100@@ -805,7 +805,7 @@ BUILD_LDFLAGS=@BUILD_LDFLAGS@ 100@@ -805,7 +805,7 @@ BUILD_LDFLAGS=@BUILD_LDFLAGS@
@@ -107,10 +107,10 @@ index 21472745c2c..8c93f03ffdc 100644
107 # Actual name to use when installing a native compiler. 107 # Actual name to use when installing a native compiler.
108 GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)') 108 GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
109diff --git a/gcc/configure b/gcc/configure 109diff --git a/gcc/configure b/gcc/configure
110index 911de2cf017..325ace34cdf 100755 110index a5f208af7cf..0788b7bf0b5 100755
111--- a/gcc/configure 111--- a/gcc/configure
112+++ b/gcc/configure 112+++ b/gcc/configure
113@@ -11965,7 +11965,7 @@ else 113@@ -11966,7 +11966,7 @@ else
114 CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ 114 CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
115 CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \ 115 CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \
116 LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \ 116 LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \
@@ -120,7 +120,7 @@ index 911de2cf017..325ace34cdf 100755
120 --enable-languages=${enable_languages-all} \ 120 --enable-languages=${enable_languages-all} \
121 --target=$target_alias --host=$build_alias --build=$build_alias 121 --target=$target_alias --host=$build_alias --build=$build_alias
122diff --git a/gcc/configure.ac b/gcc/configure.ac 122diff --git a/gcc/configure.ac b/gcc/configure.ac
123index b413ae9bf25..72a6c95121b 100644 123index b7a7ead1c02..5ab50fae0f3 100644
124--- a/gcc/configure.ac 124--- a/gcc/configure.ac
125+++ b/gcc/configure.ac 125+++ b/gcc/configure.ac
126@@ -1743,7 +1743,7 @@ else 126@@ -1743,7 +1743,7 @@ else
@@ -133,5 +133,5 @@ index b413ae9bf25..72a6c95121b 100644
133 --enable-languages=${enable_languages-all} \ 133 --enable-languages=${enable_languages-all} \
134 --target=$target_alias --host=$build_alias --build=$build_alias 134 --target=$target_alias --host=$build_alias --build=$build_alias
135-- 135--
1362.22.1 1362.25.1
137 137
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch b/meta/recipes-devtools/gcc/gcc-9.3/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch
index 84d92a337e..52a5d97aef 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch
@@ -1,7 +1,7 @@
1From 5647f773e28b528a67800ef06ca44730f9f5dc7e Mon Sep 17 00:00:00 2001 1From 59543e897eb35194fb47288f7762e40a18fff611 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 2 Feb 2016 10:26:10 -0800 3Date: Tue, 2 Feb 2016 10:26:10 -0800
4Subject: [PATCH 28/36] nios2: Define MUSL_DYNAMIC_LINKER 4Subject: [PATCH 28/39] nios2: Define MUSL_DYNAMIC_LINKER
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -24,5 +24,5 @@ index 698734add35..eeee60ecfea 100644
24 #undef LINK_SPEC 24 #undef LINK_SPEC
25 #define LINK_SPEC LINK_SPEC_ENDIAN \ 25 #define LINK_SPEC LINK_SPEC_ENDIAN \
26-- 26--
272.22.1 272.25.1
28 28
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta/recipes-devtools/gcc/gcc-9.3/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
index d19e5a08b9..bfa7e19dd0 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
@@ -1,7 +1,7 @@
1From 474043ca7a064ca7b0a32308a0ed6f7c546f17b2 Mon Sep 17 00:00:00 2001 1From 8df99af0a65ef740bcf2b7dc9a109cc57f15c3aa Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 27 Jun 2017 18:10:54 -0700 3Date: Tue, 27 Jun 2017 18:10:54 -0700
4Subject: [PATCH 29/36] Add ssp_nonshared to link commandline for musl targets 4Subject: [PATCH 29/39] Add ssp_nonshared to link commandline for musl targets
5 5
6when -fstack-protector options are enabled we need to 6when -fstack-protector options are enabled we need to
7link with ssp_shared on musl since it does not provide 7link with ssp_shared on musl since it does not provide
@@ -83,5 +83,5 @@ index 45a9a7cae59..d1e88a40e82 100644
83 %{!static-pie: \ 83 %{!static-pie: \
84 %{rdynamic:-export-dynamic} \ 84 %{rdynamic:-export-dynamic} \
85-- 85--
862.22.1 862.25.1
87 87
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch b/meta/recipes-devtools/gcc/gcc-9.3/0030-ldbl128-config.patch
index 38eab5a083..f8e8c07f62 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0030-ldbl128-config.patch
@@ -1,7 +1,7 @@
1From 47467f3ab0fb2f2fcede81060fe8bb339d0909eb Mon Sep 17 00:00:00 2001 1From 1bfae624b27ea4a1f5c5a92050d741b511e7b3d5 Mon Sep 17 00:00:00 2001
2From: Szabolcs Nagy <nsz@port70.net> 2From: Szabolcs Nagy <nsz@port70.net>
3Date: Wed, 28 Feb 2018 00:54:05 +0000 3Date: Wed, 28 Feb 2018 00:54:05 +0000
4Subject: [PATCH 10/12] ldbl128 config 4Subject: [PATCH 30/39] ldbl128 config
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 2 files changed, 27 insertions(+), 2 deletions(-) 12 2 files changed, 27 insertions(+), 2 deletions(-)
13 13
14diff --git a/gcc/configure b/gcc/configure 14diff --git a/gcc/configure b/gcc/configure
15index 6121e163259..07ff8597d48 100755 15index 0788b7bf0b5..eb1a45bb263 100755
16--- a/gcc/configure 16--- a/gcc/configure
17+++ b/gcc/configure 17+++ b/gcc/configure
18@@ -29309,6 +29309,15 @@ if test "${with_long_double_128+set}" = set; then : 18@@ -29370,6 +29370,15 @@ if test "${with_long_double_128+set}" = set; then :
19 withval=$with_long_double_128; gcc_cv_target_ldbl128="$with_long_double_128" 19 withval=$with_long_double_128; gcc_cv_target_ldbl128="$with_long_double_128"
20 else 20 else
21 21
@@ -31,7 +31,7 @@ index 6121e163259..07ff8597d48 100755
31 if test $glibc_version_major -gt 2 \ 31 if test $glibc_version_major -gt 2 \
32 || ( test $glibc_version_major -eq 2 && test $glibc_version_minor -ge 4 ); then : 32 || ( test $glibc_version_major -eq 2 && test $glibc_version_minor -ge 4 ); then :
33 gcc_cv_target_ldbl128=yes 33 gcc_cv_target_ldbl128=yes
34@@ -29320,6 +29329,10 @@ else 34@@ -29381,6 +29390,10 @@ else
35 && gcc_cv_target_ldbl128=yes 35 && gcc_cv_target_ldbl128=yes
36 36
37 fi 37 fi
@@ -43,10 +43,10 @@ index 6121e163259..07ff8597d48 100755
43 43
44 ;; 44 ;;
45diff --git a/gcc/configure.ac b/gcc/configure.ac 45diff --git a/gcc/configure.ac b/gcc/configure.ac
46index b066cc609e1..6c15ed898c0 100644 46index 5ab50fae0f3..7ffe35ee1c3 100644
47--- a/gcc/configure.ac 47--- a/gcc/configure.ac
48+++ b/gcc/configure.ac 48+++ b/gcc/configure.ac
49@@ -5971,13 +5971,25 @@ case "$target" in 49@@ -6030,13 +6030,25 @@ case "$target" in
50 AC_ARG_WITH(long-double-128, 50 AC_ARG_WITH(long-double-128,
51 [AS_HELP_STRING([--with-long-double-128], 51 [AS_HELP_STRING([--with-long-double-128],
52 [use 128-bit long double by default])], 52 [use 128-bit long double by default])],
@@ -75,5 +75,5 @@ index b066cc609e1..6c15ed898c0 100644
75 esac 75 esac
76 if test x$gcc_cv_target_ldbl128 = xyes; then 76 if test x$gcc_cv_target_ldbl128 = xyes; then
77-- 77--
782.17.1 782.25.1
79 79
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch b/meta/recipes-devtools/gcc/gcc-9.3/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
index dc2141d70c..60a29fc94d 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
@@ -1,7 +1,7 @@
1From 266dcc78e4d9d38de2809118977d97dc9270cf1f Mon Sep 17 00:00:00 2001 1From 31d008f5573627c6192ce9fcf729f0be464a7cf5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 4 May 2016 21:11:34 -0700 3Date: Wed, 4 May 2016 21:11:34 -0700
4Subject: [PATCH 31/36] Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS 4Subject: [PATCH 31/39] Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -25,5 +25,5 @@ index 099bf23e62f..436b277a79f 100644
25 $(SHLIB_OBJS) $(SHLIB_LC) && \ 25 $(SHLIB_OBJS) $(SHLIB_LC) && \
26 rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \ 26 rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \
27-- 27--
282.22.1 282.25.1
29 29
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/meta/recipes-devtools/gcc/gcc-9.3/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
index 8dde016ce5..6f048dab82 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
@@ -1,7 +1,7 @@
1From 9975b6ed3570bbf7c7d2d82f4d5f733d24ccacf5 Mon Sep 17 00:00:00 2001 1From 761fa6e3e37608cfd1b288e721a2ff89288cd6aa Mon Sep 17 00:00:00 2001
2From: Szabolcs Nagy <nsz@port70.net> 2From: Szabolcs Nagy <nsz@port70.net>
3Date: Sat, 24 Oct 2015 20:09:53 +0000 3Date: Sat, 24 Oct 2015 20:09:53 +0000
4Subject: [PATCH 32/36] libgcc_s: Use alias for __cpu_indicator_init instead of 4Subject: [PATCH 32/39] libgcc_s: Use alias for __cpu_indicator_init instead of
5 symver 5 symver
6 6
7Adapter from 7Adapter from
@@ -39,10 +39,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
39 3 files changed, 6 insertions(+), 6 deletions(-) 39 3 files changed, 6 insertions(+), 6 deletions(-)
40 40
41diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c 41diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
42index 2b37296e537..dd380ddba88 100644 42index 1bca5a7eea6..096c4bc8e25 100644
43--- a/gcc/config/i386/i386.c 43--- a/gcc/config/i386/i386.c
44+++ b/gcc/config/i386/i386.c 44+++ b/gcc/config/i386/i386.c
45@@ -36658,10 +36658,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, 45@@ -36685,10 +36685,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
46 { 46 {
47 case IX86_BUILTIN_CPU_INIT: 47 case IX86_BUILTIN_CPU_INIT:
48 { 48 {
@@ -82,5 +82,5 @@ index 8506a635790..564296f788e 100644
82+HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS) 82+HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
83 CRTSTUFF_T_CFLAGS += $(CET_FLAGS) 83 CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
84-- 84--
852.22.1 852.25.1
86 86
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0033-sync-gcc-stddef.h-with-musl.patch b/meta/recipes-devtools/gcc/gcc-9.3/0033-sync-gcc-stddef.h-with-musl.patch
index b99ac429a0..f080b0596f 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0033-sync-gcc-stddef.h-with-musl.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0033-sync-gcc-stddef.h-with-musl.patch
@@ -1,7 +1,7 @@
1From 39e2f61d262f9f6c7a91068998dea80791ef665e Mon Sep 17 00:00:00 2001 1From 126e342fb39d7af70c1e5a6df8ffafc8dfc3bf08 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 3 Feb 2017 12:56:00 -0800 3Date: Fri, 3 Feb 2017 12:56:00 -0800
4Subject: [PATCH 33/36] sync gcc stddef.h with musl 4Subject: [PATCH 33/39] sync gcc stddef.h with musl
5 5
6musl defines ptrdiff_t size_t and wchar_t 6musl defines ptrdiff_t size_t and wchar_t
7so dont define them here if musl is definining them 7so dont define them here if musl is definining them
@@ -87,5 +87,5 @@ index da692e1c01a..9a00c261adb 100644
87 #endif /* _STDDEF_H or __need_wchar_t. */ 87 #endif /* _STDDEF_H or __need_wchar_t. */
88 88
89-- 89--
902.22.1 902.25.1
91 91
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0034-fix-segmentation-fault-in-precompiled-header-generat.patch b/meta/recipes-devtools/gcc/gcc-9.3/0034-fix-segmentation-fault-in-precompiled-header-generat.patch
index 06a3c9f884..3b7ccb3e3d 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0034-fix-segmentation-fault-in-precompiled-header-generat.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0034-fix-segmentation-fault-in-precompiled-header-generat.patch
@@ -1,7 +1,7 @@
1From aaa896a57b0004a74c1d474e74b21f41147a65cb Mon Sep 17 00:00:00 2001 1From d26fa9ededccc7e1ec47ead7f18afc80971483a3 Mon Sep 17 00:00:00 2001
2From: Juro Bystricky <juro.bystricky@intel.com> 2From: Juro Bystricky <juro.bystricky@intel.com>
3Date: Mon, 19 Mar 2018 22:31:20 -0700 3Date: Mon, 19 Mar 2018 22:31:20 -0700
4Subject: [PATCH 34/36] fix segmentation fault in precompiled header generation 4Subject: [PATCH 34/39] fix segmentation fault in precompiled header generation
5 5
6Prevent a segmentation fault which occurs when using incorrect 6Prevent a segmentation fault which occurs when using incorrect
7structure trying to access name of some named operators, such as 7structure trying to access name of some named operators, such as
@@ -56,5 +56,5 @@ index eedfcbb3146..15040a1b1f0 100644
56 buffer = _cpp_spell_ident_ucns (buffer, token->val.node.node); 56 buffer = _cpp_spell_ident_ucns (buffer, token->val.node.node);
57 break; 57 break;
58-- 58--
592.22.1 592.25.1
60 60
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0035-Fix-for-testsuite-failure.patch b/meta/recipes-devtools/gcc/gcc-9.3/0035-Fix-for-testsuite-failure.patch
index 7470cbfcfc..5e199fbcfd 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0035-Fix-for-testsuite-failure.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0035-Fix-for-testsuite-failure.patch
@@ -1,7 +1,7 @@
1From 0f9d449c739df03782ce9d29f6b68d9af976a607 Mon Sep 17 00:00:00 2001 1From fb5bdf8f8527228d587e8af9fc700e5164b3c18c Mon Sep 17 00:00:00 2001
2From: RAGHUNATH LOLUR <raghunath.lolur@kpit.com> 2From: RAGHUNATH LOLUR <raghunath.lolur@kpit.com>
3Date: Wed, 6 Dec 2017 22:52:26 -0800 3Date: Wed, 6 Dec 2017 22:52:26 -0800
4Subject: [PATCH 35/36] Fix for testsuite failure 4Subject: [PATCH 35/39] Fix for testsuite failure
5 5
62017-11-16 Raghunath Lolur <raghunath.lolur@kpit.com> 62017-11-16 Raghunath Lolur <raghunath.lolur@kpit.com>
7 7
@@ -254,5 +254,5 @@ index 6cda1534311..26e37f5b8ba 100644
254 __attribute__((vector_size((elcount)*sizeof(type)))) type 254 __attribute__((vector_size((elcount)*sizeof(type)))) type
255 255
256-- 256--
2572.22.1 2572.25.1
258 258
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0036-Re-introduce-spe-commandline-options.patch b/meta/recipes-devtools/gcc/gcc-9.3/0036-Re-introduce-spe-commandline-options.patch
index 4dbcd98945..825e070aa3 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/0036-Re-introduce-spe-commandline-options.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0036-Re-introduce-spe-commandline-options.patch
@@ -1,7 +1,7 @@
1From 71e99c2b58a9eb00cdd65a04aeb6fb78227e3297 Mon Sep 17 00:00:00 2001 1From dc23cabac6a7b2ca85b02d2a58a8916c98f382e0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 6 Jun 2018 12:10:22 -0700 3Date: Wed, 6 Jun 2018 12:10:22 -0700
4Subject: [PATCH 36/36] Re-introduce spe commandline options 4Subject: [PATCH 36/39] Re-introduce spe commandline options
5 5
6This should ensure that we keep accepting 6This should ensure that we keep accepting
7spe options 7spe options
@@ -37,5 +37,5 @@ index f4b5c91e11f..69869350fce 100644
37 Target RejectNegative Var(rs6000_altivec_abi) Save 37 Target RejectNegative Var(rs6000_altivec_abi) Save
38 Use the AltiVec ABI extensions. 38 Use the AltiVec ABI extensions.
39-- 39--
402.22.1 402.25.1
41 41
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-14250.patch b/meta/recipes-devtools/gcc/gcc-9.3/0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch
index 65ea34558a..f268a4eb58 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-14250.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch
@@ -1,7 +1,10 @@
1From 517b211a3d78366ca8d5929f580e8ca72fd2c004 Mon Sep 17 00:00:00 2001 1From ac4af583bd59f6631671ad4abf985799ce4a53d9 Mon Sep 17 00:00:00 2001
2From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> 2From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>
3Date: Thu, 25 Jul 2019 10:46:54 +0000 3Date: Thu, 25 Jul 2019 10:46:54 +0000
4Subject: [PATCH] 2019-07-25 Richard Biener <rguenther@suse.de> 4Subject: [PATCH 37/39] CVE-2019-14250: Check zero value in
5 simple_object_elf_match
6
72019-07-25 Richard Biener <rguenther@suse.de>
5 8
6 PR lto/90924 9 PR lto/90924
7 Backport from mainline 10 Backport from mainline
@@ -10,7 +13,6 @@ Subject: [PATCH] 2019-07-25 Richard Biener <rguenther@suse.de>
10 * simple-object-elf.c (simple_object_elf_match): Check zero value 13 * simple-object-elf.c (simple_object_elf_match): Check zero value
11 shstrndx. 14 shstrndx.
12 15
13
14git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@273793 138bc75d-0d04-0410-961f-82ee72b054a4 16git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@273793 138bc75d-0d04-0410-961f-82ee72b054a4
15 17
16Upstream-Status: Backport 18Upstream-Status: Backport
@@ -18,16 +20,15 @@ Affectes: < 9.2
18CVE: CVE-2019-14250 20CVE: CVE-2019-14250
19Dropped changelog 21Dropped changelog
20Signed-off-by: Armin Kuster <Akustre@mvista.com> 22Signed-off-by: Armin Kuster <Akustre@mvista.com>
21
22--- 23---
23 libiberty/simple-object-elf.c | 8 ++++++++ 24 libiberty/simple-object-elf.c | 8 ++++++++
24 2 files changed, 17 insertions(+) 25 1 file changed, 8 insertions(+)
25 26
26Index: gcc-9.2.0/libiberty/simple-object-elf.c 27diff --git a/libiberty/simple-object-elf.c b/libiberty/simple-object-elf.c
27=================================================================== 28index 3d49f339631..c00cebdb6c7 100644
28--- gcc-9.2.0.orig/libiberty/simple-object-elf.c 29--- a/libiberty/simple-object-elf.c
29+++ gcc-9.2.0/libiberty/simple-object-elf.c 30+++ b/libiberty/simple-object-elf.c
30@@ -557,6 +557,14 @@ simple_object_elf_match (unsigned char h 31@@ -557,6 +557,14 @@ simple_object_elf_match (unsigned char header[SIMPLE_OBJECT_MATCH_HEADER_LEN],
31 return NULL; 32 return NULL;
32 } 33 }
33 34
@@ -42,3 +43,6 @@ Index: gcc-9.2.0/libiberty/simple-object-elf.c
42 return (void *) eor; 43 return (void *) eor;
43 } 44 }
44 45
46--
472.25.1
48
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch b/meta/recipes-devtools/gcc/gcc-9.3/0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch
index 8e2c3f5809..a79fc03d15 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch
@@ -1,11 +1,23 @@
1Inserting line numbers into generated code means its not always reproducible wth 1From 075e0929e04913538391052c32178b6a14ef0ae3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 12 Mar 2020 14:41:40 -0700
4Subject: [PATCH 38/39] gentypes/genmodes: Do not use __LINE__ for maintaining
5 reproducibility
6
7Inserting line numbers into generated code means its not always reproducible wth
2differing versions of host gcc. Void the issue by not adding these. 8differing versions of host gcc. Void the issue by not adding these.
3 9
4Upstream-Status: Inappropriate [OE Reproducibility specific] 10Upstream-Status: Inappropriate [OE Reproducibility specific]
11
5Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 12Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 gcc/gengtype.c | 6 +++---
16 gcc/genmodes.c | 32 ++++++++++++++++----------------
17 2 files changed, 19 insertions(+), 19 deletions(-)
6 18
7diff --git a/gcc/gengtype.c b/gcc/gengtype.c 19diff --git a/gcc/gengtype.c b/gcc/gengtype.c
8index 53317337c..bbb261516 100644 20index 53317337cf8..bbb26151671 100644
9--- a/gcc/gengtype.c 21--- a/gcc/gengtype.c
10+++ b/gcc/gengtype.c 22+++ b/gcc/gengtype.c
11@@ -991,7 +991,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt, 23@@ -991,7 +991,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt,
@@ -36,7 +48,7 @@ index 53317337c..bbb261516 100644
36 POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos)); 48 POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos));
37 POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos)); 49 POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos));
38diff --git a/gcc/genmodes.c b/gcc/genmodes.c 50diff --git a/gcc/genmodes.c b/gcc/genmodes.c
39index f33eefa24..07bef9eeb 100644 51index f33eefa2494..07bef9eebe2 100644
40--- a/gcc/genmodes.c 52--- a/gcc/genmodes.c
41+++ b/gcc/genmodes.c 53+++ b/gcc/genmodes.c
42@@ -429,7 +429,7 @@ complete_all_modes (void) 54@@ -429,7 +429,7 @@ complete_all_modes (void)
@@ -168,3 +180,6 @@ index f33eefa24..07bef9eeb 100644
168 180
169 #define ADJUST_NUNITS(M, X) _ADD_ADJUST (nunits, M, X, RANDOM, RANDOM) 181 #define ADJUST_NUNITS(M, X) _ADD_ADJUST (nunits, M, X, RANDOM, RANDOM)
170 #define ADJUST_BYTESIZE(M, X) _ADD_ADJUST (bytesize, M, X, RANDOM, RANDOM) 182 #define ADJUST_BYTESIZE(M, X) _ADD_ADJUST (bytesize, M, X, RANDOM, RANDOM)
183--
1842.25.1
185
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch b/meta/recipes-devtools/gcc/gcc-9.3/0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch
index c37e0bb9dd..b69114d1e5 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.3/0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch
@@ -1,8 +1,10 @@
1From efb0ee06f5c0186c2d1442ecd4dbbd55dbd97b44 Mon Sep 17 00:00:00 2001 1From e75bcc2ec4f1e7e081ce18713f0a25913ba15340 Mon Sep 17 00:00:00 2001
2From: Vladimir Makarov <vmakarov@redhat.com> 2From: Vladimir Makarov <vmakarov@redhat.com>
3Date: Wed, 10 Jul 2019 16:07:10 +0000 3Date: Wed, 10 Jul 2019 16:07:10 +0000
4Subject: [PATCH] re PR target/91102 (aarch64 ICE on Linux kernel with -Os 4Subject: [PATCH 39/39] process_alt_operands: Don't match user defined regs
5 starting with r270266) 5 only if they are early clobbers
6
7PR target/91102 (aarch64 ICE on Linux kernel with -Os starting with r270266)
6 8
72019-07-10 Vladimir Makarov <vmakarov@redhat.com> 92019-07-10 Vladimir Makarov <vmakarov@redhat.com>
8 10
@@ -26,7 +28,7 @@ Signed-off-by: Taras Kondratiuk <takondra@cisco.com>
26 create mode 100644 gcc/testsuite/gcc.target/aarch64/pr91102.c 28 create mode 100644 gcc/testsuite/gcc.target/aarch64/pr91102.c
27 29
28diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c 30diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
29index cf33da8013e4..6382dbf852b6 100644 31index cf33da8013e..6382dbf852b 100644
30--- a/gcc/lra-constraints.c 32--- a/gcc/lra-constraints.c
31+++ b/gcc/lra-constraints.c 33+++ b/gcc/lra-constraints.c
32@@ -2172,8 +2172,9 @@ process_alt_operands (int only_alternative) 34@@ -2172,8 +2172,9 @@ process_alt_operands (int only_alternative)
@@ -63,7 +65,7 @@ index cf33da8013e4..6382dbf852b6 100644
63 if (curr_alt[m] == NO_REGS) 65 if (curr_alt[m] == NO_REGS)
64diff --git a/gcc/testsuite/gcc.target/aarch64/pr91102.c b/gcc/testsuite/gcc.target/aarch64/pr91102.c 66diff --git a/gcc/testsuite/gcc.target/aarch64/pr91102.c b/gcc/testsuite/gcc.target/aarch64/pr91102.c
65new file mode 100644 67new file mode 100644
66index 000000000000..70b99045a48e 68index 00000000000..70b99045a48
67--- /dev/null 69--- /dev/null
68+++ b/gcc/testsuite/gcc.target/aarch64/pr91102.c 70+++ b/gcc/testsuite/gcc.target/aarch64/pr91102.c
69@@ -0,0 +1,26 @@ 71@@ -0,0 +1,26 @@
@@ -93,3 +95,6 @@ index 000000000000..70b99045a48e
93+ b.h = foo (b.h, c.h); 95+ b.h = foo (b.h, c.h);
94+ } 96+ }
95+} 97+}
98--
992.25.1
100
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_9.2.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_9.3.bb
index bf53c5cd78..bf53c5cd78 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_9.2.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_9.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross_9.2.bb b/meta/recipes-devtools/gcc/gcc-cross_9.3.bb
index b43cca0c52..b43cca0c52 100644
--- a/meta/recipes-devtools/gcc/gcc-cross_9.2.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross_9.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_9.2.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_9.3.bb
index 40a6c4feff..40a6c4feff 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk_9.2.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk_9.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_9.2.bb b/meta/recipes-devtools/gcc/gcc-runtime_9.3.bb
index dd430b57eb..dd430b57eb 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime_9.2.bb
+++ b/meta/recipes-devtools/gcc/gcc-runtime_9.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_9.2.bb b/meta/recipes-devtools/gcc/gcc-sanitizers_9.3.bb
index f3c7058114..f3c7058114 100644
--- a/meta/recipes-devtools/gcc/gcc-sanitizers_9.2.bb
+++ b/meta/recipes-devtools/gcc/gcc-sanitizers_9.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-source_9.2.bb b/meta/recipes-devtools/gcc/gcc-source_9.3.bb
index b890fa33ea..b890fa33ea 100644
--- a/meta/recipes-devtools/gcc/gcc-source_9.2.bb
+++ b/meta/recipes-devtools/gcc/gcc-source_9.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc_9.2.bb b/meta/recipes-devtools/gcc/gcc_9.3.bb
index 7d93590588..7d93590588 100644
--- a/meta/recipes-devtools/gcc/gcc_9.2.bb
+++ b/meta/recipes-devtools/gcc/gcc_9.3.bb
diff --git a/meta/recipes-devtools/gcc/libgcc-initial_9.2.bb b/meta/recipes-devtools/gcc/libgcc-initial_9.3.bb
index 0c698c26ec..0c698c26ec 100644
--- a/meta/recipes-devtools/gcc/libgcc-initial_9.2.bb
+++ b/meta/recipes-devtools/gcc/libgcc-initial_9.3.bb
diff --git a/meta/recipes-devtools/gcc/libgcc_9.2.bb b/meta/recipes-devtools/gcc/libgcc_9.3.bb
index ea210a1130..ea210a1130 100644
--- a/meta/recipes-devtools/gcc/libgcc_9.2.bb
+++ b/meta/recipes-devtools/gcc/libgcc_9.3.bb
diff --git a/meta/recipes-devtools/gcc/libgfortran_9.2.bb b/meta/recipes-devtools/gcc/libgfortran_9.3.bb
index 71dd8b4bdc..71dd8b4bdc 100644
--- a/meta/recipes-devtools/gcc/libgfortran_9.2.bb
+++ b/meta/recipes-devtools/gcc/libgfortran_9.3.bb