summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-08-15 11:40:03 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-21 15:29:01 +0100
commit8e96692a59c425e42e62eb3f3202f551dea230b4 (patch)
tree488ad2a82a3785dc73b90b5866584053b67806ea /meta/recipes-devtools
parentb95140cad344ad4b408880f8b22061572a14be1f (diff)
downloadpoky-8e96692a59c425e42e62eb3f3202f551dea230b4.tar.gz
gcc-9: Upgrade to 9.2
BugFix only release see [1] for details [1] https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=9.2 (From OE-Core rev: d00fac5bb9c479b5709ce73ae7fc0a14474a69c9) 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.inc (renamed from meta/recipes-devtools/gcc/gcc-9.1.inc)73
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch)14
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0002-gcc-poison-system-directories.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0002-gcc-poison-system-directories.patch)26
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch)10
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0004-64-bit-multilib-hack.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0004-64-bit-multilib-hack.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0005-optional-libstdc.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0005-optional-libstdc.patch)20
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0006-COLLECT_GCC_OPTIONS.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0007-COLLECT_GCC_OPTIONS.patch)8
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0008-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch)12
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0008-fortran-cross-compile-hack.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0009-fortran-cross-compile-hack.patch)12
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0009-cpp-honor-sysroot.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0010-cpp-honor-sysroot.patch)8
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0010-MIPS64-Default-to-N64-ABI.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0011-MIPS64-Default-to-N64-ABI.patch)10
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch)26
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0012-gcc-Fix-argument-list-too-long-error.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0013-gcc-Fix-argument-list-too-long-error.patch)10
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0013-Disable-sdt.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0014-Disable-sdt.patch)20
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0014-libtool.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0015-libtool.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0016-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0017-Use-the-multilib-config-files-from-B-instead-of-usin.patch)10
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0018-Avoid-using-libdir-from-.la-which-usually-points-to-.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0018-export-CPP.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0019-export-CPP.patch)8
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0020-Ensure-target-gcc-headers-can-be-included.patch)12
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0021-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0022-Don-t-search-host-directory-during-relink-if-inst_pr.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0023-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch)8
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0023-aarch64-Add-support-for-musl-ldso.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0024-aarch64-Add-support-for-musl-ldso.patch)8
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0025-libcc1-fix-libcc1-s-install-path-and-rpath.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0025-handle-sysroot-support-for-nativesdk-gcc.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0026-handle-sysroot-support-for-nativesdk-gcc.patch)8
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0027-Search-target-sysroot-gcc-version-specific-dirs-with.patch)8
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0027-Fix-various-_FOR_BUILD-and-related-variables.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0028-Fix-various-_FOR_BUILD-and-related-variables.patch)16
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0029-nios2-Define-MUSL_DYNAMIC_LINKER.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0030-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch)14
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0031-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0032-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0033-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch)10
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0033-sync-gcc-stddef.h-with-musl.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0034-sync-gcc-stddef.h-with-musl.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0034-fix-segmentation-fault-in-precompiled-header-generat.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0035-fix-segmentation-fault-in-precompiled-header-generat.patch)6
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0035-Fix-for-testsuite-failure.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0036-Fix-for-testsuite-failure.patch)8
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.2/0036-Re-introduce-spe-commandline-options.patch (renamed from meta/recipes-devtools/gcc/gcc-9.1/0037-Re-introduce-spe-commandline-options.patch)8
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian_9.2.bb (renamed from meta/recipes-devtools/gcc/gcc-cross-canadian_9.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross_9.2.bb (renamed from meta/recipes-devtools/gcc/gcc-cross_9.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk_9.2.bb (renamed from meta/recipes-devtools/gcc/gcc-crosssdk_9.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime_9.2.bb (renamed from meta/recipes-devtools/gcc/gcc-runtime_9.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-sanitizers_9.2.bb (renamed from meta/recipes-devtools/gcc/gcc-sanitizers_9.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-source_9.2.bb (renamed from meta/recipes-devtools/gcc/gcc-source_9.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc_9.2.bb (renamed from meta/recipes-devtools/gcc/gcc_9.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgcc-initial_9.2.bb (renamed from meta/recipes-devtools/gcc/libgcc-initial_9.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgcc_9.2.bb (renamed from meta/recipes-devtools/gcc/libgcc_9.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgfortran_9.2.bb (renamed from meta/recipes-devtools/gcc/libgfortran_9.1.bb)0
47 files changed, 213 insertions, 226 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-9.1.inc b/meta/recipes-devtools/gcc/gcc-9.2.inc
index 4c648a1694..1c3e200dab 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1.inc
+++ b/meta/recipes-devtools/gcc/gcc-9.2.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.1.0" 5PV = "9.2.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.1.0" 9BINV = "9.2.0"
10 10
11FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-9.1:${FILE_DIRNAME}/gcc-9.1/backport:" 11FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-9.2:${FILE_DIRNAME}/gcc-9.2/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"
@@ -33,41 +33,42 @@ SRC_URI = "\
33 file://0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \ 33 file://0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
34 file://0004-64-bit-multilib-hack.patch \ 34 file://0004-64-bit-multilib-hack.patch \
35 file://0005-optional-libstdc.patch \ 35 file://0005-optional-libstdc.patch \
36 file://0007-COLLECT_GCC_OPTIONS.patch \ 36 file://0006-COLLECT_GCC_OPTIONS.patch \
37 file://0008-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \ 37 file://0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \
38 file://0009-fortran-cross-compile-hack.patch \ 38 file://0008-fortran-cross-compile-hack.patch \
39 file://0010-cpp-honor-sysroot.patch \ 39 file://0009-cpp-honor-sysroot.patch \
40 file://0011-MIPS64-Default-to-N64-ABI.patch \ 40 file://0010-MIPS64-Default-to-N64-ABI.patch \
41 file://0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \ 41 file://0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \
42 file://0013-gcc-Fix-argument-list-too-long-error.patch \ 42 file://0012-gcc-Fix-argument-list-too-long-error.patch \
43 file://0014-Disable-sdt.patch \ 43 file://0013-Disable-sdt.patch \
44 file://0015-libtool.patch \ 44 file://0014-libtool.patch \
45 file://0016-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ 45 file://0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \
46 file://0017-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ 46 file://0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch \
47 file://0018-Avoid-using-libdir-from-.la-which-usually-points-to-.patch \ 47 file://0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch \
48 file://0019-export-CPP.patch \ 48 file://0018-export-CPP.patch \
49 file://0020-Ensure-target-gcc-headers-can-be-included.patch \ 49 file://0019-Ensure-target-gcc-headers-can-be-included.patch \
50 file://0021-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch \ 50 file://0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch \
51 file://0022-Don-t-search-host-directory-during-relink-if-inst_pr.patch \ 51 file://0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch \
52 file://0023-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \ 52 file://0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \
53 file://0024-aarch64-Add-support-for-musl-ldso.patch \ 53 file://0023-aarch64-Add-support-for-musl-ldso.patch \
54 file://0025-libcc1-fix-libcc1-s-install-path-and-rpath.patch \ 54 file://0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch \
55 file://0026-handle-sysroot-support-for-nativesdk-gcc.patch \ 55 file://0025-handle-sysroot-support-for-nativesdk-gcc.patch \
56 file://0027-Search-target-sysroot-gcc-version-specific-dirs-with.patch \ 56 file://0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch \
57 file://0028-Fix-various-_FOR_BUILD-and-related-variables.patch \ 57 file://0027-Fix-various-_FOR_BUILD-and-related-variables.patch \
58 file://0029-nios2-Define-MUSL_DYNAMIC_LINKER.patch \ 58 file://0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch \
59 file://0030-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://0031-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch \ 60 file://0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch \
61 file://0032-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \ 61 file://0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \
62 file://0033-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://0034-sync-gcc-stddef.h-with-musl.patch \ 63 file://0033-sync-gcc-stddef.h-with-musl.patch \
64 file://0035-fix-segmentation-fault-in-precompiled-header-generat.patch \ 64 file://0034-fix-segmentation-fault-in-precompiled-header-generat.patch \
65 file://0036-Fix-for-testsuite-failure.patch \ 65 file://0035-Fix-for-testsuite-failure.patch \
66 file://0037-Re-introduce-spe-commandline-options.patch \ 66 file://0036-Re-introduce-spe-commandline-options.patch \
67" 67"
68SRC_URI[md5sum] = "6069ae3737cf02bf2cb44a391ef0e937"
69SRC_URI[sha256sum] = "79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0"
70S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" 68S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
69SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78"
70SRC_URI[sha256sum] = "ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206"
71
71# For dev release snapshotting 72# For dev release snapshotting
72#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/official-gcc-${RELEASE}" 73#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/official-gcc-${RELEASE}"
73#B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" 74#B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-9.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
index 33c910cc53..9065c304b5 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
@@ -1,7 +1,7 @@
1From f1f6d84aadc4e3cde707b1ec8490f5dc46d4c8e0 Mon Sep 17 00:00:00 2001 1From 863325ec3c6eb4987be63509ac407b2d13617342 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/37] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET 4Subject: [PATCH 01/36] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7 7
@@ -12,10 +12,10 @@ Upstream-Status: Inappropriate [embedded specific]
12 2 files changed, 2 insertions(+), 2 deletions(-) 12 2 files changed, 2 insertions(+), 2 deletions(-)
13 13
14diff --git a/configure b/configure 14diff --git a/configure b/configure
15index adf4fda0f69..8a04eea4c71 100755 15index abd93a990a9..b121088d778 100755
16--- a/configure 16--- a/configure
17+++ b/configure 17+++ b/configure
18@@ -7602,7 +7602,7 @@ fi 18@@ -7603,7 +7603,7 @@ fi
19 # for target_alias and gcc doesn't manage it consistently. 19 # for target_alias and gcc doesn't manage it consistently.
20 target_configargs="--cache-file=./config.cache ${target_configargs}" 20 target_configargs="--cache-file=./config.cache ${target_configargs}"
21 21
@@ -25,10 +25,10 @@ index adf4fda0f69..8a04eea4c71 100755
25 *" newlib "*) 25 *" newlib "*)
26 case " $target_configargs " in 26 case " $target_configargs " in
27diff --git a/configure.ac b/configure.ac 27diff --git a/configure.ac b/configure.ac
28index 87f2aee0500..01b46b8bed4 100644 28index 9db4fd14aa2..aad93c4d183 100644
29--- a/configure.ac 29--- a/configure.ac
30+++ b/configure.ac 30+++ b/configure.ac
31@@ -3118,7 +3118,7 @@ fi 31@@ -3119,7 +3119,7 @@ fi
32 # for target_alias and gcc doesn't manage it consistently. 32 # for target_alias and gcc doesn't manage it consistently.
33 target_configargs="--cache-file=./config.cache ${target_configargs}" 33 target_configargs="--cache-file=./config.cache ${target_configargs}"
34 34
@@ -38,5 +38,5 @@ index 87f2aee0500..01b46b8bed4 100644
38 *" newlib "*) 38 *" newlib "*)
39 case " $target_configargs " in 39 case " $target_configargs " in
40-- 40--
412.20.1 412.22.1
42 42
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0002-gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc-9.2/0002-gcc-poison-system-directories.patch
index 1231567410..a1116e7509 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0002-gcc-poison-system-directories.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0002-gcc-poison-system-directories.patch
@@ -1,7 +1,7 @@
1From 733ca3372e4125170d4531bcd33e48eeb36bfec0 Mon Sep 17 00:00:00 2001 1From 68e78bc15de215fa15c7d8b56bd2e2b0539b34fa 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/37] gcc: poison-system-directories 4Subject: [PATCH 02/36] 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
@@ -26,7 +26,7 @@ Upstream-Status: Pending
26 7 files changed, 68 insertions(+) 26 7 files changed, 68 insertions(+)
27 27
28diff --git a/gcc/common.opt b/gcc/common.opt 28diff --git a/gcc/common.opt b/gcc/common.opt
29index 9a5e9af06ca..211f2b2260e 100644 29index d342c4f3749..c64fd4a6c50 100644
30--- a/gcc/common.opt 30--- a/gcc/common.opt
31+++ b/gcc/common.opt 31+++ b/gcc/common.opt
32@@ -684,6 +684,10 @@ Wreturn-local-addr 32@@ -684,6 +684,10 @@ Wreturn-local-addr
@@ -41,7 +41,7 @@ index 9a5e9af06ca..211f2b2260e 100644
41 Common Var(warn_shadow) Warning 41 Common Var(warn_shadow) Warning
42 Warn when one variable shadows another. Same as -Wshadow=global. 42 Warn when one variable shadows another. Same as -Wshadow=global.
43diff --git a/gcc/config.in b/gcc/config.in 43diff --git a/gcc/config.in b/gcc/config.in
44index 48a533bf208..fc3043bbdfb 100644 44index a718ceaf3da..5713342efb1 100644
45--- a/gcc/config.in 45--- a/gcc/config.in
46+++ b/gcc/config.in 46+++ b/gcc/config.in
47@@ -200,6 +200,12 @@ 47@@ -200,6 +200,12 @@
@@ -58,7 +58,7 @@ index 48a533bf208..fc3043bbdfb 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 d6a48ef76e7..2e08396622e 100755 61index 481071b4265..a6ea3a8a84c 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@@ -995,6 +995,7 @@ with_system_zlib
@@ -78,7 +78,7 @@ index d6a48ef76e7..2e08396622e 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@@ -29717,6 +29720,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : 81@@ -29750,6 +29753,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
82 fi 82 fi
83 83
84 84
@@ -99,10 +99,10 @@ index d6a48ef76e7..2e08396622e 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 78370352938..7d34911573e 100644 102index ce2825580c6..d42bbd4fd1c 100644
103--- a/gcc/configure.ac 103--- a/gcc/configure.ac
104+++ b/gcc/configure.ac 104+++ b/gcc/configure.ac
105@@ -6375,6 +6375,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs, 105@@ -6378,6 +6378,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 78370352938..7d34911573e 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 99fd97404e1..001868e1509 100644 123index 6ef36ce02aa..09414d8cc05 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@@ -330,6 +330,7 @@ Objective-C and Objective-C++ Dialects}. 126@@ -332,6 +332,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 99fd97404e1..001868e1509 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@@ -6254,6 +6255,14 @@ made up of data only and thus requires no special treatment. But, for 134@@ -6289,6 +6290,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
@@ -147,7 +147,7 @@ index 99fd97404e1..001868e1509 100644
147 @opindex Wfloat-equal 147 @opindex Wfloat-equal
148 @opindex Wno-float-equal 148 @opindex Wno-float-equal
149diff --git a/gcc/gcc.c b/gcc/gcc.c 149diff --git a/gcc/gcc.c b/gcc/gcc.c
150index 797ed36616f..79c38d858d1 100644 150index 4f57765b012..a2601a6bb06 100644
151--- a/gcc/gcc.c 151--- a/gcc/gcc.c
152+++ b/gcc/gcc.c 152+++ b/gcc/gcc.c
153@@ -1042,6 +1042,8 @@ proper position among the other output files. */ 153@@ -1042,6 +1042,8 @@ proper position among the other output files. */
@@ -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.20.1 2022.22.1
203 203
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-9.2/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
index 916c374e3e..23039d2123 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
@@ -1,7 +1,7 @@
1From 320352cc741c89f1a9b2ee7929193d255e65f27a Mon Sep 17 00:00:00 2001 1From f8d60c4114acb92361c7b2f4a4561d4661e8da9d 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/37] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET 4Subject: [PATCH 03/36] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET
5 5
6Before committing, I noticed that PR/32161 was marked as a dup of PR/32009, but my previous patch did not fix it. 6Before committing, I noticed that PR/32161 was marked as a dup of PR/32009, but my previous patch did not fix it.
7 7
@@ -26,10 +26,10 @@ Upstream-Status: Pending
26 1 file changed, 32 insertions(+) 26 1 file changed, 32 insertions(+)
27 27
28diff --git a/configure b/configure 28diff --git a/configure b/configure
29index 8a04eea4c71..3b0eed74847 100755 29index b121088d778..93aae5bb26f 100755
30--- a/configure 30--- a/configure
31+++ b/configure 31+++ b/configure
32@@ -6863,6 +6863,38 @@ fi 32@@ -6864,6 +6864,38 @@ fi
33 33
34 34
35 35
@@ -69,5 +69,5 @@ index 8a04eea4c71..3b0eed74847 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.20.1 722.22.1
73 73
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0004-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc-9.2/0004-64-bit-multilib-hack.patch
index 137261b86c..a79c40c1aa 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0004-64-bit-multilib-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0004-64-bit-multilib-hack.patch
@@ -1,7 +1,7 @@
1From 150d946082b3e21614d1cd0eb4752871495fe519 Mon Sep 17 00:00:00 2001 1From c2081c51db589471ea713870c72f13999abda815 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/37] 64-bit multilib hack. 4Subject: [PATCH 04/36] 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.20.1 1182.22.1
119 119
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0005-optional-libstdc.patch b/meta/recipes-devtools/gcc/gcc-9.2/0005-optional-libstdc.patch
index d8e970a1aa..f4fac91467 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0005-optional-libstdc.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0005-optional-libstdc.patch
@@ -1,7 +1,7 @@
1From a3323ea74f0793b35af4a4cdbe5e99fe21e4816b Mon Sep 17 00:00:00 2001 1From e7e504f4a90cfa395e7f8ee779f8c3ed687802ca 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/37] optional libstdc 4Subject: [PATCH 05/36] optional libstdc
5 5
6gcc-runtime builds libstdc++ separately from gcc-cross-*. Its configure tests using g++ 6gcc-runtime builds libstdc++ separately from gcc-cross-*. Its configure tests using g++
7will not run correctly since by default the linker will try to link against libstdc++ 7will not run correctly since by default the linker will try to link against libstdc++
@@ -25,10 +25,10 @@ Upstream-Status: Inappropriate [embedded specific]
25 4 files changed, 37 insertions(+), 1 deletion(-) 25 4 files changed, 37 insertions(+), 1 deletion(-)
26 26
27diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt 27diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
28index 88c72c51c21..a7029592aa3 100644 28index 916cc67b453..41619fa591c 100644
29--- a/gcc/c-family/c.opt 29--- a/gcc/c-family/c.opt
30+++ b/gcc/c-family/c.opt 30+++ b/gcc/c-family/c.opt
31@@ -1948,6 +1948,10 @@ nostdinc++ 31@@ -1952,6 +1952,10 @@ nostdinc++
32 C++ ObjC++ 32 C++ ObjC++
33 Do not search standard system include directories for C++. 33 Do not search standard system include directories for C++.
34 34
@@ -52,10 +52,10 @@ 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 001868e1509..4186c2616ab 100644 55index 09414d8cc05..a43969bc9f0 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@@ -226,6 +226,9 @@ in the following sections. 58@@ -228,6 +228,9 @@ in the following sections.
59 -fno-weak -nostdinc++ @gol 59 -fno-weak -nostdinc++ @gol
60 -fvisibility-inlines-hidden @gol 60 -fvisibility-inlines-hidden @gol
61 -fvisibility-ms-compat @gol 61 -fvisibility-ms-compat @gol
@@ -65,7 +65,7 @@ index 001868e1509..4186c2616ab 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@@ -536,7 +539,7 @@ Objective-C and Objective-C++ Dialects}. 68@@ -538,7 +541,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 001868e1509..4186c2616ab 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@@ -13259,6 +13262,33 @@ Specify that the program entry point is @var{entry}. The argument is 77@@ -13312,6 +13315,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
@@ -109,7 +109,7 @@ index 001868e1509..4186c2616ab 100644
109 @opindex pie 109 @opindex pie
110 Produce a dynamically linked position independent executable on targets 110 Produce a dynamically linked position independent executable on targets
111diff --git a/gcc/gcc.c b/gcc/gcc.c 111diff --git a/gcc/gcc.c b/gcc/gcc.c
112index 79c38d858d1..308872aef5f 100644 112index a2601a6bb06..cd6c6fc95db 100644
113--- a/gcc/gcc.c 113--- a/gcc/gcc.c
114+++ b/gcc/gcc.c 114+++ b/gcc/gcc.c
115@@ -1052,6 +1052,7 @@ proper position among the other output files. */ 115@@ -1052,6 +1052,7 @@ proper position among the other output files. */
@@ -121,5 +121,5 @@ index 79c38d858d1..308872aef5f 100644
121 #endif 121 #endif
122 122
123-- 123--
1242.20.1 1242.22.1
125 125
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0007-COLLECT_GCC_OPTIONS.patch b/meta/recipes-devtools/gcc/gcc-9.2/0006-COLLECT_GCC_OPTIONS.patch
index a522ada448..9f7e603f8c 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0007-COLLECT_GCC_OPTIONS.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0006-COLLECT_GCC_OPTIONS.patch
@@ -1,7 +1,7 @@
1From c7b8c2a6e81daaa50047c336c8ee90086aa4d4d5 Mon Sep 17 00:00:00 2001 1From b9260cd3ac26b0302824ed466a548464c864d95f 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 07/37] COLLECT_GCC_OPTIONS 4Subject: [PATCH 06/36] 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.
@@ -14,7 +14,7 @@ Upstream-Status: Pending
14 1 file changed, 9 insertions(+) 14 1 file changed, 9 insertions(+)
15 15
16diff --git a/gcc/gcc.c b/gcc/gcc.c 16diff --git a/gcc/gcc.c b/gcc/gcc.c
17index 308872aef5f..30845e5b125 100644 17index cd6c6fc95db..7da9c5d457b 100644
18--- a/gcc/gcc.c 18--- a/gcc/gcc.c
19+++ b/gcc/gcc.c 19+++ b/gcc/gcc.c
20@@ -4804,6 +4804,15 @@ set_collect_gcc_options (void) 20@@ -4804,6 +4804,15 @@ set_collect_gcc_options (void)
@@ -34,5 +34,5 @@ index 308872aef5f..30845e5b125 100644
34 { 34 {
35 const char *const *args; 35 const char *const *args;
36-- 36--
372.20.1 372.22.1
38 38
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0008-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/meta/recipes-devtools/gcc/gcc-9.2/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
index 2ef94a0b85..28f8fc2674 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0008-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
@@ -1,7 +1,7 @@
1From 2f65b8bbf9c7c4bc0b94bb7ba9f6a8eb8675c9ab Mon Sep 17 00:00:00 2001 1From 88e728dad53d48c4a19f15e19f66fd23f4820b4a 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 08/37] Use the defaults.h in ${B} instead of ${S}, and t-oe in 4Subject: [PATCH 07/36] 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 508c674cbdc..3ccff1614bb 100644 30index 5f43d9de00e..41f0f592ff4 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,7 +40,7 @@ index 508c674cbdc..3ccff1614bb 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 d36cb51bc2c..7acc7e487b0 100755 43index a6ea3a8a84c..e3bcf8abe9a 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@@ -12341,8 +12341,8 @@ for f in $tm_file; do
@@ -55,7 +55,7 @@ index d36cb51bc2c..7acc7e487b0 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 dfa88c35f3f..f5d5e5c16a8 100644 58index d42bbd4fd1c..2ebc377a74d 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.20.1 952.22.1
96 96
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0009-fortran-cross-compile-hack.patch b/meta/recipes-devtools/gcc/gcc-9.2/0008-fortran-cross-compile-hack.patch
index 7959714636..24e3abe0bb 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0009-fortran-cross-compile-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0008-fortran-cross-compile-hack.patch
@@ -1,7 +1,7 @@
1From eda94df7d2389b6c36428e5687d5f0722d3375c3 Mon Sep 17 00:00:00 2001 1From 010f09f2963ede24e85134e5fab2fa627a9afa05 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 09/37] fortran cross-compile hack. 4Subject: [PATCH 08/36] fortran cross-compile hack.
5 5
6* Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used 6* Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used
7used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross 7used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross
@@ -16,10 +16,10 @@ Upstream-Status: Inappropriate [embedded specific]
16 2 files changed, 2 insertions(+), 2 deletions(-) 16 2 files changed, 2 insertions(+), 2 deletions(-)
17 17
18diff --git a/libgfortran/configure b/libgfortran/configure 18diff --git a/libgfortran/configure b/libgfortran/configure
19index 487d8c090e2..a02b49293ac 100755 19index 60867b93d0e..3fc9fca5b7b 100755
20--- a/libgfortran/configure 20--- a/libgfortran/configure
21+++ b/libgfortran/configure 21+++ b/libgfortran/configure
22@@ -13056,7 +13056,7 @@ esac 22@@ -13071,7 +13071,7 @@ esac
23 23
24 # We need gfortran to compile parts of the library 24 # We need gfortran to compile parts of the library
25 #AC_PROG_FC(gfortran) 25 #AC_PROG_FC(gfortran)
@@ -29,7 +29,7 @@ index 487d8c090e2..a02b49293ac 100755
29 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' 29 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
30 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' 30 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
31diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac 31diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
32index c06db7b1a78..5b4b1b7f1f2 100644 32index 7cfce28ab69..6cd515ee1a4 100644
33--- a/libgfortran/configure.ac 33--- a/libgfortran/configure.ac
34+++ b/libgfortran/configure.ac 34+++ b/libgfortran/configure.ac
35@@ -250,7 +250,7 @@ AC_SUBST(enable_static) 35@@ -250,7 +250,7 @@ AC_SUBST(enable_static)
@@ -42,5 +42,5 @@ index c06db7b1a78..5b4b1b7f1f2 100644
42 42
43 # extra LD Flags which are required for targets 43 # extra LD Flags which are required for targets
44-- 44--
452.20.1 452.22.1
46 46
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0010-cpp-honor-sysroot.patch b/meta/recipes-devtools/gcc/gcc-9.2/0009-cpp-honor-sysroot.patch
index b680e6fc38..6af0a0124a 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0010-cpp-honor-sysroot.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0009-cpp-honor-sysroot.patch
@@ -1,7 +1,7 @@
1From c2ec131f19d656fd916c45f51186633c789db6e9 Mon Sep 17 00:00:00 2001 1From 45e9cd39d9c62454d46b9e9473a0c1034ceca15d 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 10/37] cpp: honor sysroot. 4Subject: [PATCH 09/36] 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
@@ -37,7 +37,7 @@ index c6e42eda283..e1ddf066467 100644
37+ " cc1plus -fpreprocessed %i %I %(cc1_options) %2" 37+ " cc1plus -fpreprocessed %i %I %(cc1_options) %2"
38 " %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, 38 " %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
39diff --git a/gcc/gcc.c b/gcc/gcc.c 39diff --git a/gcc/gcc.c b/gcc/gcc.c
40index 30845e5b125..cef26c454d7 100644 40index 7da9c5d457b..4e7c45b268c 100644
41--- a/gcc/gcc.c 41--- a/gcc/gcc.c
42+++ b/gcc/gcc.c 42+++ b/gcc/gcc.c
43@@ -1349,7 +1349,7 @@ static const struct compiler default_compilers[] = 43@@ -1349,7 +1349,7 @@ static const struct compiler default_compilers[] =
@@ -50,5 +50,5 @@ index 30845e5b125..cef26c454d7 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.20.1 532.22.1
54 54
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0011-MIPS64-Default-to-N64-ABI.patch b/meta/recipes-devtools/gcc/gcc-9.2/0010-MIPS64-Default-to-N64-ABI.patch
index d59a31be10..bc0c6d5bed 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0011-MIPS64-Default-to-N64-ABI.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0010-MIPS64-Default-to-N64-ABI.patch
@@ -1,7 +1,7 @@
1From 52b915732de89d8676868641af462df81211bb39 Mon Sep 17 00:00:00 2001 1From 1ff4108d707b34e399e9dc418ad1ecc42f72676d 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 11/37] MIPS64: Default to N64 ABI 4Subject: [PATCH 10/36] MIPS64: Default to N64 ABI
5 5
6MIPS64 defaults to n32 ABI, this patch makes it 6MIPS64 defaults to n32 ABI, this patch makes it
7so that it defaults to N64 ABI 7so that it defaults to N64 ABI
@@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [OE config specific]
14 1 file changed, 5 insertions(+), 5 deletions(-) 14 1 file changed, 5 insertions(+), 5 deletions(-)
15 15
16diff --git a/gcc/config.gcc b/gcc/config.gcc 16diff --git a/gcc/config.gcc b/gcc/config.gcc
17index a189cb19f63..293ed8d585d 100644 17index ddd3b8f4d9d..fdfc0bd3e82 100644
18--- a/gcc/config.gcc 18--- a/gcc/config.gcc
19+++ b/gcc/config.gcc 19+++ b/gcc/config.gcc
20@@ -2267,29 +2267,29 @@ mips*-*-linux*) # Linux MIPS, either endian. 20@@ -2282,29 +2282,29 @@ mips*-*-linux*) # Linux MIPS, either endian.
21 default_mips_arch=mips32 21 default_mips_arch=mips32
22 ;; 22 ;;
23 mips64el-st-linux-gnu) 23 mips64el-st-linux-gnu)
@@ -53,5 +53,5 @@ index a189cb19f63..293ed8d585d 100644
53 ;; 53 ;;
54 esac 54 esac
55-- 55--
562.20.1 562.22.1
57 57
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
index 1ff85c8073..21908bce9b 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
@@ -1,7 +1,7 @@
1From 0e13b09ae400d8c8755e2869c72a158ed0dbc0b6 Mon Sep 17 00:00:00 2001 1From a93743732b2125aebd9a6d65e999d7506b01d6b3 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 12/37] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER 4Subject: [PATCH 11/36] 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
@@ -23,12 +23,11 @@ Upstream-Status: Inappropriate [OE configuration]
23 gcc/config/i386/linux64.h | 6 +++--- 23 gcc/config/i386/linux64.h | 6 +++---
24 gcc/config/linux.h | 8 ++++---- 24 gcc/config/linux.h | 8 ++++----
25 gcc/config/mips/linux.h | 12 ++++++------ 25 gcc/config/mips/linux.h | 12 ++++++------
26 gcc/config/riscv/linux.h | 2 +-
27 gcc/config/rs6000/linux64.h | 15 +++++---------- 26 gcc/config/rs6000/linux64.h | 15 +++++----------
28 gcc/config/sh/linux.h | 2 +- 27 gcc/config/sh/linux.h | 2 +-
29 gcc/config/sparc/linux.h | 2 +- 28 gcc/config/sparc/linux.h | 2 +-
30 gcc/config/sparc/linux64.h | 4 ++-- 29 gcc/config/sparc/linux64.h | 4 ++--
31 12 files changed, 29 insertions(+), 34 deletions(-) 30 11 files changed, 28 insertions(+), 33 deletions(-)
32 31
33diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h 32diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
34index 824861befec..6afacce3292 100644 33index 824861befec..6afacce3292 100644
@@ -153,24 +152,11 @@ index 6f79ac9c01a..25de96f9561 100644
153 152
154 #undef MUSL_DYNAMIC_LINKER32 153 #undef MUSL_DYNAMIC_LINKER32
155 #define MUSL_DYNAMIC_LINKER32 \ 154 #define MUSL_DYNAMIC_LINKER32 \
156diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
157index 58dd18b89f3..112ba9cd764 100644
158--- a/gcc/config/riscv/linux.h
159+++ b/gcc/config/riscv/linux.h
160@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see
161 GNU_USER_TARGET_OS_CPP_BUILTINS(); \
162 } while (0)
163
164-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1"
165+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1"
166
167 #define MUSL_ABI_SUFFIX \
168 "%{mabi=ilp32:-sf}" \
169diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h 155diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
170index 5380f6a6a6f..c0f2dc1f43e 100644 156index 9946d3fed94..45a9a7cae59 100644
171--- a/gcc/config/rs6000/linux64.h 157--- a/gcc/config/rs6000/linux64.h
172+++ b/gcc/config/rs6000/linux64.h 158+++ b/gcc/config/rs6000/linux64.h
173@@ -435,24 +435,19 @@ extern int dot_symbols; 159@@ -423,24 +423,19 @@ extern int dot_symbols;
174 #undef LINK_OS_DEFAULT_SPEC 160 #undef LINK_OS_DEFAULT_SPEC
175 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" 161 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
176 162
@@ -242,5 +228,5 @@ index 789d1df4bd5..b920c680fb1 100644
242 #ifdef SPARC_BI_ARCH 228 #ifdef SPARC_BI_ARCH
243 229
244-- 230--
2452.20.1 2312.22.1
246 232
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0013-gcc-Fix-argument-list-too-long-error.patch b/meta/recipes-devtools/gcc/gcc-9.2/0012-gcc-Fix-argument-list-too-long-error.patch
index f853ff90d2..60539795c5 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0013-gcc-Fix-argument-list-too-long-error.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0012-gcc-Fix-argument-list-too-long-error.patch
@@ -1,7 +1,7 @@
1From d8a24eca2d7a222d4910c8a508d75d0d1418e201 Mon Sep 17 00:00:00 2001 1From 2cb227cd8069c73242286f64183fb203f8d2618a 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 13/37] gcc: Fix argument list too long error. 4Subject: [PATCH 12/36] 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 3ccff1614bb..88b1aec732b 100644 26index 41f0f592ff4..0064a282488 100644
27--- a/gcc/Makefile.in 27--- a/gcc/Makefile.in
28+++ b/gcc/Makefile.in 28+++ b/gcc/Makefile.in
29@@ -3538,7 +3538,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype 29@@ -3537,7 +3537,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 3ccff1614bb..88b1aec732b 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.20.1 392.22.1
40 40
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0014-Disable-sdt.patch b/meta/recipes-devtools/gcc/gcc-9.2/0013-Disable-sdt.patch
index 945cf8f8af..a21a63c617 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0014-Disable-sdt.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0013-Disable-sdt.patch
@@ -1,7 +1,7 @@
1From d5e52580314ef6056ca701fcc030c7c884cb1d7f Mon Sep 17 00:00:00 2001 1From aea5ffa9d704f4eb8fa93366884d3c26a1dbec49 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 14/37] Disable sdt. 4Subject: [PATCH 13/36] 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 7acc7e487b0..6a87ab693ea 100755 28index e3bcf8abe9a..1f1d22ca666 100755
29--- a/gcc/configure 29--- a/gcc/configure
30+++ b/gcc/configure 30+++ b/gcc/configure
31@@ -29292,12 +29292,12 @@ fi 31@@ -29332,12 +29332,12 @@ fi
32 { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5 32 { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5
33 $as_echo_n "checking sys/sdt.h in the target C library... " >&6; } 33 $as_echo_n "checking sys/sdt.h in the target C library... " >&6; }
34 have_sys_sdt_h=no 34 have_sys_sdt_h=no
@@ -48,10 +48,10 @@ index 7acc7e487b0..6a87ab693ea 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 f5d5e5c16a8..a50765171be 100644 51index 2ebc377a74d..ddc85197588 100644
52--- a/gcc/configure.ac 52--- a/gcc/configure.ac
53+++ b/gcc/configure.ac 53+++ b/gcc/configure.ac
54@@ -5985,15 +5985,15 @@ fi 54@@ -5995,15 +5995,15 @@ fi
55 AC_SUBST([enable_default_ssp]) 55 AC_SUBST([enable_default_ssp])
56 56
57 # Test for <sys/sdt.h> on the target. 57 # Test for <sys/sdt.h> on the target.
@@ -77,10 +77,10 @@ index f5d5e5c16a8..a50765171be 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 15848e364ab..8d3da1cc526 100755 80index 5acf79cba54..191bc6c5796 100755
81--- a/libstdc++-v3/configure 81--- a/libstdc++-v3/configure
82+++ b/libstdc++-v3/configure 82+++ b/libstdc++-v3/configure
83@@ -22084,11 +22084,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 83@@ -22085,11 +22085,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,7 +96,7 @@ index 15848e364ab..8d3da1cc526 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 ad5b4117cfd..2341645ba6f 100644 99index dadd8827b49..6b1ce9957d3 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@@ -230,7 +230,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN
@@ -109,5 +109,5 @@ index ad5b4117cfd..2341645ba6f 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.20.1 1122.22.1
113 113
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0015-libtool.patch b/meta/recipes-devtools/gcc/gcc-9.2/0014-libtool.patch
index 764460b89e..7a8f3afecf 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0015-libtool.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0014-libtool.patch
@@ -1,7 +1,7 @@
1From d7c605d92094c75dc2717d9dd830e525b2c8b0ff Mon Sep 17 00:00:00 2001 1From 6c4d0c303ebc3e1c7e554d54a8bb807d77ed41fd 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 15/37] libtool 4Subject: [PATCH 14/36] 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.20.1 412.22.1
42 42
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0016-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/meta/recipes-devtools/gcc/gcc-9.2/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
index 398074b5cc..d06ae27028 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0016-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
@@ -1,7 +1,7 @@
1From c3addf8bc41190d46d98eb7690ff4583eebd5943 Mon Sep 17 00:00:00 2001 1From c5662ff1e7dea2291b9cb7a83cfff3001dd31f53 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 16/37] gcc: armv4: pass fix-v4bx to linker to support EABI. 4Subject: [PATCH 15/36] 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.20.1 422.22.1
43 43
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0017-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/meta/recipes-devtools/gcc/gcc-9.2/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch
index 7d5c94a646..310caec4a1 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0017-Use-the-multilib-config-files-from-B-instead-of-usin.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch
@@ -1,7 +1,7 @@
1From e1071f4e749586fcb3edcacf43d4dd44081d16ec Mon Sep 17 00:00:00 2001 1From e3b693b9d6dc9496f7c98a13b28182d23084215c 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 17/37] Use the multilib config files from ${B} instead of 4Subject: [PATCH 16/36] 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,7 +18,7 @@ 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 6a87ab693ea..2e822caf66d 100755 21index 1f1d22ca666..911de2cf017 100755
22--- a/gcc/configure 22--- a/gcc/configure
23+++ b/gcc/configure 23+++ b/gcc/configure
24@@ -12321,10 +12321,20 @@ done 24@@ -12321,10 +12321,20 @@ done
@@ -58,7 +58,7 @@ index 6a87ab693ea..2e822caf66d 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 a50765171be..70e7bac78c4 100644 61index ddc85197588..b413ae9bf25 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 a50765171be..70e7bac78c4 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.20.1 1012.22.1
102 102
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0018-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/meta/recipes-devtools/gcc/gcc-9.2/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
index 596337bc1f..ad1d1d4eb0 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0018-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
@@ -1,7 +1,7 @@
1From 1ffbbb39c9848aa7a04da18fb79b1f0bd7731e00 Mon Sep 17 00:00:00 2001 1From 09d9ccc1d471020949d1285a5276f17504fd60dd 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 18/37] Avoid using libdir from .la which usually points to a 4Subject: [PATCH 17/36] 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.20.1 302.22.1
31 31
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0019-export-CPP.patch b/meta/recipes-devtools/gcc/gcc-9.2/0018-export-CPP.patch
index 50d17dd962..0f728ec542 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0019-export-CPP.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0018-export-CPP.patch
@@ -1,7 +1,7 @@
1From 5ece023b88eaba16d8744f8f2ff72345ec3b7f92 Mon Sep 17 00:00:00 2001 1From 987338cd847a723de533bb317e452a60b1e52165 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 19/37] export CPP 4Subject: [PATCH 18/36] 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
@@ -37,7 +37,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
37 1 file changed, 1 insertion(+) 37 1 file changed, 1 insertion(+)
38 38
39diff --git a/Makefile.in b/Makefile.in 39diff --git a/Makefile.in b/Makefile.in
40index 28539a45372..b21e0791f55 100644 40index 64e091ba71d..255822e3f27 100644
41--- a/Makefile.in 41--- a/Makefile.in
42+++ b/Makefile.in 42+++ b/Makefile.in
43@@ -149,6 +149,7 @@ BUILD_EXPORTS = \ 43@@ -149,6 +149,7 @@ BUILD_EXPORTS = \
@@ -49,5 +49,5 @@ index 28539a45372..b21e0791f55 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.20.1 522.22.1
53 53
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0020-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch
index f37c6f39aa..4809bdf4bd 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0020-Ensure-target-gcc-headers-can-be-included.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch
@@ -1,7 +1,7 @@
1From 89f7a8e5c55b31bff011cd7466d78cd84d1eb307 Mon Sep 17 00:00:00 2001 1From 5225980db3e03b2fe6597393d7177d0cafd1b1d9 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 20/37] Ensure target gcc headers can be included 4Subject: [PATCH 19/36] Ensure target gcc headers can be included
5 5
6There are a few headers installed as part of the OpenEmbedded 6There are a few headers installed as part of the OpenEmbedded
7gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe 7gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe
@@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
23 4 files changed, 15 insertions(+), 7 deletions(-) 23 4 files changed, 15 insertions(+), 7 deletions(-)
24 24
25diff --git a/gcc/Makefile.in b/gcc/Makefile.in 25diff --git a/gcc/Makefile.in b/gcc/Makefile.in
26index 88b1aec732b..eb1dc304de2 100644 26index 0064a282488..21472745c2c 100644
27--- a/gcc/Makefile.in 27--- a/gcc/Makefile.in
28+++ b/gcc/Makefile.in 28+++ b/gcc/Makefile.in
29@@ -618,6 +618,7 @@ libexecdir = @libexecdir@ 29@@ -618,6 +618,7 @@ libexecdir = @libexecdir@
@@ -34,7 +34,7 @@ index 88b1aec732b..eb1dc304de2 100644
34 # Directory in which the compiler finds executables 34 # Directory in which the compiler finds executables
35 libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) 35 libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
36 # Directory in which all plugin resources are installed 36 # Directory in which all plugin resources are installed
37@@ -2867,6 +2868,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" 37@@ -2866,6 +2867,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\"
38 38
39 PREPROCESSOR_DEFINES = \ 39 PREPROCESSOR_DEFINES = \
40 -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ 40 -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
@@ -76,7 +76,7 @@ index b7534256119..41ca579b267 100644
76+ 76+
77 #endif /* ! GCC_DEFAULTS_H */ 77 #endif /* ! GCC_DEFAULTS_H */
78diff --git a/gcc/gcc.c b/gcc/gcc.c 78diff --git a/gcc/gcc.c b/gcc/gcc.c
79index cef26c454d7..14b1a6e8c44 100644 79index 4e7c45b268c..1a3704b2763 100644
80--- a/gcc/gcc.c 80--- a/gcc/gcc.c
81+++ b/gcc/gcc.c 81+++ b/gcc/gcc.c
82@@ -1470,13 +1470,6 @@ static const char *gcc_libexec_prefix; 82@@ -1470,13 +1470,6 @@ static const char *gcc_libexec_prefix;
@@ -94,5 +94,5 @@ index cef26c454d7..14b1a6e8c44 100644
94 #undef MD_EXEC_PREFIX 94 #undef MD_EXEC_PREFIX
95 #undef MD_STARTFILE_PREFIX 95 #undef MD_STARTFILE_PREFIX
96-- 96--
972.20.1 972.22.1
98 98
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0021-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch b/meta/recipes-devtools/gcc/gcc-9.2/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
index ef985727a6..b0f96d06d4 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0021-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
@@ -1,7 +1,7 @@
1From 2a1895aca3d9020d0d5ac74975221727384ef8a6 Mon Sep 17 00:00:00 2001 1From 83bcd4cc47ae63971c888c117abd00dfd506532c 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 21/37] gcc 4.8+ won't build with --disable-dependency-tracking 4Subject: [PATCH 20/36] 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.20.1 532.22.1
54 54
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0022-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/meta/recipes-devtools/gcc/gcc-9.2/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch
index 8316c4d814..f36ca29b9e 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0022-Don-t-search-host-directory-during-relink-if-inst_pr.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch
@@ -1,7 +1,7 @@
1From 4b9f8cfbfb48a1a9781b7c3a9b867732ef37b7c5 Mon Sep 17 00:00:00 2001 1From 667cc8d43e8fb4ac09654ee408da482f96b09580 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 22/37] Don't search host directory during "relink" if 4Subject: [PATCH 21/36] 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.20.1 372.22.1
38 38
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0023-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc-9.2/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
index fdea599abd..d5b9150023 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0023-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
@@ -1,7 +1,7 @@
1From 3a554b321250f6ddf1277e5559890ee977e78cb0 Mon Sep 17 00:00:00 2001 1From 279c4de48e3fd61e2f268787ed3f1d69ed9224f8 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 23/37] Use SYSTEMLIBS_DIR replacement instead of hardcoding 4Subject: [PATCH 22/36] Use SYSTEMLIBS_DIR replacement instead of hardcoding
5 base_libdir 5 base_libdir
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
13 13
14diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h 14diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
15index 9d0292d64f2..51661995fc7 100644 15index 5e8b34ded03..7e628bf661e 100644
16--- a/gcc/config/aarch64/aarch64-linux.h 16--- a/gcc/config/aarch64/aarch64-linux.h
17+++ b/gcc/config/aarch64/aarch64-linux.h 17+++ b/gcc/config/aarch64/aarch64-linux.h
18@@ -21,7 +21,7 @@ 18@@ -21,7 +21,7 @@
@@ -25,5 +25,5 @@ index 9d0292d64f2..51661995fc7 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.20.1 282.22.1
29 29
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0024-aarch64-Add-support-for-musl-ldso.patch b/meta/recipes-devtools/gcc/gcc-9.2/0023-aarch64-Add-support-for-musl-ldso.patch
index f53c9949c7..f811306c31 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0024-aarch64-Add-support-for-musl-ldso.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0023-aarch64-Add-support-for-musl-ldso.patch
@@ -1,7 +1,7 @@
1From b7001034f35e7e5090fa95cb9a622469300cd45d Mon Sep 17 00:00:00 2001 1From 1277d12058334087443828dfd57d44e3b1dfcc9a 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 24/37] aarch64: Add support for musl ldso 4Subject: [PATCH 23/36] aarch64: Add support for musl ldso
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h 13diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
14index 51661995fc7..db687f753f6 100644 14index 7e628bf661e..1717cbe5471 100644
15--- a/gcc/config/aarch64/aarch64-linux.h 15--- a/gcc/config/aarch64/aarch64-linux.h
16+++ b/gcc/config/aarch64/aarch64-linux.h 16+++ b/gcc/config/aarch64/aarch64-linux.h
17@@ -24,7 +24,7 @@ 17@@ -24,7 +24,7 @@
@@ -24,5 +24,5 @@ index 51661995fc7..db687f753f6 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.20.1 272.22.1
28 28
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0025-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/meta/recipes-devtools/gcc/gcc-9.2/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch
index 7b80655b68..298b0962f6 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0025-libcc1-fix-libcc1-s-install-path-and-rpath.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch
@@ -1,7 +1,7 @@
1From 4d05ea7a12d1ba4515220c5c16f71ac650219db6 Mon Sep 17 00:00:00 2001 1From 4a0487ad75accd780dd155aa59086cc4b11cfc47 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 25/37] libcc1: fix libcc1's install path and rpath 4Subject: [PATCH 24/36] 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.20.1 532.22.1
54 54
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0026-handle-sysroot-support-for-nativesdk-gcc.patch b/meta/recipes-devtools/gcc/gcc-9.2/0025-handle-sysroot-support-for-nativesdk-gcc.patch
index 7062c03197..ba62bc1fd3 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0026-handle-sysroot-support-for-nativesdk-gcc.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0025-handle-sysroot-support-for-nativesdk-gcc.patch
@@ -1,7 +1,7 @@
1From fe175ac845f1ac6965ede0240e9b763ae520614d Mon Sep 17 00:00:00 2001 1From a183c82ea2af934a8d30055a791dc1d80c9067a9 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 26/37] handle sysroot support for nativesdk-gcc 4Subject: [PATCH 25/36] 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
@@ -149,7 +149,7 @@ index e2d96f1e760..29fa5f815c8 100644
149 (see update_path in prefix.c) */ 149 (see update_path in prefix.c) */
150 const char cplusplus; /* Only look here if we're compiling C++. */ 150 const char cplusplus; /* Only look here if we're compiling C++. */
151diff --git a/gcc/gcc.c b/gcc/gcc.c 151diff --git a/gcc/gcc.c b/gcc/gcc.c
152index 14b1a6e8c44..857310092d9 100644 152index 1a3704b2763..db0e2934038 100644
153--- a/gcc/gcc.c 153--- a/gcc/gcc.c
154+++ b/gcc/gcc.c 154+++ b/gcc/gcc.c
155@@ -253,6 +253,8 @@ FILE *report_times_to_file = NULL; 155@@ -253,6 +253,8 @@ FILE *report_times_to_file = NULL;
@@ -209,5 +209,5 @@ index 14b1a6e8c44..857310092d9 100644
209 value = do_spec_1 (startfile_spec, 0, NULL); 209 value = do_spec_1 (startfile_spec, 0, NULL);
210 if (value != 0) 210 if (value != 0)
211-- 211--
2122.20.1 2122.22.1
213 213
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0027-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/meta/recipes-devtools/gcc/gcc-9.2/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch
index e3ec943bfe..fde206eb71 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0027-Search-target-sysroot-gcc-version-specific-dirs-with.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch
@@ -1,7 +1,7 @@
1From bf07530706382c90fb89f7d8a727eb9aeb29a56a Mon Sep 17 00:00:00 2001 1From dab4db14e319f3239a2b4c7d1fbf2971936e27ba 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 27/37] Search target sysroot gcc version specific dirs with 4Subject: [PATCH 26/36] 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,7 +51,7 @@ 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 857310092d9..6363e63b8ff 100644 54index db0e2934038..1c21d1b08eb 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@@ -2610,7 +2610,7 @@ for_each_path (const struct path_prefix *paths,
@@ -98,5 +98,5 @@ index 857310092d9..6363e63b8ff 100644
98 ret = callback (path, callback_info); 98 ret = callback (path, callback_info);
99 if (ret) 99 if (ret)
100-- 100--
1012.20.1 1012.22.1
102 102
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0028-Fix-various-_FOR_BUILD-and-related-variables.patch b/meta/recipes-devtools/gcc/gcc-9.2/0027-Fix-various-_FOR_BUILD-and-related-variables.patch
index bdcbd323cb..5d89e8e7e2 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0028-Fix-various-_FOR_BUILD-and-related-variables.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0027-Fix-various-_FOR_BUILD-and-related-variables.patch
@@ -1,7 +1,7 @@
1From 16ab14b7221b3491cd43ab745f57b60ca83089df Mon Sep 17 00:00:00 2001 1From 8e84bb09d2b7a60487a30e438bb109f31c2c254b 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 28/37] Fix various _FOR_BUILD and related variables 4Subject: [PATCH 27/36] 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
@@ -26,7 +26,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
26 5 files changed, 14 insertions(+), 3 deletions(-) 26 5 files changed, 14 insertions(+), 3 deletions(-)
27 27
28diff --git a/Makefile.in b/Makefile.in 28diff --git a/Makefile.in b/Makefile.in
29index b21e0791f55..0e573791202 100644 29index 255822e3f27..9dc0dff0474 100644
30--- a/Makefile.in 30--- a/Makefile.in
31+++ b/Makefile.in 31+++ b/Makefile.in
32@@ -152,6 +152,7 @@ BUILD_EXPORTS = \ 32@@ -152,6 +152,7 @@ BUILD_EXPORTS = \
@@ -64,7 +64,7 @@ index b21e0791f55..0e573791202 100644
64 "FLEX=$(FLEX)" \ 64 "FLEX=$(FLEX)" \
65 "INSTALL=$(INSTALL)" \ 65 "INSTALL=$(INSTALL)" \
66diff --git a/Makefile.tpl b/Makefile.tpl 66diff --git a/Makefile.tpl b/Makefile.tpl
67index 126296fb49a..15fb236bcc0 100644 67index 41cae58a267..d3f6b79acdc 100644
68--- a/Makefile.tpl 68--- a/Makefile.tpl
69+++ b/Makefile.tpl 69+++ b/Makefile.tpl
70@@ -154,6 +154,7 @@ BUILD_EXPORTS = \ 70@@ -154,6 +154,7 @@ BUILD_EXPORTS = \
@@ -94,7 +94,7 @@ index 126296fb49a..15fb236bcc0 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 eb1dc304de2..93a43146846 100644 97index 21472745c2c..8c93f03ffdc 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,7 +107,7 @@ index eb1dc304de2..93a43146846 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 2e822caf66d..2c50676a2bf 100755 110index 911de2cf017..325ace34cdf 100755
111--- a/gcc/configure 111--- a/gcc/configure
112+++ b/gcc/configure 112+++ b/gcc/configure
113@@ -11965,7 +11965,7 @@ else 113@@ -11965,7 +11965,7 @@ else
@@ -120,7 +120,7 @@ index 2e822caf66d..2c50676a2bf 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 70e7bac78c4..d29eb580429 100644 123index b413ae9bf25..72a6c95121b 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 70e7bac78c4..d29eb580429 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.20.1 1362.22.1
137 137
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0029-nios2-Define-MUSL_DYNAMIC_LINKER.patch b/meta/recipes-devtools/gcc/gcc-9.2/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch
index 08da1ab986..84d92a337e 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0029-nios2-Define-MUSL_DYNAMIC_LINKER.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch
@@ -1,7 +1,7 @@
1From e293df9a5734b43cb60cc47a3f5ff9af50fee3aa Mon Sep 17 00:00:00 2001 1From 5647f773e28b528a67800ef06ca44730f9f5dc7e 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 29/37] nios2: Define MUSL_DYNAMIC_LINKER 4Subject: [PATCH 28/36] 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.20.1 272.22.1
28 28
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0030-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta/recipes-devtools/gcc/gcc-9.2/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
index 792e852614..d19e5a08b9 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0030-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
@@ -1,7 +1,7 @@
1From 6232013df7fd65c994869789fa4b93c8d2303d1c Mon Sep 17 00:00:00 2001 1From 474043ca7a064ca7b0a32308a0ed6f7c546f17b2 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 30/37] Add ssp_nonshared to link commandline for musl targets 4Subject: [PATCH 29/36] 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
@@ -41,10 +41,10 @@ index 4b05d8e93d1..0ca117e2ed4 100644
41 41
42 #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ 42 #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
43diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h 43diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h
44index 96b97877989..0bbde54c844 100644 44index ffceb32bf65..c82cb2ad05b 100644
45--- a/gcc/config/rs6000/linux.h 45--- a/gcc/config/rs6000/linux.h
46+++ b/gcc/config/rs6000/linux.h 46+++ b/gcc/config/rs6000/linux.h
47@@ -107,6 +107,16 @@ 47@@ -94,6 +94,16 @@
48 " -m elf32ppclinux") 48 " -m elf32ppclinux")
49 #endif 49 #endif
50 50
@@ -62,10 +62,10 @@ index 96b97877989..0bbde54c844 100644
62 #define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \ 62 #define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \
63 %{!static-pie: \ 63 %{!static-pie: \
64diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h 64diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
65index 982ca274621..83c07b275da 100644 65index 45a9a7cae59..d1e88a40e82 100644
66--- a/gcc/config/rs6000/linux64.h 66--- a/gcc/config/rs6000/linux64.h
67+++ b/gcc/config/rs6000/linux64.h 67+++ b/gcc/config/rs6000/linux64.h
68@@ -461,6 +461,16 @@ extern int dot_symbols; 68@@ -456,6 +456,16 @@ extern int dot_symbols;
69 " -m elf64ppc") 69 " -m elf64ppc")
70 #endif 70 #endif
71 71
@@ -83,5 +83,5 @@ index 982ca274621..83c07b275da 100644
83 %{!static-pie: \ 83 %{!static-pie: \
84 %{rdynamic:-export-dynamic} \ 84 %{rdynamic:-export-dynamic} \
85-- 85--
862.20.1 862.22.1
87 87
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0031-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch b/meta/recipes-devtools/gcc/gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch
index efa40bec5e..f5769bc8e9 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0031-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch
@@ -1,7 +1,7 @@
1From 1877b2ee5835a3716e6544706fbccd8c656e0a32 Mon Sep 17 00:00:00 2001 1From baab61ae3938ee2fa9ec03a20793508516a46dae Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Apr 2016 20:03:28 +0000 3Date: Fri, 29 Apr 2016 20:03:28 +0000
4Subject: [PATCH 31/37] libgcc: Add knob to use ldbl-128 on ppc 4Subject: [PATCH 30/36] libgcc: Add knob to use ldbl-128 on ppc
5 5
6musl does not support ldbl 128 so we can not assume 6musl does not support ldbl 128 so we can not assume
7that linux as a whole supports ldbl-128 bits, instead 7that linux as a whole supports ldbl-128 bits, instead
@@ -121,5 +121,5 @@ index 8e96cafdf8b..9247856bf24 100644
121 [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], 121 [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
122 [shared library versioning (aka "SONAME") variant to provide on AIX])], 122 [shared library versioning (aka "SONAME") variant to provide on AIX])],
123-- 123--
1242.20.1 1242.22.1
125 125
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0032-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch b/meta/recipes-devtools/gcc/gcc-9.2/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
index 3de8345f93..dc2141d70c 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0032-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
@@ -1,7 +1,7 @@
1From 9d76a765a12677597134953352b25dc16dea721e Mon Sep 17 00:00:00 2001 1From 266dcc78e4d9d38de2809118977d97dc9270cf1f 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 32/37] Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS 4Subject: [PATCH 31/36] 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.20.1 282.22.1
29 29
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0033-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/meta/recipes-devtools/gcc/gcc-9.2/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
index d8cc643211..8dde016ce5 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0033-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
@@ -1,7 +1,7 @@
1From 6c001e08bcd0568367a4aa2f991ab7d85b43a43d Mon Sep 17 00:00:00 2001 1From 9975b6ed3570bbf7c7d2d82f4d5f733d24ccacf5 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 33/37] libgcc_s: Use alias for __cpu_indicator_init instead of 4Subject: [PATCH 32/36] 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 88557f26c44..839308e2799 100644 42index 2b37296e537..dd380ddba88 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@@ -36577,10 +36577,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, 45@@ -36658,10 +36658,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.20.1 852.22.1
86 86
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0034-sync-gcc-stddef.h-with-musl.patch b/meta/recipes-devtools/gcc/gcc-9.2/0033-sync-gcc-stddef.h-with-musl.patch
index a2c35ab537..b99ac429a0 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0034-sync-gcc-stddef.h-with-musl.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0033-sync-gcc-stddef.h-with-musl.patch
@@ -1,7 +1,7 @@
1From 83ba95929c5908ae0f51ce148a30f85b085a178a Mon Sep 17 00:00:00 2001 1From 39e2f61d262f9f6c7a91068998dea80791ef665e 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 34/37] sync gcc stddef.h with musl 4Subject: [PATCH 33/36] 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.20.1 902.22.1
91 91
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0035-fix-segmentation-fault-in-precompiled-header-generat.patch b/meta/recipes-devtools/gcc/gcc-9.2/0034-fix-segmentation-fault-in-precompiled-header-generat.patch
index ad1f6e7d10..06a3c9f884 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0035-fix-segmentation-fault-in-precompiled-header-generat.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0034-fix-segmentation-fault-in-precompiled-header-generat.patch
@@ -1,7 +1,7 @@
1From c4f89e62c56975fee99304c9cbbe5be6e8bc9ed6 Mon Sep 17 00:00:00 2001 1From aaa896a57b0004a74c1d474e74b21f41147a65cb 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 35/37] fix segmentation fault in precompiled header generation 4Subject: [PATCH 34/36] 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.20.1 592.22.1
60 60
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0036-Fix-for-testsuite-failure.patch b/meta/recipes-devtools/gcc/gcc-9.2/0035-Fix-for-testsuite-failure.patch
index 4fb0698afc..7470cbfcfc 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0036-Fix-for-testsuite-failure.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0035-Fix-for-testsuite-failure.patch
@@ -1,7 +1,7 @@
1From 8d773b5ba6cf396ca76611963127ba2b516272b3 Mon Sep 17 00:00:00 2001 1From 0f9d449c739df03782ce9d29f6b68d9af976a607 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 36/37] Fix for testsuite failure 4Subject: [PATCH 35/36] 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
@@ -139,7 +139,7 @@ index ea896b7ebfd..bf15569b826 100644
139 #include "funcspec-56.inc" 139 #include "funcspec-56.inc"
140 140
141diff --git a/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c b/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c 141diff --git a/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c b/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c
142index 3fbdc881dda..6b4d9d1252a 100644 142index 8561a3c26d6..6377f814645 100644
143--- a/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c 143--- a/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c
144+++ b/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c 144+++ b/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c
145@@ -1,5 +1,5 @@ 145@@ -1,5 +1,5 @@
@@ -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.20.1 2572.22.1
258 258
diff --git a/meta/recipes-devtools/gcc/gcc-9.1/0037-Re-introduce-spe-commandline-options.patch b/meta/recipes-devtools/gcc/gcc-9.2/0036-Re-introduce-spe-commandline-options.patch
index 251097e131..4dbcd98945 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1/0037-Re-introduce-spe-commandline-options.patch
+++ b/meta/recipes-devtools/gcc/gcc-9.2/0036-Re-introduce-spe-commandline-options.patch
@@ -1,7 +1,7 @@
1From 49d3dbe240226206d09ff646499cd398cb60bd12 Mon Sep 17 00:00:00 2001 1From 71e99c2b58a9eb00cdd65a04aeb6fb78227e3297 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 37/37] Re-introduce spe commandline options 4Subject: [PATCH 36/36] 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
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 12 insertions(+) 14 1 file changed, 12 insertions(+)
15 15
16diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt 16diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
17index 2e90bf37747..ebd297da46b 100644 17index f4b5c91e11f..69869350fce 100644
18--- a/gcc/config/rs6000/rs6000.opt 18--- a/gcc/config/rs6000/rs6000.opt
19+++ b/gcc/config/rs6000/rs6000.opt 19+++ b/gcc/config/rs6000/rs6000.opt
20@@ -345,6 +345,18 @@ mdebug= 20@@ -345,6 +345,18 @@ mdebug=
@@ -37,5 +37,5 @@ index 2e90bf37747..ebd297da46b 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.20.1 402.22.1
41 41
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_9.1.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_9.2.bb
index bf53c5cd78..bf53c5cd78 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_9.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_9.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross_9.1.bb b/meta/recipes-devtools/gcc/gcc-cross_9.2.bb
index b43cca0c52..b43cca0c52 100644
--- a/meta/recipes-devtools/gcc/gcc-cross_9.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross_9.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_9.1.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_9.2.bb
index 40a6c4feff..40a6c4feff 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk_9.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk_9.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_9.1.bb b/meta/recipes-devtools/gcc/gcc-runtime_9.2.bb
index dd430b57eb..dd430b57eb 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime_9.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-runtime_9.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_9.1.bb b/meta/recipes-devtools/gcc/gcc-sanitizers_9.2.bb
index f3c7058114..f3c7058114 100644
--- a/meta/recipes-devtools/gcc/gcc-sanitizers_9.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-sanitizers_9.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-source_9.1.bb b/meta/recipes-devtools/gcc/gcc-source_9.2.bb
index b890fa33ea..b890fa33ea 100644
--- a/meta/recipes-devtools/gcc/gcc-source_9.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-source_9.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc_9.1.bb b/meta/recipes-devtools/gcc/gcc_9.2.bb
index 7d93590588..7d93590588 100644
--- a/meta/recipes-devtools/gcc/gcc_9.1.bb
+++ b/meta/recipes-devtools/gcc/gcc_9.2.bb
diff --git a/meta/recipes-devtools/gcc/libgcc-initial_9.1.bb b/meta/recipes-devtools/gcc/libgcc-initial_9.2.bb
index 0c698c26ec..0c698c26ec 100644
--- a/meta/recipes-devtools/gcc/libgcc-initial_9.1.bb
+++ b/meta/recipes-devtools/gcc/libgcc-initial_9.2.bb
diff --git a/meta/recipes-devtools/gcc/libgcc_9.1.bb b/meta/recipes-devtools/gcc/libgcc_9.2.bb
index ea210a1130..ea210a1130 100644
--- a/meta/recipes-devtools/gcc/libgcc_9.1.bb
+++ b/meta/recipes-devtools/gcc/libgcc_9.2.bb
diff --git a/meta/recipes-devtools/gcc/libgfortran_9.1.bb b/meta/recipes-devtools/gcc/libgfortran_9.2.bb
index 71dd8b4bdc..71dd8b4bdc 100644
--- a/meta/recipes-devtools/gcc/libgfortran_9.1.bb
+++ b/meta/recipes-devtools/gcc/libgfortran_9.2.bb