summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-05-12 11:30:51 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-14 14:15:11 +0100
commitd8d7d9e8f07099cbb9283b28f226bd9f17f7a50b (patch)
tree62e0def09a6ec4693bd23e7eb0b2cf30b99f3b98 /meta/recipes-devtools
parente12098a6121522c8a901397b330631ba799a0f8d (diff)
downloadpoky-d8d7d9e8f07099cbb9283b28f226bd9f17f7a50b.tar.gz
gcc10: Update to GCC 10.1 Release
* Package new gomp header acc_prof.h * Package lto-dump which is a new tool in gcc10 * All Changes are here [1] * Porting apps to gcc 10 help is here [2] * Backport a patch to fix CET errors on cross builds * Add patch to fix mingw libstdc++ [1] https://gcc.gnu.org/gcc-10/changes.html [2] https://gcc.gnu.org/gcc-10/porting_to.html (From OE-Core rev: 44c3881b18f74eb64379818fc150f94398fb8a49) 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-10.1.inc (renamed from meta/recipes-devtools/gcc/gcc-9.3.inc)53
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch)15
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0002-gcc-poison-system-directories.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0002-gcc-poison-system-directories.patch)47
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch)11
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0004-64-bit-multilib-hack.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0004-64-bit-multilib-hack.patch)15
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0005-optional-libstdc.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0005-optional-libstdc.patch)29
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0006-COLLECT_GCC_OPTIONS.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0006-COLLECT_GCC_OPTIONS.patch)11
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch)20
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0008-fortran-cross-compile-hack.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0008-fortran-cross-compile-hack.patch)15
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0009-cpp-honor-sysroot.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0009-cpp-honor-sysroot.patch)13
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0010-MIPS64-Default-to-N64-ABI.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0010-MIPS64-Default-to-N64-ABI.patch)11
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch)33
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0012-gcc-Fix-argument-list-too-long-error.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0012-gcc-Fix-argument-list-too-long-error.patch)11
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0013-Disable-sdt.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0013-Disable-sdt.patch)23
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0014-libtool.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0014-libtool.patch)9
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch)11
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch)25
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch)11
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0018-export-CPP.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0018-export-CPP.patch)9
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0019-Ensure-target-gcc-headers-can-be-included.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0019-Ensure-target-gcc-headers-can-be-included.patch)13
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch)11
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch)9
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0022-aarch64-Add-support-for-musl-ldso.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0023-aarch64-Add-support-for-musl-ldso.patch)9
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch)9
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0024-handle-sysroot-support-for-nativesdk-gcc.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0025-handle-sysroot-support-for-nativesdk-gcc.patch)112
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch)13
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0026-Fix-various-_FOR_BUILD-and-related-variables.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0027-Fix-various-_FOR_BUILD-and-related-variables.patch)27
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch)9
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch)15
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch)9
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0030-sync-gcc-stddef.h-with-musl.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0033-sync-gcc-stddef.h-with-musl.patch)9
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0031-fix-segmentation-fault-in-precompiled-header-generat.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0034-fix-segmentation-fault-in-precompiled-header-generat.patch)11
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0032-Fix-for-testsuite-failure.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0035-Fix-for-testsuite-failure.patch)9
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0033-Re-introduce-spe-commandline-options.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0036-Re-introduce-spe-commandline-options.patch)11
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch)29
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch (renamed from meta/recipes-devtools/gcc/gcc-9.3/0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch)55
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0036-Enable-CET-in-cross-compiler-if-possible.patch150
-rw-r--r--meta/recipes-devtools/gcc/gcc-10.1/0037-mingw32-Enable-operation_not_supported.patch26
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch54
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0030-ldbl128-config.patch79
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch48
-rw-r--r--meta/recipes-devtools/gcc/gcc-9.3/0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch100
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian_10.1.bb (renamed from meta/recipes-devtools/gcc/gcc-cross-canadian_9.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross_10.1.bb (renamed from meta/recipes-devtools/gcc/gcc-cross_9.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk_10.1.bb (renamed from meta/recipes-devtools/gcc/gcc-crosssdk_9.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime_10.1.bb (renamed from meta/recipes-devtools/gcc/gcc-runtime_9.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-sanitizers_10.1.bb (renamed from meta/recipes-devtools/gcc/gcc-sanitizers_9.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-source_10.1.bb (renamed from meta/recipes-devtools/gcc/gcc-source_9.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-target.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc_10.1.bb (renamed from meta/recipes-devtools/gcc/gcc_9.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgcc-initial_10.1.bb (renamed from meta/recipes-devtools/gcc/libgcc-initial_9.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgcc_10.1.bb (renamed from meta/recipes-devtools/gcc/libgcc_9.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgfortran_10.1.bb (renamed from meta/recipes-devtools/gcc/libgfortran_9.3.bb)0
54 files changed, 492 insertions, 699 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-9.3.inc b/meta/recipes-devtools/gcc/gcc-10.1.inc
index b0411078d3..8c7a13d0ce 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-10.1.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.3.0" 5PV = "10.1.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.3.0" 9BINV = "10.1.0"
10 10
11FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-9.3:${FILE_DIRNAME}/gcc-9.3/backport:" 11FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-10.1:${FILE_DIRNAME}/gcc-10.1/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"
@@ -24,8 +24,8 @@ LIC_FILES_CHKSUM = "\
24" 24"
25 25
26BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz" 26BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz"
27#RELEASE ?= "5a5ca2d" 27#RELEASE ?= "93a49d2d2292893b9b7f38132df949c70942838c"
28#BASEURI ?= "https://repo.or.cz/official-gcc.git/snapshot/${RELEASE}.tar.gz;downloadfilename=gcc-${RELEASE}.tar.gz" 28#BASEURI ?= "https://github.com/gcc-mirror/gcc/archive/${RELEASE}.zip;downloadfilename=gcc-${PV}-${RELEASE}.zip"
29SRC_URI = "\ 29SRC_URI = "\
30 ${BASEURI} \ 30 ${BASEURI} \
31 file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \ 31 file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
@@ -47,31 +47,30 @@ SRC_URI = "\
47 file://0017-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://0018-export-CPP.patch \ 48 file://0018-export-CPP.patch \
49 file://0019-Ensure-target-gcc-headers-can-be-included.patch \ 49 file://0019-Ensure-target-gcc-headers-can-be-included.patch \
50 file://0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch \ 50 file://0020-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 \ 51 file://0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \
52 file://0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \ 52 file://0022-aarch64-Add-support-for-musl-ldso.patch \
53 file://0023-aarch64-Add-support-for-musl-ldso.patch \ 53 file://0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch \
54 file://0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch \ 54 file://0024-handle-sysroot-support-for-nativesdk-gcc.patch \
55 file://0025-handle-sysroot-support-for-nativesdk-gcc.patch \ 55 file://0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch \
56 file://0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch \ 56 file://0026-Fix-various-_FOR_BUILD-and-related-variables.patch \
57 file://0027-Fix-various-_FOR_BUILD-and-related-variables.patch \ 57 file://0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch \
58 file://0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch \ 58 file://0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch \
59 file://0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch \ 59 file://0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \
60 file://0030-ldbl128-config.patch \ 60 file://0030-sync-gcc-stddef.h-with-musl.patch \
61 file://0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \ 61 file://0031-fix-segmentation-fault-in-precompiled-header-generat.patch \
62 file://0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \ 62 file://0032-Fix-for-testsuite-failure.patch \
63 file://0033-sync-gcc-stddef.h-with-musl.patch \ 63 file://0033-Re-introduce-spe-commandline-options.patch \
64 file://0034-fix-segmentation-fault-in-precompiled-header-generat.patch \ 64 file://0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \
65 file://0035-Fix-for-testsuite-failure.patch \ 65 file://0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \
66 file://0036-Re-introduce-spe-commandline-options.patch \ 66 file://0036-Enable-CET-in-cross-compiler-if-possible.patch \
67 file://0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch \ 67 file://0037-mingw32-Enable-operation_not_supported.patch \
68 file://0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \
69 file://0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch \
70" 68"
69SRC_URI[sha256sum] = "b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2"
70
71S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" 71S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
72SRC_URI[sha256sum] = "71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1"
73# For dev release snapshotting 72# For dev release snapshotting
74#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/official-gcc-${RELEASE}" 73#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${RELEASE}"
75#B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" 74#B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
76 75
77# Language Overrides 76# Language Overrides
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-10.1/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
index 0d9222df17..82ae9f8d14 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
@@ -1,7 +1,7 @@
1From 02b1789dbbb184726782b5038a4dd96515ec790c Mon Sep 17 00:00:00 2001 1From f2a5dc3bc7e5727d6bf77e1c6e8a31a6f000883d 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/39] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET 4Subject: [PATCH] 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 abd93a990a9..b121088d778 100755 15index 4cc938ebb7d..226a64939d1 100755
16--- a/configure 16--- a/configure
17+++ b/configure 17+++ b/configure
18@@ -7603,7 +7603,7 @@ fi 18@@ -7722,7 +7722,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 abd93a990a9..b121088d778 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 9db4fd14aa2..aad93c4d183 100644 28index c78d9cbea62..f024f4bac9b 100644
29--- a/configure.ac 29--- a/configure.ac
30+++ b/configure.ac 30+++ b/configure.ac
31@@ -3119,7 +3119,7 @@ fi 31@@ -3227,7 +3227,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
@@ -37,6 +37,3 @@ index 9db4fd14aa2..aad93c4d183 100644
37 case " $target_configdirs " in 37 case " $target_configdirs " in
38 *" newlib "*) 38 *" newlib "*)
39 case " $target_configargs " in 39 case " $target_configargs " in
40--
412.25.1
42
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0002-gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc-10.1/0002-gcc-poison-system-directories.patch
index f427ee67c1..30a8486016 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0002-gcc-poison-system-directories.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0002-gcc-poison-system-directories.patch
@@ -1,7 +1,7 @@
1From 5368cd0293ce50a69ced6e4b25ba6c8d8e014256 Mon Sep 17 00:00:00 2001 1From 74cc21f474402cf3578e37e1d7a1a22bbd070f6a 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/39] gcc: poison-system-directories 4Subject: [PATCH] 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,10 +26,10 @@ 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 d342c4f3749..c64fd4a6c50 100644 29index 65a82410abc..415f38fa1f4 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@@ -682,6 +682,10 @@ Wreturn-local-addr
33 Common Var(warn_return_local_addr) Init(1) Warning 33 Common Var(warn_return_local_addr) Init(1) Warning
34 Warn about returning a pointer/reference to a local or temporary variable. 34 Warn about returning a pointer/reference to a local or temporary variable.
35 35
@@ -41,10 +41,10 @@ index d342c4f3749..c64fd4a6c50 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 a718ceaf3da..5713342efb1 100644 44index 809e7b26823..5adeaeed36b 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@@ -224,6 +224,12 @@
48 #endif 48 #endif
49 49
50 50
@@ -58,10 +58,10 @@ index a718ceaf3da..5713342efb1 100644
58 optimizer and back end) to be checked for dynamic type safety at runtime. 58 optimizer and back end) to be checked for dynamic type safety at runtime.
59 This is quite expensive. */ 59 This is quite expensive. */
60diff --git a/gcc/configure b/gcc/configure 60diff --git a/gcc/configure b/gcc/configure
61index a065ba23728..2e26dd33310 100755 61index cd3d9516fce..8de766a942c 100755
62--- a/gcc/configure 62--- a/gcc/configure
63+++ b/gcc/configure 63+++ b/gcc/configure
64@@ -996,6 +996,7 @@ with_system_zlib 64@@ -1010,6 +1010,7 @@ with_system_zlib
65 enable_maintainer_mode 65 enable_maintainer_mode
66 enable_link_mutex 66 enable_link_mutex
67 enable_version_specific_runtime_libs 67 enable_version_specific_runtime_libs
@@ -69,7 +69,7 @@ index a065ba23728..2e26dd33310 100755
69 enable_plugin 69 enable_plugin
70 enable_host_shared 70 enable_host_shared
71 enable_libquadmath_support 71 enable_libquadmath_support
72@@ -1749,6 +1750,8 @@ Optional Features: 72@@ -1766,6 +1767,8 @@ Optional Features:
73 --enable-version-specific-runtime-libs 73 --enable-version-specific-runtime-libs
74 specify that runtime libraries should be installed 74 specify that runtime libraries should be installed
75 in a compiler-specific directory 75 in a compiler-specific directory
@@ -78,7 +78,7 @@ index a065ba23728..2e26dd33310 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@@ -29753,6 +29756,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : 81@@ -30235,6 +30238,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
82 fi 82 fi
83 83
84 84
@@ -99,10 +99,10 @@ index a065ba23728..2e26dd33310 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 3a7251102ef..12d1d04e645 100644 102index 0de3b4bf97b..8bfd6feb780 100644
103--- a/gcc/configure.ac 103--- a/gcc/configure.ac
104+++ b/gcc/configure.ac 104+++ b/gcc/configure.ac
105@@ -6380,6 +6380,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs, 105@@ -6595,6 +6595,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,18 +120,18 @@ index 3a7251102ef..12d1d04e645 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 0ab6c9c6449..c3d3d51a28f 100644 123index f98161391a0..f12d8d12150 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@@ -333,6 +333,7 @@ Objective-C and Objective-C++ Dialects}. 126@@ -348,6 +348,7 @@ Objective-C and Objective-C++ Dialects}.
127 -Wpacked -Wpacked-bitfield-compat -Wpacked-not-aligned -Wpadded @gol 127 -Wpacked -Wno-packed-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 -Wpointer-arith -Wno-pointer-compare -Wno-pointer-to-int-cast @gol
130+-Wno-poison-system-directories @gol 130+-Wno-poison-system-directories @gol
131 -Wpointer-arith -Wpointer-compare -Wno-pointer-to-int-cast @gol
132 -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls @gol 131 -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls @gol
133 -Wrestrict -Wno-return-local-addr @gol 132 -Wrestrict -Wno-return-local-addr -Wreturn-type @gol
134@@ -6290,6 +6291,14 @@ made up of data only and thus requires no special treatment. But, for 133 -Wno-scalar-storage-order -Wsequence-point @gol
134@@ -6924,6 +6925,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,10 +147,10 @@ index 0ab6c9c6449..c3d3d51a28f 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 4f57765b012..a2601a6bb06 100644 150index 9f790db0daf..b2200c5185a 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@@ -1041,6 +1041,8 @@ proper position among the other output files. */
154 "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \ 154 "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
155 "%X %{o*} %{e*} %{N} %{n} %{r}\ 155 "%X %{o*} %{e*} %{N} %{n} %{r}\
156 %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \ 156 %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
@@ -160,7 +160,7 @@ index 4f57765b012..a2601a6bb06 100644
160 VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \ 160 VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
161 %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ 161 %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
162diff --git a/gcc/incpath.c b/gcc/incpath.c 162diff --git a/gcc/incpath.c b/gcc/incpath.c
163index bcbe2082905..5752298bbf2 100644 163index 8a2bda00f80..9098ab044ab 100644
164--- a/gcc/incpath.c 164--- a/gcc/incpath.c
165+++ b/gcc/incpath.c 165+++ b/gcc/incpath.c
166@@ -26,6 +26,7 @@ 166@@ -26,6 +26,7 @@
@@ -198,6 +198,3 @@ index bcbe2082905..5752298bbf2 100644
198 } 198 }
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--
2022.25.1
203
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-10.1/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
index 23ec5bce03..27237feb5a 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
@@ -1,7 +1,7 @@
1From df90dbdba7a85c20bad95de71525f0f400a849d2 Mon Sep 17 00:00:00 2001 1From 6e3395c0bc933bdc3242d1dead4896d0aa4e11a8 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/39] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET 4Subject: [PATCH] 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 b121088d778..93aae5bb26f 100755 29index 226a64939d1..b31dc137fc9 100755
30--- a/configure 30--- a/configure
31+++ b/configure 31+++ b/configure
32@@ -6864,6 +6864,38 @@ fi 32@@ -6971,6 +6971,38 @@ fi
33 33
34 34
35 35
@@ -68,6 +68,3 @@ index b121088d778..93aae5bb26f 100755
68 # Handle --with-headers=XXX. If the value is not "yes", the contents of 68 # Handle --with-headers=XXX. If the value is not "yes", the contents of
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--
722.25.1
73
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0004-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc-10.1/0004-64-bit-multilib-hack.patch
index 17ec8986c1..7c751bef65 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0004-64-bit-multilib-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0004-64-bit-multilib-hack.patch
@@ -1,7 +1,7 @@
1From 2e00d0a9a809153f693659e977c1e0550665e65c Mon Sep 17 00:00:00 2001 1From 85a7c5aeb82ed61e6ef6d8e061b9da9e6a4a652c 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/39] 64-bit multilib hack. 4Subject: [PATCH] 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
@@ -37,7 +37,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
37 5 files changed, 15 insertions(+), 20 deletions(-) 37 5 files changed, 15 insertions(+), 20 deletions(-)
38 38
39diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux 39diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
40index 5ad670ba2ce..e26019e7157 100644 40index 83e59e33b85..b1356be1fb4 100644
41--- a/gcc/config/aarch64/t-aarch64-linux 41--- a/gcc/config/aarch64/t-aarch64-linux
42+++ b/gcc/config/aarch64/t-aarch64-linux 42+++ b/gcc/config/aarch64/t-aarch64-linux
43@@ -21,8 +21,8 @@ 43@@ -21,8 +21,8 @@
@@ -54,7 +54,7 @@ index 5ad670ba2ce..e26019e7157 100644
54-MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) 54-MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
55+#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) 55+#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
56diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 56diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
57index c686ab2f0d2..c82b60dadcd 100644 57index 1171e218578..5e057b7e5db 100644
58--- a/gcc/config/i386/t-linux64 58--- a/gcc/config/i386/t-linux64
59+++ b/gcc/config/i386/t-linux64 59+++ b/gcc/config/i386/t-linux64
60@@ -32,7 +32,5 @@ 60@@ -32,7 +32,5 @@
@@ -68,7 +68,7 @@ index c686ab2f0d2..c82b60dadcd 100644
68+MULTILIB_DIRNAMES = . . 68+MULTILIB_DIRNAMES = . .
69+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) 69+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
70diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 70diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64
71index 3a2ff700d7d..13ef19576b5 100644 71index ceb58d3b5f3..43fe2bf28ab 100644
72--- a/gcc/config/mips/t-linux64 72--- a/gcc/config/mips/t-linux64
73+++ b/gcc/config/mips/t-linux64 73+++ b/gcc/config/mips/t-linux64
74@@ -17,10 +17,6 @@ 74@@ -17,10 +17,6 @@
@@ -98,7 +98,7 @@ index 216d2776a18..e4d817621fc 100644
98+#MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) 98+#MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
99+MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) 99+MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
100diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 100diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
101index f3c6e2be1d9..bd0393155fa 100644 101index 264a7e27524..dc9d440f66b 100644
102--- a/gcc/config/rs6000/t-linux64 102--- a/gcc/config/rs6000/t-linux64
103+++ b/gcc/config/rs6000/t-linux64 103+++ b/gcc/config/rs6000/t-linux64
104@@ -26,10 +26,9 @@ 104@@ -26,10 +26,9 @@
@@ -114,6 +114,3 @@ index f3c6e2be1d9..bd0393155fa 100644
114 114
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--
1182.25.1
119
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0005-optional-libstdc.patch b/meta/recipes-devtools/gcc/gcc-10.1/0005-optional-libstdc.patch
index 3c28aeac63..4020c9e3cf 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0005-optional-libstdc.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0005-optional-libstdc.patch
@@ -1,7 +1,7 @@
1From 435e45592e944018f33bff32f1202b0872a23141 Mon Sep 17 00:00:00 2001 1From 6ddfb0bfcd1eea71acd37ab06f7a4510b9f1d12b 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/39] optional libstdc 4Subject: [PATCH] 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 916cc67b453..41619fa591c 100644 28index c49da99d395..35f712e2c84 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@@ -1952,6 +1952,10 @@ nostdinc++ 31@@ -2025,6 +2025,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
@@ -40,7 +40,7 @@ index 916cc67b453..41619fa591c 100644
40 C ObjC C++ ObjC++ Joined Separate 40 C ObjC C++ ObjC++ Joined Separate
41 ; Documented in common.opt 41 ; Documented in common.opt
42diff --git a/gcc/cp/g++spec.c b/gcc/cp/g++spec.c 42diff --git a/gcc/cp/g++spec.c b/gcc/cp/g++spec.c
43index 6c4574a837d..0e2657f00ee 100644 43index 0ab63bcd211..7b081e9e4f0 100644
44--- a/gcc/cp/g++spec.c 44--- a/gcc/cp/g++spec.c
45+++ b/gcc/cp/g++spec.c 45+++ b/gcc/cp/g++spec.c
46@@ -137,6 +137,7 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, 46@@ -137,6 +137,7 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
@@ -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 c3d3d51a28f..2f7ffe456c3 100644 55index f12d8d12150..cf6cb428e7d 100644
56--- a/gcc/doc/invoke.texi 56--- a/gcc/doc/invoke.texi
57+++ b/gcc/doc/invoke.texi 57+++ b/gcc/doc/invoke.texi
58@@ -228,6 +228,9 @@ in the following sections. 58@@ -230,6 +230,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
@@ -63,9 +63,9 @@ index c3d3d51a28f..2f7ffe456c3 100644
63+-fvtv-counts -fvtv-debug @gol 63+-fvtv-counts -fvtv-debug @gol
64+-nostdlib++ @gol 64+-nostdlib++ @gol
65 -fext-numeric-literals @gol 65 -fext-numeric-literals @gol
66 -Wabi=@var{n} -Wabi-tag -Wconversion-null -Wctor-dtor-privacy @gol 66 -Wabi-tag -Wcatch-value -Wcatch-value=@var{n} @gol
67 -Wdelete-non-virtual-dtor -Wdeprecated-copy -Wdeprecated-copy-dtor @gol 67 -Wno-class-conversion -Wclass-memaccess @gol
68@@ -539,7 +542,7 @@ Objective-C and Objective-C++ Dialects}. 68@@ -599,7 +602,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 c3d3d51a28f..2f7ffe456c3 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@@ -13321,6 +13324,33 @@ Specify that the program entry point is @var{entry}. The argument is 77@@ -14407,6 +14410,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,10 +109,10 @@ index c3d3d51a28f..2f7ffe456c3 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 a2601a6bb06..cd6c6fc95db 100644 112index b2200c5185a..f8be58ce0a6 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@@ -1051,6 +1051,7 @@ proper position among the other output files. */
116 %(mflib) " STACK_SPLIT_SPEC "\ 116 %(mflib) " STACK_SPLIT_SPEC "\
117 %{fprofile-arcs|fprofile-generate*|coverage:-lgcov} " SANITIZER_SPEC " \ 117 %{fprofile-arcs|fprofile-generate*|coverage:-lgcov} " SANITIZER_SPEC " \
118 %{!nostdlib:%{!r:%{!nodefaultlibs:%(link_ssp) %(link_gcc_c_sequence)}}}\ 118 %{!nostdlib:%{!r:%{!nodefaultlibs:%(link_ssp) %(link_gcc_c_sequence)}}}\
@@ -120,6 +120,3 @@ index a2601a6bb06..cd6c6fc95db 100644
120 %{!nostdlib:%{!r:%{!nostartfiles:%E}}} %{T*} \n%(post_link) }}}}}}" 120 %{!nostdlib:%{!r:%{!nostartfiles:%E}}} %{T*} \n%(post_link) }}}}}}"
121 #endif 121 #endif
122 122
123--
1242.25.1
125
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0006-COLLECT_GCC_OPTIONS.patch b/meta/recipes-devtools/gcc/gcc-10.1/0006-COLLECT_GCC_OPTIONS.patch
index 906f3a7317..9fbbe80703 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0006-COLLECT_GCC_OPTIONS.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0006-COLLECT_GCC_OPTIONS.patch
@@ -1,7 +1,7 @@
1From c99684477ec66f290ec74efe732acd3c24db7dcc Mon Sep 17 00:00:00 2001 1From a6c90d3a9c5010b4aa7cc30467cf81ca7e0f430e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:16:28 +0400 3Date: Fri, 29 Mar 2013 09:16:28 +0400
4Subject: [PATCH 06/39] COLLECT_GCC_OPTIONS 4Subject: [PATCH] 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,10 +14,10 @@ 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 cd6c6fc95db..7da9c5d457b 100644 17index f8be58ce0a6..48b0f9dde81 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@@ -4806,6 +4806,15 @@ set_collect_gcc_options (void)
21 sizeof ("COLLECT_GCC_OPTIONS=") - 1); 21 sizeof ("COLLECT_GCC_OPTIONS=") - 1);
22 22
23 first_time = TRUE; 23 first_time = TRUE;
@@ -33,6 +33,3 @@ index cd6c6fc95db..7da9c5d457b 100644
33 for (i = 0; (int) i < n_switches; i++) 33 for (i = 0; (int) i < n_switches; i++)
34 { 34 {
35 const char *const *args; 35 const char *const *args;
36--
372.25.1
38
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/meta/recipes-devtools/gcc/gcc-10.1/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
index 68a876cb95..a764bdd0f4 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
@@ -1,8 +1,7 @@
1From d6f4edaab0ad0e742fb1e3a6f76908a2ac9927d5 Mon Sep 17 00:00:00 2001 1From 5670d4489f119d2da661734895ac0be99b606d1b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:17:25 +0400 3Date: Fri, 29 Mar 2013 09:17:25 +0400
4Subject: [PATCH 07/39] Use the defaults.h in ${B} instead of ${S}, and t-oe in 4Subject: [PATCH] Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}
5 ${B}
6 5
7Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that 6Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that
8the source can be shared between gcc-cross-initial, 7the source can be shared between gcc-cross-initial,
@@ -27,7 +26,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
27 4 files changed, 7 insertions(+), 7 deletions(-) 26 4 files changed, 7 insertions(+), 7 deletions(-)
28 27
29diff --git a/gcc/Makefile.in b/gcc/Makefile.in 28diff --git a/gcc/Makefile.in b/gcc/Makefile.in
30index abae872cd63..fef6c4c61e3 100644 29index 543b477ff18..a67d2cc18d6 100644
31--- a/gcc/Makefile.in 30--- a/gcc/Makefile.in
32+++ b/gcc/Makefile.in 31+++ b/gcc/Makefile.in
33@@ -540,7 +540,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ 32@@ -540,7 +540,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
@@ -40,10 +39,10 @@ index abae872cd63..fef6c4c61e3 100644
40 TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@ 39 TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@
41 TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@ 40 TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@
42diff --git a/gcc/configure b/gcc/configure 41diff --git a/gcc/configure b/gcc/configure
43index 2e26dd33310..ed7931daed3 100755 42index 8de766a942c..b26e8fc7fee 100755
44--- a/gcc/configure 43--- a/gcc/configure
45+++ b/gcc/configure 44+++ b/gcc/configure
46@@ -12342,8 +12342,8 @@ for f in $tm_file; do 45@@ -12705,8 +12705,8 @@ for f in $tm_file; do
47 tm_include_list="${tm_include_list} $f" 46 tm_include_list="${tm_include_list} $f"
48 ;; 47 ;;
49 defaults.h ) 48 defaults.h )
@@ -55,10 +54,10 @@ index 2e26dd33310..ed7931daed3 100755
55 * ) 54 * )
56 tm_file_list="${tm_file_list} \$(srcdir)/config/$f" 55 tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
57diff --git a/gcc/configure.ac b/gcc/configure.ac 56diff --git a/gcc/configure.ac b/gcc/configure.ac
58index 12d1d04e645..e0500e30d50 100644 57index 8bfd6feb780..26fa46802c7 100644
59--- a/gcc/configure.ac 58--- a/gcc/configure.ac
60+++ b/gcc/configure.ac 59+++ b/gcc/configure.ac
61@@ -1968,8 +1968,8 @@ for f in $tm_file; do 60@@ -2138,8 +2138,8 @@ for f in $tm_file; do
62 tm_include_list="${tm_include_list} $f" 61 tm_include_list="${tm_include_list} $f"
63 ;; 62 ;;
64 defaults.h ) 63 defaults.h )
@@ -70,7 +69,7 @@ index 12d1d04e645..e0500e30d50 100644
70 * ) 69 * )
71 tm_file_list="${tm_file_list} \$(srcdir)/config/$f" 70 tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
72diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh 71diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh
73index 308b87d0cc1..19068cbc24a 100644 72index d2c677a4a42..d03852481cb 100644
74--- a/gcc/mkconfig.sh 73--- a/gcc/mkconfig.sh
75+++ b/gcc/mkconfig.sh 74+++ b/gcc/mkconfig.sh
76@@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then 75@@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then
@@ -91,6 +90,3 @@ index 308b87d0cc1..19068cbc24a 100644
91 fi 90 fi
92 91
93 # Add multiple inclusion protection guard, part two. 92 # Add multiple inclusion protection guard, part two.
94--
952.25.1
96
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0008-fortran-cross-compile-hack.patch b/meta/recipes-devtools/gcc/gcc-10.1/0008-fortran-cross-compile-hack.patch
index 6acd2b0cf9..714db3bef5 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0008-fortran-cross-compile-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0008-fortran-cross-compile-hack.patch
@@ -1,7 +1,7 @@
1From 2c514ada36ffbf70177909f633e9f68811de61e0 Mon Sep 17 00:00:00 2001 1From f05062625e7a4751be723595a2f7a4b7fbeff311 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:20:01 +0400 3Date: Fri, 29 Mar 2013 09:20:01 +0400
4Subject: [PATCH 08/39] fortran cross-compile hack. 4Subject: [PATCH] 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 60867b93d0e..3fc9fca5b7b 100755 19index b4cf854ddb3..e8e0ac3b1cf 100755
20--- a/libgfortran/configure 20--- a/libgfortran/configure
21+++ b/libgfortran/configure 21+++ b/libgfortran/configure
22@@ -13071,7 +13071,7 @@ esac 22@@ -13090,7 +13090,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,10 +29,10 @@ index 60867b93d0e..3fc9fca5b7b 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 7cfce28ab69..6cd515ee1a4 100644 32index 711dc60ff78..3c9bbfbf47d 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@@ -258,7 +258,7 @@ AC_SUBST(enable_static)
36 36
37 # We need gfortran to compile parts of the library 37 # We need gfortran to compile parts of the library
38 #AC_PROG_FC(gfortran) 38 #AC_PROG_FC(gfortran)
@@ -41,6 +41,3 @@ index 7cfce28ab69..6cd515ee1a4 100644
41 AC_PROG_FC(gfortran) 41 AC_PROG_FC(gfortran)
42 42
43 # extra LD Flags which are required for targets 43 # extra LD Flags which are required for targets
44--
452.25.1
46
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0009-cpp-honor-sysroot.patch b/meta/recipes-devtools/gcc/gcc-10.1/0009-cpp-honor-sysroot.patch
index 5a9e527606..8ad6853d81 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0009-cpp-honor-sysroot.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0009-cpp-honor-sysroot.patch
@@ -1,7 +1,7 @@
1From 0a7c03a9cf925ba09a510a32e684f01ec5a50650 Mon Sep 17 00:00:00 2001 1From 1d76de7f1f5c99f1fa1a4b14aedad3d702e4e136 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:22:00 +0400 3Date: Fri, 29 Mar 2013 09:22:00 +0400
4Subject: [PATCH 09/39] cpp: honor sysroot. 4Subject: [PATCH] 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
@@ -26,7 +26,7 @@ Upstream-Status: Pending
26 2 files changed, 2 insertions(+), 2 deletions(-) 26 2 files changed, 2 insertions(+), 2 deletions(-)
27 27
28diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h 28diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
29index c6e42eda283..e1ddf066467 100644 29index 0ad4a33b93e..16c744f4f90 100644
30--- a/gcc/cp/lang-specs.h 30--- a/gcc/cp/lang-specs.h
31+++ b/gcc/cp/lang-specs.h 31+++ b/gcc/cp/lang-specs.h
32@@ -66,5 +66,5 @@ along with GCC; see the file COPYING3. If not see 32@@ -66,5 +66,5 @@ along with GCC; see the file COPYING3. If not see
@@ -37,10 +37,10 @@ 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 7da9c5d457b..4e7c45b268c 100644 40index 48b0f9dde81..c87f603955f 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@@ -1348,7 +1348,7 @@ static const struct compiler default_compilers[] =
44 %W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0}, 44 %W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0},
45 {".i", "@cpp-output", 0, 0, 0}, 45 {".i", "@cpp-output", 0, 0, 0},
46 {"@cpp-output", 46 {"@cpp-output",
@@ -49,6 +49,3 @@ index 7da9c5d457b..4e7c45b268c 100644
49 {".s", "@assembler", 0, 0, 0}, 49 {".s", "@assembler", 0, 0, 0},
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--
532.25.1
54
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0010-MIPS64-Default-to-N64-ABI.patch b/meta/recipes-devtools/gcc/gcc-10.1/0010-MIPS64-Default-to-N64-ABI.patch
index a8103b951e..625e2d8709 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0010-MIPS64-Default-to-N64-ABI.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0010-MIPS64-Default-to-N64-ABI.patch
@@ -1,7 +1,7 @@
1From 374aab6a88200fbd7343467d97f7ee6455bbce61 Mon Sep 17 00:00:00 2001 1From 4fad4433c96bc9d0d9d124f9674fb3389f6f426e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:23:08 +0400 3Date: Fri, 29 Mar 2013 09:23:08 +0400
4Subject: [PATCH 10/39] MIPS64: Default to N64 ABI 4Subject: [PATCH] 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 b2282ecdf0b..69c0e4a005b 100644 17index cf1a87e2efd..37c4221a39f 100644
18--- a/gcc/config.gcc 18--- a/gcc/config.gcc
19+++ b/gcc/config.gcc 19+++ b/gcc/config.gcc
20@@ -2282,29 +2282,29 @@ mips*-*-linux*) # Linux MIPS, either endian. 20@@ -2511,29 +2511,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)
@@ -52,6 +52,3 @@ index b2282ecdf0b..69c0e4a005b 100644
52 enable_mips_multilibs="yes" 52 enable_mips_multilibs="yes"
53 ;; 53 ;;
54 esac 54 esac
55--
562.25.1
57
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc-10.1/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
index d9d563d0f7..e357976330 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
@@ -1,7 +1,7 @@
1From dcd7891d6aea5327969132fea6ca4c199f14e985 Mon Sep 17 00:00:00 2001 1From 8fc016a53c22c19feccbfa13ebdf19090dc67058 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 11/39] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER 4Subject: [PATCH] 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
@@ -31,7 +31,7 @@ Upstream-Status: Inappropriate [OE configuration]
31 12 files changed, 29 insertions(+), 34 deletions(-) 31 12 files changed, 29 insertions(+), 34 deletions(-)
32 32
33diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h 33diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
34index 824861befec..6afacce3292 100644 34index e25fcac3c59..01aca0c6542 100644
35--- a/gcc/config/alpha/linux-elf.h 35--- a/gcc/config/alpha/linux-elf.h
36+++ b/gcc/config/alpha/linux-elf.h 36+++ b/gcc/config/alpha/linux-elf.h
37@@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see 37@@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see
@@ -46,7 +46,7 @@ index 824861befec..6afacce3292 100644
46 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" 46 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
47 #elif DEFAULT_LIBC == LIBC_GLIBC 47 #elif DEFAULT_LIBC == LIBC_GLIBC
48diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h 48diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
49index 66ec0ea3980..e4ade2e2ab0 100644 49index 5bdcfa0c5d3..0c0332f317f 100644
50--- a/gcc/config/arm/linux-eabi.h 50--- a/gcc/config/arm/linux-eabi.h
51+++ b/gcc/config/arm/linux-eabi.h 51+++ b/gcc/config/arm/linux-eabi.h
52@@ -65,8 +65,8 @@ 52@@ -65,8 +65,8 @@
@@ -61,7 +61,7 @@ index 66ec0ea3980..e4ade2e2ab0 100644
61 61
62 #define GLIBC_DYNAMIC_LINKER \ 62 #define GLIBC_DYNAMIC_LINKER \
63diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h 63diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
64index 9a360defd21..98f6e960b64 100644 64index 0ec3aa53189..abfa9566d74 100644
65--- a/gcc/config/arm/linux-elf.h 65--- a/gcc/config/arm/linux-elf.h
66+++ b/gcc/config/arm/linux-elf.h 66+++ b/gcc/config/arm/linux-elf.h
67@@ -60,7 +60,7 @@ 67@@ -60,7 +60,7 @@
@@ -74,7 +74,7 @@ index 9a360defd21..98f6e960b64 100644
74 #define LINUX_TARGET_LINK_SPEC "%{h*} \ 74 #define LINUX_TARGET_LINK_SPEC "%{h*} \
75 %{static:-Bstatic} \ 75 %{static:-Bstatic} \
76diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h 76diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
77index 9a6e2d99896..31efbb73016 100644 77index 9f823f125ed..e0390b7d5e3 100644
78--- a/gcc/config/i386/linux.h 78--- a/gcc/config/i386/linux.h
79+++ b/gcc/config/i386/linux.h 79+++ b/gcc/config/i386/linux.h
80@@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see 80@@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see
@@ -87,7 +87,7 @@ index 9a6e2d99896..31efbb73016 100644
87 #undef MUSL_DYNAMIC_LINKER 87 #undef MUSL_DYNAMIC_LINKER
88 #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" 88 #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
89diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h 89diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
90index c08221c4210..dbb474d792b 100644 90index 6cb68d1ccfa..7de09ec857c 100644
91--- a/gcc/config/i386/linux64.h 91--- a/gcc/config/i386/linux64.h
92+++ b/gcc/config/i386/linux64.h 92+++ b/gcc/config/i386/linux64.h
93@@ -27,9 +27,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see 93@@ -27,9 +27,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
@@ -104,7 +104,7 @@ index c08221c4210..dbb474d792b 100644
104 #undef MUSL_DYNAMIC_LINKER32 104 #undef MUSL_DYNAMIC_LINKER32
105 #define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" 105 #define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
106diff --git a/gcc/config/linux.h b/gcc/config/linux.h 106diff --git a/gcc/config/linux.h b/gcc/config/linux.h
107index c3c4a219e67..4b05d8e93d1 100644 107index 95654bcdb5a..0c1a8118a26 100644
108--- a/gcc/config/linux.h 108--- a/gcc/config/linux.h
109+++ b/gcc/config/linux.h 109+++ b/gcc/config/linux.h
110@@ -94,10 +94,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see 110@@ -94,10 +94,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
@@ -123,7 +123,7 @@ index c3c4a219e67..4b05d8e93d1 100644
123 #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" 123 #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
124 #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" 124 #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
125diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h 125diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
126index 6f79ac9c01a..25de96f9561 100644 126index 54446e58e5f..4786ee304c1 100644
127--- a/gcc/config/mips/linux.h 127--- a/gcc/config/mips/linux.h
128+++ b/gcc/config/mips/linux.h 128+++ b/gcc/config/mips/linux.h
129@@ -22,20 +22,20 @@ along with GCC; see the file COPYING3. If not see 129@@ -22,20 +22,20 @@ along with GCC; see the file COPYING3. If not see
@@ -154,7 +154,7 @@ index 6f79ac9c01a..25de96f9561 100644
154 #undef MUSL_DYNAMIC_LINKER32 154 #undef MUSL_DYNAMIC_LINKER32
155 #define MUSL_DYNAMIC_LINKER32 \ 155 #define MUSL_DYNAMIC_LINKER32 \
156diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h 156diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
157index 58dd18b89f3..112ba9cd764 100644 157index 4afef7c228c..01997330741 100644
158--- a/gcc/config/riscv/linux.h 158--- a/gcc/config/riscv/linux.h
159+++ b/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 160@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see
@@ -167,10 +167,10 @@ index 58dd18b89f3..112ba9cd764 100644
167 #define MUSL_ABI_SUFFIX \ 167 #define MUSL_ABI_SUFFIX \
168 "%{mabi=ilp32:-sf}" \ 168 "%{mabi=ilp32:-sf}" \
169diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h 169diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
170index 9946d3fed94..45a9a7cae59 100644 170index 34776c8421e..967c1c43c63 100644
171--- a/gcc/config/rs6000/linux64.h 171--- a/gcc/config/rs6000/linux64.h
172+++ b/gcc/config/rs6000/linux64.h 172+++ b/gcc/config/rs6000/linux64.h
173@@ -423,24 +423,19 @@ extern int dot_symbols; 173@@ -419,24 +419,19 @@ extern int dot_symbols;
174 #undef LINK_OS_DEFAULT_SPEC 174 #undef LINK_OS_DEFAULT_SPEC
175 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" 175 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
176 176
@@ -201,7 +201,7 @@ index 9946d3fed94..45a9a7cae59 100644
201 #undef DEFAULT_ASM_ENDIAN 201 #undef DEFAULT_ASM_ENDIAN
202 #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) 202 #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
203diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h 203diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h
204index c9897b7aca5..82f275319cc 100644 204index c1d0441d488..81373eb8336 100644
205--- a/gcc/config/sh/linux.h 205--- a/gcc/config/sh/linux.h
206+++ b/gcc/config/sh/linux.h 206+++ b/gcc/config/sh/linux.h
207@@ -64,7 +64,7 @@ along with GCC; see the file COPYING3. If not see 207@@ -64,7 +64,7 @@ along with GCC; see the file COPYING3. If not see
@@ -214,7 +214,7 @@ index c9897b7aca5..82f275319cc 100644
214 #undef SUBTARGET_LINK_EMUL_SUFFIX 214 #undef SUBTARGET_LINK_EMUL_SUFFIX
215 #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}" 215 #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}"
216diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h 216diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
217index 08476f1d94d..80440e712ad 100644 217index 81201e67a2f..8b6fc577594 100644
218--- a/gcc/config/sparc/linux.h 218--- a/gcc/config/sparc/linux.h
219+++ b/gcc/config/sparc/linux.h 219+++ b/gcc/config/sparc/linux.h
220@@ -84,7 +84,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); 220@@ -84,7 +84,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
@@ -227,7 +227,7 @@ index 08476f1d94d..80440e712ad 100644
227 #undef LINK_SPEC 227 #undef LINK_SPEC
228 #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ 228 #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
229diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h 229diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h
230index 789d1df4bd5..b920c680fb1 100644 230index a1a0efd8f28..85d1084afc2 100644
231--- a/gcc/config/sparc/linux64.h 231--- a/gcc/config/sparc/linux64.h
232+++ b/gcc/config/sparc/linux64.h 232+++ b/gcc/config/sparc/linux64.h
233@@ -84,8 +84,8 @@ along with GCC; see the file COPYING3. If not see 233@@ -84,8 +84,8 @@ along with GCC; see the file COPYING3. If not see
@@ -241,6 +241,3 @@ index 789d1df4bd5..b920c680fb1 100644
241 241
242 #ifdef SPARC_BI_ARCH 242 #ifdef SPARC_BI_ARCH
243 243
244--
2452.25.1
246
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0012-gcc-Fix-argument-list-too-long-error.patch b/meta/recipes-devtools/gcc/gcc-10.1/0012-gcc-Fix-argument-list-too-long-error.patch
index 9d98878096..acbd75f139 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0012-gcc-Fix-argument-list-too-long-error.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0012-gcc-Fix-argument-list-too-long-error.patch
@@ -1,7 +1,7 @@
1From faa0f712a67005ef0260f95eebe7c7c57a6f8360 Mon Sep 17 00:00:00 2001 1From a22d1264049d29b90663cf5667049ae6f9b7a5ce Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:26:37 +0400 3Date: Fri, 29 Mar 2013 09:26:37 +0400
4Subject: [PATCH 12/39] gcc: Fix argument list too long error. 4Subject: [PATCH] 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 fef6c4c61e3..57cf7804f0a 100644 26index a67d2cc18d6..480c9366418 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@@ -3606,7 +3606,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)
@@ -35,6 +35,3 @@ index fef6c4c61e3..57cf7804f0a 100644
35 srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \ 35 srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \
36 for file in $$headers; do \ 36 for file in $$headers; do \
37 if [ -f $$file ] ; then \ 37 if [ -f $$file ] ; then \
38--
392.25.1
40
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0013-Disable-sdt.patch b/meta/recipes-devtools/gcc/gcc-10.1/0013-Disable-sdt.patch
index 455858354f..207cdb57af 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0013-Disable-sdt.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0013-Disable-sdt.patch
@@ -1,7 +1,7 @@
1From 4df5a747265983092afd6fbc5329dd808cc1da3c Mon Sep 17 00:00:00 2001 1From fa47586935a18ecfc2ad5586802e326e21741b7b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:28:10 +0400 3Date: Fri, 29 Mar 2013 09:28:10 +0400
4Subject: [PATCH 13/39] Disable sdt. 4Subject: [PATCH] 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 ed7931daed3..52f52b0ec86 100755 28index b26e8fc7fee..6080f86145e 100755
29--- a/gcc/configure 29--- a/gcc/configure
30+++ b/gcc/configure 30+++ b/gcc/configure
31@@ -29333,12 +29333,12 @@ fi 31@@ -29789,12 +29789,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 ed7931daed3..52f52b0ec86 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 e0500e30d50..242ad28ec83 100644 51index 26fa46802c7..42be5252778 100644
52--- a/gcc/configure.ac 52--- a/gcc/configure.ac
53+++ b/gcc/configure.ac 53+++ b/gcc/configure.ac
54@@ -5995,15 +5995,15 @@ fi 54@@ -6190,15 +6190,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 e0500e30d50..242ad28ec83 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 1225edc596b..3b89b880fc8 100755 80index 9f9c5a2419a..71ed13b815b 100755
81--- a/libstdc++-v3/configure 81--- a/libstdc++-v3/configure
82+++ b/libstdc++-v3/configure 82+++ b/libstdc++-v3/configure
83@@ -22325,11 +22325,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 83@@ -22615,11 +22615,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
84 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 84 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
85 ac_compiler_gnu=$ac_cv_c_compiler_gnu 85 ac_compiler_gnu=$ac_cv_c_compiler_gnu
86 86
@@ -96,10 +96,10 @@ index 1225edc596b..3b89b880fc8 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 d8455e41574..844cf1acbce 100644 99index 699e55fd829..5c7a7bda439 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@@ -232,7 +232,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN 102@@ -241,7 +241,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN
103 GLIBCXX_CHECK_SC_NPROC_ONLN 103 GLIBCXX_CHECK_SC_NPROC_ONLN
104 GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP 104 GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP
105 GLIBCXX_CHECK_SYSCTL_HW_NCPU 105 GLIBCXX_CHECK_SYSCTL_HW_NCPU
@@ -108,6 +108,3 @@ index d8455e41574..844cf1acbce 100644
108 108
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--
1122.25.1
113
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0014-libtool.patch b/meta/recipes-devtools/gcc/gcc-10.1/0014-libtool.patch
index 2953859238..f4e70c3b18 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0014-libtool.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0014-libtool.patch
@@ -1,7 +1,7 @@
1From 34977d994666a90983c96a9240dfa3540562da35 Mon Sep 17 00:00:00 2001 1From 6ecd478881468934444ff85611fd43f7033b1e81 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:29:11 +0400 3Date: Fri, 29 Mar 2013 09:29:11 +0400
4Subject: [PATCH 14/39] libtool 4Subject: [PATCH] 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.
@@ -23,7 +23,7 @@ Upstream-Status: Pending
23 1 file changed, 4 insertions(+) 23 1 file changed, 4 insertions(+)
24 24
25diff --git a/ltmain.sh b/ltmain.sh 25diff --git a/ltmain.sh b/ltmain.sh
26index 79f9ba89af5..8e222f7c16b 100644 26index 70990740b6c..ee938056bef 100644
27--- a/ltmain.sh 27--- a/ltmain.sh
28+++ b/ltmain.sh 28+++ b/ltmain.sh
29@@ -6359,6 +6359,10 @@ func_mode_link () 29@@ -6359,6 +6359,10 @@ func_mode_link ()
@@ -37,6 +37,3 @@ index 79f9ba89af5..8e222f7c16b 100644
37 37
38 oldlibs= 38 oldlibs=
39 if test -z "$rpath"; then 39 if test -z "$rpath"; then
40--
412.25.1
42
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/meta/recipes-devtools/gcc/gcc-10.1/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
index d4445244e2..bc2674abcc 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
@@ -1,7 +1,7 @@
1From 4558ba7fa020c111f9a204021a418c0ce55d77f9 Mon Sep 17 00:00:00 2001 1From de4427fa49c07dc651ee6ceaf5c5078700ca3b08 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:30:32 +0400 3Date: Fri, 29 Mar 2013 09:30:32 +0400
4Subject: [PATCH 15/39] gcc: armv4: pass fix-v4bx to linker to support EABI. 4Subject: [PATCH] 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
@@ -19,12 +19,12 @@ Upstream-Status: Pending
19 1 file changed, 5 insertions(+), 1 deletion(-) 19 1 file changed, 5 insertions(+), 1 deletion(-)
20 20
21diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h 21diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
22index e4ade2e2ab0..108863f69d2 100644 22index 0c0332f317f..7b3769e8459 100644
23--- a/gcc/config/arm/linux-eabi.h 23--- a/gcc/config/arm/linux-eabi.h
24+++ b/gcc/config/arm/linux-eabi.h 24+++ b/gcc/config/arm/linux-eabi.h
25@@ -91,10 +91,14 @@ 25@@ -91,10 +91,14 @@
26 #define MUSL_DYNAMIC_LINKER \ 26 #define MUSL_DYNAMIC_LINKER \
27 "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1" 27 "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}%{mfdpic:-fdpic}.so.1"
28 28
29+/* For armv4 we pass --fix-v4bx to linker to support EABI */ 29+/* For armv4 we pass --fix-v4bx to linker to support EABI */
30+#undef TARGET_FIX_V4BX_SPEC 30+#undef TARGET_FIX_V4BX_SPEC
@@ -38,6 +38,3 @@ index e4ade2e2ab0..108863f69d2 100644
38 LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC, \ 38 LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC, \
39 LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC) 39 LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
40 40
41--
422.25.1
43
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/meta/recipes-devtools/gcc/gcc-10.1/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch
index 6f0833ccda..1dc4bb859a 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch
@@ -1,8 +1,8 @@
1From 7effc632d65c2d72bf6fa32a219ec2f82fef9405 Mon Sep 17 00:00:00 2001 1From 6b363c2c1c089ee900efa6013aefba1003840a37 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:33:04 +0400 3Date: Fri, 29 Mar 2013 09:33:04 +0400
4Subject: [PATCH 16/39] Use the multilib config files from ${B} instead of 4Subject: [PATCH] Use the multilib config files from ${B} instead of using the
5 using the ones from ${S} 5 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}
8so that the source can be shared between gcc-cross-initial, 8so that the source can be shared between gcc-cross-initial,
@@ -18,10 +18,10 @@ Upstream-Status: Inappropriate [configuration]
18 2 files changed, 36 insertions(+), 8 deletions(-) 18 2 files changed, 36 insertions(+), 8 deletions(-)
19 19
20diff --git a/gcc/configure b/gcc/configure 20diff --git a/gcc/configure b/gcc/configure
21index 52f52b0ec86..a5f208af7cf 100755 21index 6080f86145e..825a9652329 100755
22--- a/gcc/configure 22--- a/gcc/configure
23+++ b/gcc/configure 23+++ b/gcc/configure
24@@ -12322,10 +12322,20 @@ done 24@@ -12685,10 +12685,20 @@ done
25 tmake_file_= 25 tmake_file_=
26 for f in ${tmake_file} 26 for f in ${tmake_file}
27 do 27 do
@@ -44,9 +44,9 @@ index 52f52b0ec86..a5f208af7cf 100755
44+ ;; 44+ ;;
45+ esac 45+ esac
46 done 46 done
47 tmake_file="${tmake_file_}" 47 tmake_file="${tmake_file_}${omp_device_property_tmake_file}"
48 48
49@@ -12336,6 +12346,10 @@ tm_file_list="options.h" 49@@ -12699,6 +12709,10 @@ tm_file_list="options.h"
50 tm_include_list="options.h insn-constants.h" 50 tm_include_list="options.h insn-constants.h"
51 for f in $tm_file; do 51 for f in $tm_file; do
52 case $f in 52 case $f in
@@ -58,10 +58,10 @@ index 52f52b0ec86..a5f208af7cf 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 242ad28ec83..b7a7ead1c02 100644 61index 42be5252778..6099eb3251f 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@@ -2118,10 +2118,20 @@ done
65 tmake_file_= 65 tmake_file_=
66 for f in ${tmake_file} 66 for f in ${tmake_file}
67 do 67 do
@@ -84,9 +84,9 @@ index 242ad28ec83..b7a7ead1c02 100644
84+ ;; 84+ ;;
85+ esac 85+ esac
86 done 86 done
87 tmake_file="${tmake_file_}" 87 tmake_file="${tmake_file_}${omp_device_property_tmake_file}"
88 88
89@@ -1962,6 +1972,10 @@ tm_file_list="options.h" 89@@ -2132,6 +2142,10 @@ tm_file_list="options.h"
90 tm_include_list="options.h insn-constants.h" 90 tm_include_list="options.h insn-constants.h"
91 for f in $tm_file; do 91 for f in $tm_file; do
92 case $f in 92 case $f in
@@ -97,6 +97,3 @@ index 242ad28ec83..b7a7ead1c02 100644
97 ./* ) 97 ./* )
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--
1012.25.1
102
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/meta/recipes-devtools/gcc/gcc-10.1/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
index 96da013bf2..05f12847e9 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
@@ -1,8 +1,8 @@
1From a2b2bf77621f344a849e55ab179ece8587d19234 Mon Sep 17 00:00:00 2001 1From 08752c2f1d21553301bee5757c453c6a36cbe03c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 09:39:38 +0000 3Date: Fri, 20 Feb 2015 09:39:38 +0000
4Subject: [PATCH 17/39] Avoid using libdir from .la which usually points to a 4Subject: [PATCH] Avoid using libdir from .la which usually points to a host
5 host path 5 path
6 6
7Upstream-Status: Inappropriate [embedded specific] 7Upstream-Status: Inappropriate [embedded specific]
8 8
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 1 file changed, 3 insertions(+) 13 1 file changed, 3 insertions(+)
14 14
15diff --git a/ltmain.sh b/ltmain.sh 15diff --git a/ltmain.sh b/ltmain.sh
16index 8e222f7c16b..0a93b4e5c3b 100644 16index ee938056bef..9ebc7e3d1e0 100644
17--- a/ltmain.sh 17--- a/ltmain.sh
18+++ b/ltmain.sh 18+++ b/ltmain.sh
19@@ -5628,6 +5628,9 @@ func_mode_link () 19@@ -5628,6 +5628,9 @@ func_mode_link ()
@@ -26,6 +26,3 @@ index 8e222f7c16b..0a93b4e5c3b 100644
26 dir="$libdir" 26 dir="$libdir"
27 absdir="$libdir" 27 absdir="$libdir"
28 fi 28 fi
29--
302.25.1
31
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0018-export-CPP.patch b/meta/recipes-devtools/gcc/gcc-10.1/0018-export-CPP.patch
index 2385099c25..886a1221d3 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0018-export-CPP.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0018-export-CPP.patch
@@ -1,7 +1,7 @@
1From cafb6a621c05c1f238679d52fc026446f38c8af5 Mon Sep 17 00:00:00 2001 1From 5c3d66378c7ff60ca11a875aa4aa6f8a8529d43a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 09:40:59 +0000 3Date: Fri, 20 Feb 2015 09:40:59 +0000
4Subject: [PATCH 18/39] export CPP 4Subject: [PATCH] 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 64e091ba71d..255822e3f27 100644 40index 36e369df6e7..c717903bb13 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 = \
@@ -48,6 +48,3 @@ index 64e091ba71d..255822e3f27 100644
48 CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \ 48 CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
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--
522.25.1
53
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0019-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc-10.1/0019-Ensure-target-gcc-headers-can-be-included.patch
index e0129d1f96..2797b2c22d 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0019-Ensure-target-gcc-headers-can-be-included.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0019-Ensure-target-gcc-headers-can-be-included.patch
@@ -1,7 +1,7 @@
1From 182057b80891edc0e8d46835e2d8bfd28330a55a Mon Sep 17 00:00:00 2001 1From 378b752c5d9a3dba4e58cdadf8b4b4f34ea99a76 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 10:25:11 +0000 3Date: Fri, 20 Feb 2015 10:25:11 +0000
4Subject: [PATCH 19/39] Ensure target gcc headers can be included 4Subject: [PATCH] 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
@@ -21,7 +21,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
21 2 files changed, 6 insertions(+) 21 2 files changed, 6 insertions(+)
22 22
23diff --git a/gcc/Makefile.in b/gcc/Makefile.in 23diff --git a/gcc/Makefile.in b/gcc/Makefile.in
24index 57cf7804f0a..7772342ad5e 100644 24index 480c9366418..011c7ac2db6 100644
25--- a/gcc/Makefile.in 25--- a/gcc/Makefile.in
26+++ b/gcc/Makefile.in 26+++ b/gcc/Makefile.in
27@@ -618,6 +618,7 @@ libexecdir = @libexecdir@ 27@@ -618,6 +618,7 @@ libexecdir = @libexecdir@
@@ -32,7 +32,7 @@ index 57cf7804f0a..7772342ad5e 100644
32 # Directory in which the compiler finds executables 32 # Directory in which the compiler finds executables
33 libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) 33 libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
34 # Directory in which all plugin resources are installed 34 # Directory in which all plugin resources are installed
35@@ -2867,6 +2868,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" 35@@ -2946,6 +2947,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\"
36 36
37 PREPROCESSOR_DEFINES = \ 37 PREPROCESSOR_DEFINES = \
38 -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ 38 -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
@@ -41,7 +41,7 @@ index 57cf7804f0a..7772342ad5e 100644
41 -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ 41 -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
42 -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ 42 -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \
43diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c 43diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c
44index c4796385643..980e2bd47a7 100644 44index af38cc494ea..2f43b88a0c3 100644
45--- a/gcc/cppdefault.c 45--- a/gcc/cppdefault.c
46+++ b/gcc/cppdefault.c 46+++ b/gcc/cppdefault.c
47@@ -59,6 +59,10 @@ const struct default_include cpp_include_defaults[] 47@@ -59,6 +59,10 @@ const struct default_include cpp_include_defaults[]
@@ -55,6 +55,3 @@ index c4796385643..980e2bd47a7 100644
55 #ifdef LOCAL_INCLUDE_DIR 55 #ifdef LOCAL_INCLUDE_DIR
56 /* /usr/local/include comes before the fixincluded header files. */ 56 /* /usr/local/include comes before the fixincluded header files. */
57 { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, 57 { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },
58--
592.25.1
60
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/meta/recipes-devtools/gcc/gcc-10.1/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch
index e363c7d445..c3baf8b451 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch
@@ -1,8 +1,8 @@
1From f3edad81d80dde5d64bf77e6abafda54db10b824 Mon Sep 17 00:00:00 2001 1From 870e805d705d99d9b9d7dbd09727f9c1d2ad9c1d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 3 Mar 2015 08:21:19 +0000 3Date: Tue, 3 Mar 2015 08:21:19 +0000
4Subject: [PATCH 21/39] Don't search host directory during "relink" if 4Subject: [PATCH] Don't search host directory during "relink" if $inst_prefix
5 $inst_prefix is provided 5 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
8 8
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 3 insertions(+), 2 deletions(-) 14 1 file changed, 3 insertions(+), 2 deletions(-)
15 15
16diff --git a/ltmain.sh b/ltmain.sh 16diff --git a/ltmain.sh b/ltmain.sh
17index 0a93b4e5c3b..6de6ed2f9a0 100644 17index 9ebc7e3d1e0..7ea79fa8be6 100644
18--- a/ltmain.sh 18--- a/ltmain.sh
19+++ b/ltmain.sh 19+++ b/ltmain.sh
20@@ -6004,12 +6004,13 @@ func_mode_link () 20@@ -6004,12 +6004,13 @@ func_mode_link ()
@@ -33,6 +33,3 @@ index 0a93b4e5c3b..6de6ed2f9a0 100644
33 ;; 33 ;;
34 esac 34 esac
35 fi 35 fi
36--
372.25.1
38
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc-10.1/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
index 846c0de5e8..abee48669d 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
@@ -1,7 +1,7 @@
1From b8ea2c2c7d33376f5dd651646c7e822000e47749 Mon Sep 17 00:00:00 2001 1From aba42de763a619355471efd1573561b0cbf51162 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 28 Apr 2015 23:15:27 -0700 3Date: Tue, 28 Apr 2015 23:15:27 -0700
4Subject: [PATCH 22/39] Use SYSTEMLIBS_DIR replacement instead of hardcoding 4Subject: [PATCH] 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 5e8b34ded03..7e628bf661e 100644 15index e587e2e9ad6..ddc62895693 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 @@
@@ -24,6 +24,3 @@ index 5e8b34ded03..7e628bf661e 100644
24 24
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--
282.25.1
29
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0023-aarch64-Add-support-for-musl-ldso.patch b/meta/recipes-devtools/gcc/gcc-10.1/0022-aarch64-Add-support-for-musl-ldso.patch
index 102d6fc742..c55b66d4ba 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0023-aarch64-Add-support-for-musl-ldso.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0022-aarch64-Add-support-for-musl-ldso.patch
@@ -1,7 +1,7 @@
1From 8645b57e7c0dfd93afee5caeaa534c714f449ba1 Mon Sep 17 00:00:00 2001 1From d63820a78d92f302410358293546f01c7ad17bd8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 28 Apr 2015 23:18:39 -0700 3Date: Tue, 28 Apr 2015 23:18:39 -0700
4Subject: [PATCH 23/39] aarch64: Add support for musl ldso 4Subject: [PATCH] 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 7e628bf661e..1717cbe5471 100644 14index ddc62895693..b301825313a 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 @@
@@ -23,6 +23,3 @@ index 7e628bf661e..1717cbe5471 100644
23 23
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--
272.25.1
28
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/meta/recipes-devtools/gcc/gcc-10.1/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch
index 443e0a2ca6..80c4d2292c 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch
@@ -1,7 +1,7 @@
1From b1666565e4e133ee41f32fa8032165bcb06afe9a Mon Sep 17 00:00:00 2001 1From 3474e16ad4ea8cf4e0e330568e3bc9039e723dce Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Sun, 5 Jul 2015 20:25:18 -0700 3Date: Sun, 5 Jul 2015 20:25:18 -0700
4Subject: [PATCH 24/39] libcc1: fix libcc1's install path and rpath 4Subject: [PATCH] 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
@@ -20,7 +20,7 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
20 2 files changed, 4 insertions(+), 4 deletions(-) 20 2 files changed, 4 insertions(+), 4 deletions(-)
21 21
22diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am 22diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am
23index 72c6aead475..42a87740b31 100644 23index c005b0dad4a..ec31d35b7b9 100644
24--- a/libcc1/Makefile.am 24--- a/libcc1/Makefile.am
25+++ b/libcc1/Makefile.am 25+++ b/libcc1/Makefile.am
26@@ -37,8 +37,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ 26@@ -37,8 +37,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \
@@ -49,6 +49,3 @@ index 7104b649026..2103c477468 100644
49 @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la 49 @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la
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--
532.25.1
54
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0025-handle-sysroot-support-for-nativesdk-gcc.patch b/meta/recipes-devtools/gcc/gcc-10.1/0024-handle-sysroot-support-for-nativesdk-gcc.patch
index 59ac97eaed..1a65ece7bf 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0025-handle-sysroot-support-for-nativesdk-gcc.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0024-handle-sysroot-support-for-nativesdk-gcc.patch
@@ -1,7 +1,7 @@
1From 7d614a84709d7dc4a2529c3d529e2da8541f9fd4 Mon Sep 17 00:00:00 2001 1From bb1f359e34649516e61305e9748534cce7e0ee70 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 7 Dec 2015 23:39:54 +0000 3Date: Mon, 7 Dec 2015 23:39:54 +0000
4Subject: [PATCH 25/39] handle sysroot support for nativesdk-gcc 4Subject: [PATCH] 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
@@ -32,18 +32,33 @@ implementation.)
32 32
33Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> 33Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
34--- 34---
35 c-family/c-opts.c | 4 +-- 35 gcc/c-family/c-opts.c | 4 +--
36 cppdefault.c | 63 +++++++++++++++++++++++++++++++++--------------------- 36 gcc/cppdefault.c | 63 ++++++++++++++++++++++++++-----------------
37 cppdefault.h | 13 ++++------- 37 gcc/cppdefault.h | 13 ++++-----
38 gcc.c | 20 ++++++++++++----- 38 gcc/gcc.c | 20 +++++++++-----
39 incpath.c | 12 +++++----- 39 gcc/incpath.c | 12 ++++-----
40 prefix.c | 4 +-- 40 gcc/prefix.c | 6 +++--
41 6 files changed, 68 insertions(+), 48 deletions(-) 41 6 files changed, 70 insertions(+), 48 deletions(-)
42 42
43Index: gcc-9.3.0/gcc/cppdefault.c 43diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
44=================================================================== 44index 58ba0948e79..806bbcfb7a5 100644
45--- gcc-9.3.0.orig/gcc/cppdefault.c 45--- a/gcc/c-family/c-opts.c
46+++ gcc-9.3.0/gcc/cppdefault.c 46+++ b/gcc/c-family/c-opts.c
47@@ -1409,8 +1409,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain)
48 size_t prefix_len, suffix_len;
49
50 suffix_len = strlen (suffix);
51- prefix = iprefix ? iprefix : cpp_GCC_INCLUDE_DIR;
52- prefix_len = iprefix ? strlen (iprefix) : cpp_GCC_INCLUDE_DIR_len;
53+ prefix = iprefix ? iprefix : GCC_INCLUDE_DIRVAR;
54+ prefix_len = iprefix ? strlen (iprefix) : strlen(GCC_INCLUDE_DIRVAR) - 7;
55
56 path = (char *) xmalloc (prefix_len + suffix_len + 1);
57 memcpy (path, prefix, prefix_len);
58diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c
59index 2f43b88a0c3..6b6be04686c 100644
60--- a/gcc/cppdefault.c
61+++ b/gcc/cppdefault.c
47@@ -35,6 +35,30 @@ 62@@ -35,6 +35,30 @@
48 # undef CROSS_INCLUDE_DIR 63 # undef CROSS_INCLUDE_DIR
49 #endif 64 #endif
@@ -75,7 +90,7 @@ Index: gcc-9.3.0/gcc/cppdefault.c
75 const struct default_include cpp_include_defaults[] 90 const struct default_include cpp_include_defaults[]
76 #ifdef INCLUDE_DEFAULTS 91 #ifdef INCLUDE_DEFAULTS
77 = INCLUDE_DEFAULTS; 92 = INCLUDE_DEFAULTS;
78@@ -42,38 +66,38 @@ const struct default_include cpp_include 93@@ -42,38 +66,38 @@ const struct default_include cpp_include_defaults[]
79 = { 94 = {
80 #ifdef GPLUSPLUS_INCLUDE_DIR 95 #ifdef GPLUSPLUS_INCLUDE_DIR
81 /* Pick up GNU C++ generic include files. */ 96 /* Pick up GNU C++ generic include files. */
@@ -123,7 +138,7 @@ Index: gcc-9.3.0/gcc/cppdefault.c
123 /* A multilib suffix needs adding if different multilibs use 138 /* A multilib suffix needs adding if different multilibs use
124 different headers. */ 139 different headers. */
125 #ifdef SYSROOT_HEADERS_SUFFIX_SPEC 140 #ifdef SYSROOT_HEADERS_SUFFIX_SPEC
126@@ -85,33 +109,24 @@ const struct default_include cpp_include 141@@ -85,33 +109,24 @@ const struct default_include cpp_include_defaults[]
127 #endif 142 #endif
128 #ifdef CROSS_INCLUDE_DIR 143 #ifdef CROSS_INCLUDE_DIR
129 /* One place the target system's headers might be. */ 144 /* One place the target system's headers might be. */
@@ -163,10 +178,10 @@ Index: gcc-9.3.0/gcc/cppdefault.c
163 178
164 /* This value is set by cpp_relocated at runtime */ 179 /* This value is set by cpp_relocated at runtime */
165 const char *gcc_exec_prefix; 180 const char *gcc_exec_prefix;
166Index: gcc-9.3.0/gcc/cppdefault.h 181diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h
167=================================================================== 182index a681264f75e..5e10a2fa140 100644
168--- gcc-9.3.0.orig/gcc/cppdefault.h 183--- a/gcc/cppdefault.h
169+++ gcc-9.3.0/gcc/cppdefault.h 184+++ b/gcc/cppdefault.h
170@@ -33,7 +33,8 @@ 185@@ -33,7 +33,8 @@
171 186
172 struct default_include 187 struct default_include
@@ -198,11 +213,11 @@ Index: gcc-9.3.0/gcc/cppdefault.h
198 /* The run-time execution prefix. This is typically the lib/gcc 213 /* The run-time execution prefix. This is typically the lib/gcc
199 subdirectory of the actual installation. */ 214 subdirectory of the actual installation. */
200 extern const char *gcc_exec_prefix; 215 extern const char *gcc_exec_prefix;
201Index: gcc-9.3.0/gcc/gcc.c 216diff --git a/gcc/gcc.c b/gcc/gcc.c
202=================================================================== 217index c87f603955f..535d5c3bb65 100644
203--- gcc-9.3.0.orig/gcc/gcc.c 218--- a/gcc/gcc.c
204+++ gcc-9.3.0/gcc/gcc.c 219+++ b/gcc/gcc.c
205@@ -253,6 +253,8 @@ FILE *report_times_to_file = NULL; 220@@ -252,6 +252,8 @@ FILE *report_times_to_file = NULL;
206 #endif 221 #endif
207 static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT; 222 static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT;
208 223
@@ -211,7 +226,7 @@ Index: gcc-9.3.0/gcc/gcc.c
211 /* Nonzero means pass the updated target_system_root to the compiler. */ 226 /* Nonzero means pass the updated target_system_root to the compiler. */
212 227
213 static int target_system_root_changed; 228 static int target_system_root_changed;
214@@ -527,6 +529,7 @@ or with constant text in a single argume 229@@ -526,6 +528,7 @@ or with constant text in a single argument.
215 %G process LIBGCC_SPEC as a spec. 230 %G process LIBGCC_SPEC as a spec.
216 %R Output the concatenation of target_system_root and 231 %R Output the concatenation of target_system_root and
217 target_sysroot_suffix. 232 target_sysroot_suffix.
@@ -219,7 +234,7 @@ Index: gcc-9.3.0/gcc/gcc.c
219 %S process STARTFILE_SPEC as a spec. A capital S is actually used here. 234 %S process STARTFILE_SPEC as a spec. A capital S is actually used here.
220 %E process ENDFILE_SPEC as a spec. A capital E is actually used here. 235 %E process ENDFILE_SPEC as a spec. A capital E is actually used here.
221 %C process CPP_SPEC as a spec. 236 %C process CPP_SPEC as a spec.
222@@ -1500,10 +1503,10 @@ static const char *gcc_libexec_prefix; 237@@ -1499,10 +1502,10 @@ static const char *gcc_libexec_prefix;
223 gcc_exec_prefix is set because, in that case, we know where the 238 gcc_exec_prefix is set because, in that case, we know where the
224 compiler has been installed, and use paths relative to that 239 compiler has been installed, and use paths relative to that
225 location instead. */ 240 location instead. */
@@ -234,7 +249,7 @@ Index: gcc-9.3.0/gcc/gcc.c
234 249
235 /* For native compilers, these are well-known paths containing 250 /* For native compilers, these are well-known paths containing
236 components that may be provided by the system. For cross 251 components that may be provided by the system. For cross
237@@ -1511,9 +1514,9 @@ static const char *const standard_startf 252@@ -1510,9 +1513,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
238 static const char *md_exec_prefix = MD_EXEC_PREFIX; 253 static const char *md_exec_prefix = MD_EXEC_PREFIX;
239 static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; 254 static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
240 static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1; 255 static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
@@ -246,7 +261,7 @@ Index: gcc-9.3.0/gcc/gcc.c
246 = STANDARD_STARTFILE_PREFIX_2; 261 = STANDARD_STARTFILE_PREFIX_2;
247 262
248 /* A relative path to be used in finding the location of tools 263 /* A relative path to be used in finding the location of tools
249@@ -5922,6 +5925,11 @@ do_spec_1 (const char *spec, int inswitc 264@@ -5952,6 +5955,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part)
250 } 265 }
251 break; 266 break;
252 267
@@ -258,26 +273,11 @@ Index: gcc-9.3.0/gcc/gcc.c
258 case 'S': 273 case 'S':
259 value = do_spec_1 (startfile_spec, 0, NULL); 274 value = do_spec_1 (startfile_spec, 0, NULL);
260 if (value != 0) 275 if (value != 0)
261Index: gcc-9.3.0/gcc/c-family/c-opts.c 276diff --git a/gcc/incpath.c b/gcc/incpath.c
262=================================================================== 277index 9098ab044ab..bfad4ebe382 100644
263--- gcc-9.3.0.orig/gcc/c-family/c-opts.c 278--- a/gcc/incpath.c
264+++ gcc-9.3.0/gcc/c-family/c-opts.c 279+++ b/gcc/incpath.c
265@@ -1382,8 +1382,8 @@ add_prefixed_path (const char *suffix, i 280@@ -131,7 +131,7 @@ add_standard_paths (const char *sysroot, const char *iprefix,
266 size_t prefix_len, suffix_len;
267
268 suffix_len = strlen (suffix);
269- prefix = iprefix ? iprefix : cpp_GCC_INCLUDE_DIR;
270- prefix_len = iprefix ? strlen (iprefix) : cpp_GCC_INCLUDE_DIR_len;
271+ prefix = iprefix ? iprefix : GCC_INCLUDE_DIRVAR;
272+ prefix_len = iprefix ? strlen (iprefix) : strlen(GCC_INCLUDE_DIRVAR) - 7;
273
274 path = (char *) xmalloc (prefix_len + suffix_len + 1);
275 memcpy (path, prefix, prefix_len);
276Index: gcc-9.3.0/gcc/incpath.c
277===================================================================
278--- gcc-9.3.0.orig/gcc/incpath.c
279+++ gcc-9.3.0/gcc/incpath.c
280@@ -131,7 +131,7 @@ add_standard_paths (const char *sysroot,
281 int relocated = cpp_relocated (); 281 int relocated = cpp_relocated ();
282 size_t len; 282 size_t len;
283 283
@@ -286,7 +286,7 @@ Index: gcc-9.3.0/gcc/incpath.c
286 { 286 {
287 /* Look for directories that start with the standard prefix. 287 /* Look for directories that start with the standard prefix.
288 "Translate" them, i.e. replace /usr/local/lib/gcc... with 288 "Translate" them, i.e. replace /usr/local/lib/gcc... with
289@@ -145,7 +145,7 @@ add_standard_paths (const char *sysroot, 289@@ -145,7 +145,7 @@ add_standard_paths (const char *sysroot, const char *iprefix,
290 now. */ 290 now. */
291 if (sysroot && p->add_sysroot) 291 if (sysroot && p->add_sysroot)
292 continue; 292 continue;
@@ -295,7 +295,7 @@ Index: gcc-9.3.0/gcc/incpath.c
295 { 295 {
296 char *str = concat (iprefix, p->fname + len, NULL); 296 char *str = concat (iprefix, p->fname + len, NULL);
297 if (p->multilib == 1 && imultilib) 297 if (p->multilib == 1 && imultilib)
298@@ -185,7 +185,7 @@ add_standard_paths (const char *sysroot, 298@@ -185,7 +185,7 @@ add_standard_paths (const char *sysroot, const char *iprefix,
299 free (sysroot_no_trailing_dir_separator); 299 free (sysroot_no_trailing_dir_separator);
300 } 300 }
301 else if (!p->add_sysroot && relocated 301 else if (!p->add_sysroot && relocated
@@ -304,7 +304,7 @@ Index: gcc-9.3.0/gcc/incpath.c
304 { 304 {
305 static const char *relocated_prefix; 305 static const char *relocated_prefix;
306 char *ostr; 306 char *ostr;
307@@ -202,12 +202,12 @@ add_standard_paths (const char *sysroot, 307@@ -202,12 +202,12 @@ add_standard_paths (const char *sysroot, const char *iprefix,
308 dummy = concat (gcc_exec_prefix, "dummy", NULL); 308 dummy = concat (gcc_exec_prefix, "dummy", NULL);
309 relocated_prefix 309 relocated_prefix
310 = make_relative_prefix (dummy, 310 = make_relative_prefix (dummy,
@@ -320,11 +320,11 @@ Index: gcc-9.3.0/gcc/incpath.c
320 NULL); 320 NULL);
321 str = update_path (ostr, p->component); 321 str = update_path (ostr, p->component);
322 free (ostr); 322 free (ostr);
323Index: gcc-9.3.0/gcc/prefix.c 323diff --git a/gcc/prefix.c b/gcc/prefix.c
324=================================================================== 324index 1a403e535bd..3257ed3cd3e 100644
325--- gcc-9.3.0.orig/gcc/prefix.c 325--- a/gcc/prefix.c
326+++ gcc-9.3.0/gcc/prefix.c 326+++ b/gcc/prefix.c
327@@ -72,7 +72,9 @@ License along with GCC; see the file COP 327@@ -72,7 +72,9 @@ License along with GCC; see the file COPYING3. If not see
328 #include "prefix.h" 328 #include "prefix.h"
329 #include "common/common-target.h" 329 #include "common/common-target.h"
330 330
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/meta/recipes-devtools/gcc/gcc-10.1/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch
index abfa7516da..abf1f8491f 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch
@@ -1,7 +1,7 @@
1From 6c39a22c3e85d20dee9e2fc2274e95da980de4d0 Mon Sep 17 00:00:00 2001 1From 9c0c73ee48dbee2aad57f4dcdad1b7b74e77b944 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 7 Dec 2015 23:41:45 +0000 3Date: Mon, 7 Dec 2015 23:41:45 +0000
4Subject: [PATCH 26/39] Search target sysroot gcc version specific dirs with 4Subject: [PATCH] Search target sysroot gcc version specific dirs with
5 multilib. 5 multilib.
6 6
7We install the gcc libraries (such as crtbegin.p) into 7We install the gcc libraries (such as crtbegin.p) into
@@ -51,10 +51,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
51 1 file changed, 28 insertions(+), 1 deletion(-) 51 1 file changed, 28 insertions(+), 1 deletion(-)
52 52
53diff --git a/gcc/gcc.c b/gcc/gcc.c 53diff --git a/gcc/gcc.c b/gcc/gcc.c
54index 59fb64f5fd5..3e79da4238c 100644 54index 535d5c3bb65..04647ae812d 100644
55--- a/gcc/gcc.c 55--- a/gcc/gcc.c
56+++ b/gcc/gcc.c 56+++ b/gcc/gcc.c
57@@ -2617,7 +2617,7 @@ for_each_path (const struct path_prefix *paths, 57@@ -2616,7 +2616,7 @@ for_each_path (const struct path_prefix *paths,
58 if (path == NULL) 58 if (path == NULL)
59 { 59 {
60 len = paths->max_len + extra_space + 1; 60 len = paths->max_len + extra_space + 1;
@@ -63,7 +63,7 @@ index 59fb64f5fd5..3e79da4238c 100644
63 path = XNEWVEC (char, len); 63 path = XNEWVEC (char, len);
64 } 64 }
65 65
66@@ -2629,6 +2629,33 @@ for_each_path (const struct path_prefix *paths, 66@@ -2628,6 +2628,33 @@ for_each_path (const struct path_prefix *paths,
67 /* Look first in MACHINE/VERSION subdirectory. */ 67 /* Look first in MACHINE/VERSION subdirectory. */
68 if (!skip_multi_dir) 68 if (!skip_multi_dir)
69 { 69 {
@@ -97,6 +97,3 @@ index 59fb64f5fd5..3e79da4238c 100644
97 memcpy (path + len, multi_suffix, suffix_len + 1); 97 memcpy (path + len, multi_suffix, suffix_len + 1);
98 ret = callback (path, callback_info); 98 ret = callback (path, callback_info);
99 if (ret) 99 if (ret)
100--
1012.25.1
102
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0027-Fix-various-_FOR_BUILD-and-related-variables.patch b/meta/recipes-devtools/gcc/gcc-10.1/0026-Fix-various-_FOR_BUILD-and-related-variables.patch
index ae8acc7f13..97bf2f3a73 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0027-Fix-various-_FOR_BUILD-and-related-variables.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0026-Fix-various-_FOR_BUILD-and-related-variables.patch
@@ -1,7 +1,7 @@
1From 07db34b16b6c8e3d948b417f2fc052500ffb77d3 Mon Sep 17 00:00:00 2001 1From 3a003af8804dda90fdf4862eca5f66cb12faaf02 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 7 Dec 2015 23:42:45 +0000 3Date: Mon, 7 Dec 2015 23:42:45 +0000
4Subject: [PATCH 27/39] Fix various _FOR_BUILD and related variables 4Subject: [PATCH] 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 255822e3f27..9dc0dff0474 100644 29index c717903bb13..5abc649868d 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 = \
@@ -55,7 +55,7 @@ index 255822e3f27..9dc0dff0474 100644
55 ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \ 55 ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
56 CFLAGS="$(CFLAGS)"; export CFLAGS; \ 56 CFLAGS="$(CFLAGS)"; export CFLAGS; \
57 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ 57 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
58@@ -775,6 +780,7 @@ BASE_FLAGS_TO_PASS = \ 58@@ -776,6 +781,7 @@ BASE_FLAGS_TO_PASS = \
59 "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ 59 "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
60 "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ 60 "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
61 "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \ 61 "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
@@ -64,7 +64,7 @@ index 255822e3f27..9dc0dff0474 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 41cae58a267..d3f6b79acdc 100644 67index efed1511750..778beb705b4 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 41cae58a267..d3f6b79acdc 100644
94 CFLAGS="$(CFLAGS)"; export CFLAGS; \ 94 CFLAGS="$(CFLAGS)"; export CFLAGS; \
95 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ 95 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
96diff --git a/gcc/Makefile.in b/gcc/Makefile.in 96diff --git a/gcc/Makefile.in b/gcc/Makefile.in
97index 7772342ad5e..02fec881b6d 100644 97index 011c7ac2db6..2f1165f7b5e 100644
98--- a/gcc/Makefile.in 98--- a/gcc/Makefile.in
99+++ b/gcc/Makefile.in 99+++ b/gcc/Makefile.in
100@@ -805,7 +805,7 @@ BUILD_LDFLAGS=@BUILD_LDFLAGS@ 100@@ -805,7 +805,7 @@ BUILD_LDFLAGS=@BUILD_LDFLAGS@
@@ -107,10 +107,10 @@ index 7772342ad5e..02fec881b6d 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 a5f208af7cf..0788b7bf0b5 100755 110index 825a9652329..ff46cf58960 100755
111--- a/gcc/configure 111--- a/gcc/configure
112+++ b/gcc/configure 112+++ b/gcc/configure
113@@ -11966,7 +11966,7 @@ else 113@@ -12314,7 +12314,7 @@ else
114 CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ 114 CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
115 CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \ 115 CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \
116 LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \ 116 LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \
@@ -118,12 +118,12 @@ index a5f208af7cf..0788b7bf0b5 100755
118+ GMPINC="" CPPFLAGS="${CPPFLAGS_FOR_BUILD} -DGENERATOR_FILE" \ 118+ GMPINC="" CPPFLAGS="${CPPFLAGS_FOR_BUILD} -DGENERATOR_FILE" \
119 ${realsrcdir}/configure \ 119 ${realsrcdir}/configure \
120 --enable-languages=${enable_languages-all} \ 120 --enable-languages=${enable_languages-all} \
121 --target=$target_alias --host=$build_alias --build=$build_alias 121 ${enable_obsolete+--enable-obsolete="$enable_obsolete"} \
122diff --git a/gcc/configure.ac b/gcc/configure.ac 122diff --git a/gcc/configure.ac b/gcc/configure.ac
123index b7a7ead1c02..5ab50fae0f3 100644 123index 6099eb3251f..b3c345b61dc 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@@ -1898,7 +1898,7 @@ else
127 CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ 127 CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
128 CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \ 128 CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \
129 LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \ 129 LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \
@@ -131,7 +131,4 @@ index b7a7ead1c02..5ab50fae0f3 100644
131+ GMPINC="" CPPFLAGS="${CPPFLAGS_FOR_BUILD} -DGENERATOR_FILE" \ 131+ GMPINC="" CPPFLAGS="${CPPFLAGS_FOR_BUILD} -DGENERATOR_FILE" \
132 ${realsrcdir}/configure \ 132 ${realsrcdir}/configure \
133 --enable-languages=${enable_languages-all} \ 133 --enable-languages=${enable_languages-all} \
134 --target=$target_alias --host=$build_alias --build=$build_alias 134 ${enable_obsolete+--enable-obsolete="$enable_obsolete"} \
135--
1362.25.1
137
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch b/meta/recipes-devtools/gcc/gcc-10.1/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch
index 52a5d97aef..3cd75b7183 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch
@@ -1,7 +1,7 @@
1From 59543e897eb35194fb47288f7762e40a18fff611 Mon Sep 17 00:00:00 2001 1From 4e53d0ae70af85af0e112a48a3e4dfe4c39f4a8d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 2 Feb 2016 10:26:10 -0800 3Date: Tue, 2 Feb 2016 10:26:10 -0800
4Subject: [PATCH 28/39] nios2: Define MUSL_DYNAMIC_LINKER 4Subject: [PATCH] nios2: Define MUSL_DYNAMIC_LINKER
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 1 file changed, 1 insertion(+) 12 1 file changed, 1 insertion(+)
13 13
14diff --git a/gcc/config/nios2/linux.h b/gcc/config/nios2/linux.h 14diff --git a/gcc/config/nios2/linux.h b/gcc/config/nios2/linux.h
15index 698734add35..eeee60ecfea 100644 15index 4bdcdcca1f0..e7943a9d640 100644
16--- a/gcc/config/nios2/linux.h 16--- a/gcc/config/nios2/linux.h
17+++ b/gcc/config/nios2/linux.h 17+++ b/gcc/config/nios2/linux.h
18@@ -30,6 +30,7 @@ 18@@ -30,6 +30,7 @@
@@ -23,6 +23,3 @@ index 698734add35..eeee60ecfea 100644
23 23
24 #undef LINK_SPEC 24 #undef LINK_SPEC
25 #define LINK_SPEC LINK_SPEC_ENDIAN \ 25 #define LINK_SPEC LINK_SPEC_ENDIAN \
26--
272.25.1
28
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta/recipes-devtools/gcc/gcc-10.1/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
index bfa7e19dd0..2a6769a82e 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
@@ -1,7 +1,7 @@
1From 8df99af0a65ef740bcf2b7dc9a109cc57f15c3aa Mon Sep 17 00:00:00 2001 1From 5db0404eb770ac477fd99d444226bcf021067584 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 27 Jun 2017 18:10:54 -0700 3Date: Tue, 27 Jun 2017 18:10:54 -0700
4Subject: [PATCH 29/39] Add ssp_nonshared to link commandline for musl targets 4Subject: [PATCH] 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
@@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
23 3 files changed, 27 insertions(+) 23 3 files changed, 27 insertions(+)
24 24
25diff --git a/gcc/config/linux.h b/gcc/config/linux.h 25diff --git a/gcc/config/linux.h b/gcc/config/linux.h
26index 4b05d8e93d1..0ca117e2ed4 100644 26index 0c1a8118a26..bdc2a2d0659 100644
27--- a/gcc/config/linux.h 27--- a/gcc/config/linux.h
28+++ b/gcc/config/linux.h 28+++ b/gcc/config/linux.h
29@@ -195,6 +195,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see 29@@ -195,6 +195,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
@@ -41,7 +41,7 @@ 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 ffceb32bf65..c82cb2ad05b 100644 44index b7026fcbee7..dd54d6c393e 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@@ -94,6 +94,16 @@ 47@@ -94,6 +94,16 @@
@@ -62,10 +62,10 @@ index ffceb32bf65..c82cb2ad05b 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 45a9a7cae59..d1e88a40e82 100644 65index 967c1c43c63..dc5e4d97975 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@@ -456,6 +456,16 @@ extern int dot_symbols; 68@@ -452,6 +452,16 @@ extern int dot_symbols;
69 " -m elf64ppc") 69 " -m elf64ppc")
70 #endif 70 #endif
71 71
@@ -82,6 +82,3 @@ index 45a9a7cae59..d1e88a40e82 100644
82 #define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \ 82 #define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \
83 %{!static-pie: \ 83 %{!static-pie: \
84 %{rdynamic:-export-dynamic} \ 84 %{rdynamic:-export-dynamic} \
85--
862.25.1
87
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch b/meta/recipes-devtools/gcc/gcc-10.1/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
index 60a29fc94d..767cba0380 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
@@ -1,7 +1,7 @@
1From 31d008f5573627c6192ce9fcf729f0be464a7cf5 Mon Sep 17 00:00:00 2001 1From fbc926dbf6a47fa623b9c94cd9b09a0e90448fdc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 4 May 2016 21:11:34 -0700 3Date: Wed, 4 May 2016 21:11:34 -0700
4Subject: [PATCH 31/39] Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS 4Subject: [PATCH] Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -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/libgcc/config/t-slibgcc b/libgcc/config/t-slibgcc 14diff --git a/libgcc/config/t-slibgcc b/libgcc/config/t-slibgcc
15index 099bf23e62f..436b277a79f 100644 15index c997553447c..330352c2c81 100644
16--- a/libgcc/config/t-slibgcc 16--- a/libgcc/config/t-slibgcc
17+++ b/libgcc/config/t-slibgcc 17+++ b/libgcc/config/t-slibgcc
18@@ -32,7 +32,7 @@ SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \ 18@@ -32,7 +32,7 @@ SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
@@ -24,6 +24,3 @@ index 099bf23e62f..436b277a79f 100644
24 -o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \ 24 -o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \
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--
282.25.1
29
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0033-sync-gcc-stddef.h-with-musl.patch b/meta/recipes-devtools/gcc/gcc-10.1/0030-sync-gcc-stddef.h-with-musl.patch
index f080b0596f..4f18907a1d 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0033-sync-gcc-stddef.h-with-musl.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0030-sync-gcc-stddef.h-with-musl.patch
@@ -1,7 +1,7 @@
1From 126e342fb39d7af70c1e5a6df8ffafc8dfc3bf08 Mon Sep 17 00:00:00 2001 1From 24dc04dc8d69e3bf61322615b3ef18e02ccd311e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 3 Feb 2017 12:56:00 -0800 3Date: Fri, 3 Feb 2017 12:56:00 -0800
4Subject: [PATCH 33/39] sync gcc stddef.h with musl 4Subject: [PATCH] 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
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 9 insertions(+) 14 1 file changed, 9 insertions(+)
15 15
16diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h 16diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h
17index da692e1c01a..9a00c261adb 100644 17index 9d67eac4947..6cb5edbedb4 100644
18--- a/gcc/ginclude/stddef.h 18--- a/gcc/ginclude/stddef.h
19+++ b/gcc/ginclude/stddef.h 19+++ b/gcc/ginclude/stddef.h
20@@ -128,6 +128,7 @@ _TYPE_wchar_t; 20@@ -128,6 +128,7 @@ _TYPE_wchar_t;
@@ -86,6 +86,3 @@ index da692e1c01a..9a00c261adb 100644
86 #undef __need_wchar_t 86 #undef __need_wchar_t
87 #endif /* _STDDEF_H or __need_wchar_t. */ 87 #endif /* _STDDEF_H or __need_wchar_t. */
88 88
89--
902.25.1
91
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0034-fix-segmentation-fault-in-precompiled-header-generat.patch b/meta/recipes-devtools/gcc/gcc-10.1/0031-fix-segmentation-fault-in-precompiled-header-generat.patch
index 3b7ccb3e3d..702279af0e 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0034-fix-segmentation-fault-in-precompiled-header-generat.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0031-fix-segmentation-fault-in-precompiled-header-generat.patch
@@ -1,7 +1,7 @@
1From d26fa9ededccc7e1ec47ead7f18afc80971483a3 Mon Sep 17 00:00:00 2001 1From 27b8ba5555ada2dab076988529bfb84d00a4b901 Mon Sep 17 00:00:00 2001
2From: Juro Bystricky <juro.bystricky@intel.com> 2From: Juro Bystricky <juro.bystricky@intel.com>
3Date: Mon, 19 Mar 2018 22:31:20 -0700 3Date: Mon, 19 Mar 2018 22:31:20 -0700
4Subject: [PATCH 34/39] fix segmentation fault in precompiled header generation 4Subject: [PATCH] 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
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
19 1 file changed, 21 insertions(+), 5 deletions(-) 19 1 file changed, 21 insertions(+), 5 deletions(-)
20 20
21diff --git a/libcpp/lex.c b/libcpp/lex.c 21diff --git a/libcpp/lex.c b/libcpp/lex.c
22index eedfcbb3146..15040a1b1f0 100644 22index 56ac3a1dd73..73a951148b3 100644
23--- a/libcpp/lex.c 23--- a/libcpp/lex.c
24+++ b/libcpp/lex.c 24+++ b/libcpp/lex.c
25@@ -3280,11 +3280,27 @@ cpp_spell_token (cpp_reader *pfile, const cpp_token *token, 25@@ -3311,11 +3311,27 @@ cpp_spell_token (cpp_reader *pfile, const cpp_token *token,
26 spell_ident: 26 spell_ident:
27 case SPELL_IDENT: 27 case SPELL_IDENT:
28 if (forstring) 28 if (forstring)
@@ -55,6 +55,3 @@ index eedfcbb3146..15040a1b1f0 100644
55 else 55 else
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--
592.25.1
60
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0035-Fix-for-testsuite-failure.patch b/meta/recipes-devtools/gcc/gcc-10.1/0032-Fix-for-testsuite-failure.patch
index 5e199fbcfd..0a0767b441 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0035-Fix-for-testsuite-failure.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0032-Fix-for-testsuite-failure.patch
@@ -1,7 +1,7 @@
1From fb5bdf8f8527228d587e8af9fc700e5164b3c18c Mon Sep 17 00:00:00 2001 1From 2512aacf023c679d86d8f40caff4f6ff412b32ff Mon Sep 17 00:00:00 2001
2From: RAGHUNATH LOLUR <raghunath.lolur@kpit.com> 2From: RAGHUNATH LOLUR <raghunath.lolur@kpit.com>
3Date: Wed, 6 Dec 2017 22:52:26 -0800 3Date: Wed, 6 Dec 2017 22:52:26 -0800
4Subject: [PATCH 35/39] Fix for testsuite failure 4Subject: [PATCH] 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
@@ -220,7 +220,7 @@ index 96006b3e338..4287e4538bf 100644
220 /* This test uses __builtin_trap () instead of e.g. abort, 220 /* This test uses __builtin_trap () instead of e.g. abort,
221 because due to -mpreferred-stack-boundary=3 it should not call 221 because due to -mpreferred-stack-boundary=3 it should not call
222diff --git a/gcc/testsuite/gcc.target/i386/pr62120.c b/gcc/testsuite/gcc.target/i386/pr62120.c 222diff --git a/gcc/testsuite/gcc.target/i386/pr62120.c b/gcc/testsuite/gcc.target/i386/pr62120.c
223index bfb8c4703eb..ed04cf181f3 100644 223index 28d85d37712..c93266bd4bc 100644
224--- a/gcc/testsuite/gcc.target/i386/pr62120.c 224--- a/gcc/testsuite/gcc.target/i386/pr62120.c
225+++ b/gcc/testsuite/gcc.target/i386/pr62120.c 225+++ b/gcc/testsuite/gcc.target/i386/pr62120.c
226@@ -1,5 +1,5 @@ 226@@ -1,5 +1,5 @@
@@ -253,6 +253,3 @@ index 6cda1534311..26e37f5b8ba 100644
253 #define vector(elcount, type) \ 253 #define vector(elcount, type) \
254 __attribute__((vector_size((elcount)*sizeof(type)))) type 254 __attribute__((vector_size((elcount)*sizeof(type)))) type
255 255
256--
2572.25.1
258
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0036-Re-introduce-spe-commandline-options.patch b/meta/recipes-devtools/gcc/gcc-10.1/0033-Re-introduce-spe-commandline-options.patch
index 825e070aa3..ba7c2b8fd5 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0036-Re-introduce-spe-commandline-options.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0033-Re-introduce-spe-commandline-options.patch
@@ -1,7 +1,7 @@
1From dc23cabac6a7b2ca85b02d2a58a8916c98f382e0 Mon Sep 17 00:00:00 2001 1From 3fc06241ce37e2e4b3ed21ace28d347eb511448d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 6 Jun 2018 12:10:22 -0700 3Date: Wed, 6 Jun 2018 12:10:22 -0700
4Subject: [PATCH 36/39] Re-introduce spe commandline options 4Subject: [PATCH] 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,10 +14,10 @@ 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 f4b5c91e11f..69869350fce 100644 17index f95b8279270..0e52d51409d 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@@ -344,6 +344,18 @@ mdebug=
21 Target RejectNegative Joined 21 Target RejectNegative Joined
22 -mdebug= Enable debug output. 22 -mdebug= Enable debug output.
23 23
@@ -36,6 +36,3 @@ index f4b5c91e11f..69869350fce 100644
36 mabi=altivec 36 mabi=altivec
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--
402.25.1
41
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/meta/recipes-devtools/gcc/gcc-10.1/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
index 6f048dab82..4ce9dc6def 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
@@ -1,7 +1,7 @@
1From 761fa6e3e37608cfd1b288e721a2ff89288cd6aa Mon Sep 17 00:00:00 2001 1From b42ff59c3fe2967d37815c8db72a47b9b7f585b4 Mon Sep 17 00:00:00 2001
2From: Szabolcs Nagy <nsz@port70.net> 2From: Szabolcs Nagy <nsz@port70.net>
3Date: Sat, 24 Oct 2015 20:09:53 +0000 3Date: Sat, 24 Oct 2015 20:09:53 +0000
4Subject: [PATCH 32/39] libgcc_s: Use alias for __cpu_indicator_init instead of 4Subject: [PATCH] libgcc_s: Use alias for __cpu_indicator_init instead of
5 symver 5 symver
6 6
7Adapter from 7Adapter from
@@ -26,23 +26,23 @@ gcc/Changelog:
26 26
272015-05-11 Szabolcs Nagy <szabolcs.nagy@arm.com> 272015-05-11 Szabolcs Nagy <szabolcs.nagy@arm.com>
28 28
29 * config/i386/i386.c (ix86_expand_builtin): Make __builtin_cpu_init 29 * config/i386/i386-expand.c (ix86_expand_builtin): Make __builtin_cpu_init
30 call __cpu_indicator_init_local instead of __cpu_indicator_init. 30 call __cpu_indicator_init_local instead of __cpu_indicator_init.
31 31
32Upstream-Status: Pending 32Upstream-Status: Pending
33 33
34Signed-off-by: Khem Raj <raj.khem@gmail.com> 34Signed-off-by: Khem Raj <raj.khem@gmail.com>
35--- 35---
36 gcc/config/i386/i386.c | 4 ++-- 36 gcc/config/i386/i386-expand.c | 4 ++--
37 libgcc/config/i386/cpuinfo.c | 6 +++--- 37 libgcc/config/i386/cpuinfo.c | 6 +++---
38 libgcc/config/i386/t-linux | 2 +- 38 libgcc/config/i386/t-linux | 2 +-
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-expand.c b/gcc/config/i386/i386-expand.c
42index 1bca5a7eea6..096c4bc8e25 100644 42index 48f00c5fcfc..468f5f71fac 100644
43--- a/gcc/config/i386/i386.c 43--- a/gcc/config/i386/i386-expand.c
44+++ b/gcc/config/i386/i386.c 44+++ b/gcc/config/i386/i386-expand.c
45@@ -36685,10 +36685,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, 45@@ -10941,10 +10941,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 {
@@ -56,10 +56,10 @@ index 1bca5a7eea6..096c4bc8e25 100644
56 return expand_expr (call_expr, target, mode, EXPAND_NORMAL); 56 return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
57 } 57 }
58diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c 58diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
59index d6cb2de6265..ce04ef78205 100644 59index 00322c58622..f42bbb8af98 100644
60--- a/libgcc/config/i386/cpuinfo.c 60--- a/libgcc/config/i386/cpuinfo.c
61+++ b/libgcc/config/i386/cpuinfo.c 61+++ b/libgcc/config/i386/cpuinfo.c
62@@ -504,7 +504,7 @@ __cpu_indicator_init (void) 62@@ -508,7 +508,7 @@ __cpu_indicator_init (void)
63 return 0; 63 return 0;
64 } 64 }
65 65
@@ -81,6 +81,3 @@ index 8506a635790..564296f788e 100644
81-HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER $(CET_FLAGS) 81-HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER $(CET_FLAGS)
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--
852.25.1
86
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch b/meta/recipes-devtools/gcc/gcc-10.1/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch
index a79fc03d15..dd1bf6dedc 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3/0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch
@@ -1,7 +1,7 @@
1From 075e0929e04913538391052c32178b6a14ef0ae3 Mon Sep 17 00:00:00 2001 1From 0395060a7dcf98c5f5a65103f6aaa71d6b862259 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Thu, 12 Mar 2020 14:41:40 -0700 3Date: Tue, 10 Mar 2020 08:26:53 -0700
4Subject: [PATCH 38/39] gentypes/genmodes: Do not use __LINE__ for maintaining 4Subject: [PATCH] gentypes/genmodes: Do not use __LINE__ for maintaining
5 reproducibility 5 reproducibility
6 6
7Inserting line numbers into generated code means its not always reproducible wth 7Inserting line numbers into generated code means its not always reproducible wth
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 2 files changed, 19 insertions(+), 19 deletions(-) 17 2 files changed, 19 insertions(+), 19 deletions(-)
18 18
19diff --git a/gcc/gengtype.c b/gcc/gengtype.c 19diff --git a/gcc/gengtype.c b/gcc/gengtype.c
20index 53317337cf8..bbb26151671 100644 20index 981577481af..d5700fff401 100644
21--- a/gcc/gengtype.c 21--- a/gcc/gengtype.c
22+++ b/gcc/gengtype.c 22+++ b/gcc/gengtype.c
23@@ -991,7 +991,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt, 23@@ -991,7 +991,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt,
@@ -38,7 +38,7 @@ index 53317337cf8..bbb26151671 100644
38 38
39 /* Reverse a linked list of 'struct pair's in place. */ 39 /* Reverse a linked list of 'struct pair's in place. */
40 pair_p 40 pair_p
41@@ -5186,7 +5186,7 @@ main (int argc, char **argv) 41@@ -5187,7 +5187,7 @@ main (int argc, char **argv)
42 /* These types are set up with #define or else outside of where 42 /* These types are set up with #define or else outside of where
43 we can see them. We should initialize them before calling 43 we can see them. We should initialize them before calling
44 read_input_list. */ 44 read_input_list. */
@@ -48,10 +48,10 @@ index 53317337cf8..bbb26151671 100644
48 POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos)); 48 POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos));
49 POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos)); 49 POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos));
50diff --git a/gcc/genmodes.c b/gcc/genmodes.c 50diff --git a/gcc/genmodes.c b/gcc/genmodes.c
51index f33eefa2494..07bef9eebe2 100644 51index bd78310ea24..dbd02c51a4c 100644
52--- a/gcc/genmodes.c 52--- a/gcc/genmodes.c
53+++ b/gcc/genmodes.c 53+++ b/gcc/genmodes.c
54@@ -429,7 +429,7 @@ complete_all_modes (void) 54@@ -430,7 +430,7 @@ complete_all_modes (void)
55 } 55 }
56 56
57 /* For each mode in class CLASS, construct a corresponding complex mode. */ 57 /* For each mode in class CLASS, construct a corresponding complex mode. */
@@ -60,16 +60,16 @@ index f33eefa2494..07bef9eebe2 100644
60 static void 60 static void
61 make_complex_modes (enum mode_class cl, 61 make_complex_modes (enum mode_class cl,
62 const char *file, unsigned int line) 62 const char *file, unsigned int line)
63@@ -487,7 +487,7 @@ make_complex_modes (enum mode_class cl, 63@@ -489,7 +489,7 @@ make_complex_modes (enum mode_class cl,
64 /* For all modes in class CL, construct vector modes of width 64 having as many components as necessary. ORDER is the sorting order
65 WIDTH, having as many components as necessary. */ 65 of the mode, with smaller numbers indicating a higher priority. */
66 #define VECTOR_MODES_WITH_PREFIX(PREFIX, C, W) \ 66 #define VECTOR_MODES_WITH_PREFIX(PREFIX, C, W, ORDER) \
67- make_vector_modes (MODE_##C, #PREFIX, W, __FILE__, __LINE__) 67- make_vector_modes (MODE_##C, #PREFIX, W, ORDER, __FILE__, __LINE__)
68+ make_vector_modes (MODE_##C, #PREFIX, W, __FILE__, 0) 68+ make_vector_modes (MODE_##C, #PREFIX, W, ORDER, __FILE__, 0)
69 #define VECTOR_MODES(C, W) VECTOR_MODES_WITH_PREFIX (V, C, W) 69 #define VECTOR_MODES(C, W) VECTOR_MODES_WITH_PREFIX (V, C, W, 0)
70 static void ATTRIBUTE_UNUSED 70 static void ATTRIBUTE_UNUSED
71 make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, 71 make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width,
72@@ -538,7 +538,7 @@ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, 72@@ -541,7 +541,7 @@ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width,
73 /* Create a vector of booleans called NAME with COUNT elements and 73 /* Create a vector of booleans called NAME with COUNT elements and
74 BYTESIZE bytes in total. */ 74 BYTESIZE bytes in total. */
75 #define VECTOR_BOOL_MODE(NAME, COUNT, BYTESIZE) \ 75 #define VECTOR_BOOL_MODE(NAME, COUNT, BYTESIZE) \
@@ -78,7 +78,7 @@ index f33eefa2494..07bef9eebe2 100644
78 static void ATTRIBUTE_UNUSED 78 static void ATTRIBUTE_UNUSED
79 make_vector_bool_mode (const char *name, unsigned int count, 79 make_vector_bool_mode (const char *name, unsigned int count,
80 unsigned int bytesize, const char *file, 80 unsigned int bytesize, const char *file,
81@@ -560,7 +560,7 @@ make_vector_bool_mode (const char *name, unsigned int count, 81@@ -563,7 +563,7 @@ make_vector_bool_mode (const char *name, unsigned int count,
82 /* Input. */ 82 /* Input. */
83 83
84 #define _SPECIAL_MODE(C, N) \ 84 #define _SPECIAL_MODE(C, N) \
@@ -87,7 +87,7 @@ index f33eefa2494..07bef9eebe2 100644
87 #define RANDOM_MODE(N) _SPECIAL_MODE (RANDOM, N) 87 #define RANDOM_MODE(N) _SPECIAL_MODE (RANDOM, N)
88 #define CC_MODE(N) _SPECIAL_MODE (CC, N) 88 #define CC_MODE(N) _SPECIAL_MODE (CC, N)
89 89
90@@ -573,7 +573,7 @@ make_special_mode (enum mode_class cl, const char *name, 90@@ -576,7 +576,7 @@ make_special_mode (enum mode_class cl, const char *name,
91 91
92 #define INT_MODE(N, Y) FRACTIONAL_INT_MODE (N, -1U, Y) 92 #define INT_MODE(N, Y) FRACTIONAL_INT_MODE (N, -1U, Y)
93 #define FRACTIONAL_INT_MODE(N, B, Y) \ 93 #define FRACTIONAL_INT_MODE(N, B, Y) \
@@ -96,7 +96,7 @@ index f33eefa2494..07bef9eebe2 100644
96 96
97 static void 97 static void
98 make_int_mode (const char *name, 98 make_int_mode (const char *name,
99@@ -586,16 +586,16 @@ make_int_mode (const char *name, 99@@ -589,16 +589,16 @@ make_int_mode (const char *name,
100 } 100 }
101 101
102 #define FRACT_MODE(N, Y, F) \ 102 #define FRACT_MODE(N, Y, F) \
@@ -117,7 +117,7 @@ index f33eefa2494..07bef9eebe2 100644
117 117
118 /* Create a fixed-point mode by setting CL, NAME, BYTESIZE, IBIT, FBIT, 118 /* Create a fixed-point mode by setting CL, NAME, BYTESIZE, IBIT, FBIT,
119 FILE, and LINE. */ 119 FILE, and LINE. */
120@@ -616,7 +616,7 @@ make_fixed_point_mode (enum mode_class cl, 120@@ -619,7 +619,7 @@ make_fixed_point_mode (enum mode_class cl,
121 121
122 #define FLOAT_MODE(N, Y, F) FRACTIONAL_FLOAT_MODE (N, -1U, Y, F) 122 #define FLOAT_MODE(N, Y, F) FRACTIONAL_FLOAT_MODE (N, -1U, Y, F)
123 #define FRACTIONAL_FLOAT_MODE(N, B, Y, F) \ 123 #define FRACTIONAL_FLOAT_MODE(N, B, Y, F) \
@@ -126,7 +126,7 @@ index f33eefa2494..07bef9eebe2 100644
126 126
127 static void 127 static void
128 make_float_mode (const char *name, 128 make_float_mode (const char *name,
129@@ -633,7 +633,7 @@ make_float_mode (const char *name, 129@@ -636,7 +636,7 @@ make_float_mode (const char *name,
130 #define DECIMAL_FLOAT_MODE(N, Y, F) \ 130 #define DECIMAL_FLOAT_MODE(N, Y, F) \
131 FRACTIONAL_DECIMAL_FLOAT_MODE (N, -1U, Y, F) 131 FRACTIONAL_DECIMAL_FLOAT_MODE (N, -1U, Y, F)
132 #define FRACTIONAL_DECIMAL_FLOAT_MODE(N, B, Y, F) \ 132 #define FRACTIONAL_DECIMAL_FLOAT_MODE(N, B, Y, F) \
@@ -135,7 +135,7 @@ index f33eefa2494..07bef9eebe2 100644
135 135
136 static void 136 static void
137 make_decimal_float_mode (const char *name, 137 make_decimal_float_mode (const char *name,
138@@ -648,7 +648,7 @@ make_decimal_float_mode (const char *name, 138@@ -651,7 +651,7 @@ make_decimal_float_mode (const char *name,
139 } 139 }
140 140
141 #define RESET_FLOAT_FORMAT(N, F) \ 141 #define RESET_FLOAT_FORMAT(N, F) \
@@ -144,7 +144,7 @@ index f33eefa2494..07bef9eebe2 100644
144 static void ATTRIBUTE_UNUSED 144 static void ATTRIBUTE_UNUSED
145 reset_float_format (const char *name, const char *format, 145 reset_float_format (const char *name, const char *format,
146 const char *file, unsigned int line) 146 const char *file, unsigned int line)
147@@ -669,7 +669,7 @@ reset_float_format (const char *name, const char *format, 147@@ -672,7 +672,7 @@ reset_float_format (const char *name, const char *format,
148 148
149 /* __intN support. */ 149 /* __intN support. */
150 #define INT_N(M,PREC) \ 150 #define INT_N(M,PREC) \
@@ -153,7 +153,7 @@ index f33eefa2494..07bef9eebe2 100644
153 static void ATTRIBUTE_UNUSED 153 static void ATTRIBUTE_UNUSED
154 make_int_n (const char *m, int bitsize, 154 make_int_n (const char *m, int bitsize,
155 const char *file, unsigned int line) 155 const char *file, unsigned int line)
156@@ -698,7 +698,7 @@ make_int_n (const char *m, int bitsize, 156@@ -701,7 +701,7 @@ make_int_n (const char *m, int bitsize,
157 /* Partial integer modes are specified by relation to a full integer 157 /* Partial integer modes are specified by relation to a full integer
158 mode. */ 158 mode. */
159 #define PARTIAL_INT_MODE(M,PREC,NAME) \ 159 #define PARTIAL_INT_MODE(M,PREC,NAME) \
@@ -162,7 +162,7 @@ index f33eefa2494..07bef9eebe2 100644
162 static void ATTRIBUTE_UNUSED 162 static void ATTRIBUTE_UNUSED
163 make_partial_integer_mode (const char *base, const char *name, 163 make_partial_integer_mode (const char *base, const char *name,
164 unsigned int precision, 164 unsigned int precision,
165@@ -725,7 +725,7 @@ make_partial_integer_mode (const char *base, const char *name, 165@@ -728,7 +728,7 @@ make_partial_integer_mode (const char *base, const char *name,
166 /* A single vector mode can be specified by naming its component 166 /* A single vector mode can be specified by naming its component
167 mode and the number of components. */ 167 mode and the number of components. */
168 #define VECTOR_MODE(C, M, N) \ 168 #define VECTOR_MODE(C, M, N) \
@@ -171,7 +171,7 @@ index f33eefa2494..07bef9eebe2 100644
171 static void ATTRIBUTE_UNUSED 171 static void ATTRIBUTE_UNUSED
172 make_vector_mode (enum mode_class bclass, 172 make_vector_mode (enum mode_class bclass,
173 const char *base, 173 const char *base,
174@@ -768,7 +768,7 @@ make_vector_mode (enum mode_class bclass, 174@@ -771,7 +771,7 @@ make_vector_mode (enum mode_class bclass,
175 175
176 /* Adjustability. */ 176 /* Adjustability. */
177 #define _ADD_ADJUST(A, M, X, C1, C2) \ 177 #define _ADD_ADJUST(A, M, X, C1, C2) \
@@ -180,6 +180,3 @@ index f33eefa2494..07bef9eebe2 100644
180 180
181 #define ADJUST_NUNITS(M, X) _ADD_ADJUST (nunits, M, X, RANDOM, RANDOM) 181 #define ADJUST_NUNITS(M, X) _ADD_ADJUST (nunits, M, X, RANDOM, RANDOM)
182 #define ADJUST_BYTESIZE(M, X) _ADD_ADJUST (bytesize, M, X, RANDOM, RANDOM) 182 #define ADJUST_BYTESIZE(M, X) _ADD_ADJUST (bytesize, M, X, RANDOM, RANDOM)
183--
1842.25.1
185
diff --git a/meta/recipes-devtools/gcc/gcc-10.1/0036-Enable-CET-in-cross-compiler-if-possible.patch b/meta/recipes-devtools/gcc/gcc-10.1/0036-Enable-CET-in-cross-compiler-if-possible.patch
new file mode 100644
index 0000000000..af80642829
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0036-Enable-CET-in-cross-compiler-if-possible.patch
@@ -0,0 +1,150 @@
1From 87a5ace658f2294b025e0420ef03ade1f45d926c Mon Sep 17 00:00:00 2001
2From: "H.J. Lu" <hjl.tools@gmail.com>
3Date: Fri, 8 May 2020 06:11:05 -0700
4Subject: [PATCH] Enable CET in cross compiler if possible
5
6Don't perform CET run-time check for host when cross compiling. Instead,
7enable CET in cross compiler if possible so that it will run on both CET
8and non-CET hosts.
9
10config/
11
12 PR bootstrap/94998
13 * cet.m4 (GCC_CET_HOST_FLAGS): Enable CET in cross compiler if
14 possible.
15
16libiberty/
17
18 PR bootstrap/94998
19 * configure: Regenerated.
20
21lto-plugin/
22
23 PR bootstrap/94998
24 * configure: Regenerated.
25
26Upstream-Status: Submitted [https://patchwork.ozlabs.org/project/gcc/patch/20200508131105.170077-1-hjl.tools@gmail.com/]
27Signed-off-by: Khem Raj <raj.khem@gmail.com>
28---
29 config/cet.m4 | 18 ++++++++++++------
30 libiberty/configure | 12 +++++++++---
31 lto-plugin/configure | 16 +++++++++++-----
32 3 files changed, 32 insertions(+), 14 deletions(-)
33
34diff --git a/config/cet.m4 b/config/cet.m4
35index ea616b728a9..d9608699cd5 100644
36--- a/config/cet.m4
37+++ b/config/cet.m4
38@@ -111,7 +111,8 @@ if test x$may_have_cet = xyes; then
39 fi
40
41 if test x$may_have_cet = xyes; then
42- AC_TRY_RUN([
43+ if test x$cross_compiling = xno; then
44+ AC_TRY_RUN([
45 static void
46 foo (void)
47 {
48@@ -137,12 +138,17 @@ main ()
49 bar ();
50 return 0;
51 }
52- ],
53- [have_cet=no],
54- [have_cet=yes])
55- if test x$enable_cet = xno -a x$have_cet = xyes; then
56- AC_MSG_ERROR([Intel CET must be enabled on Intel CET enabled host])
57+ ],
58+ [have_cet=no],
59+ [have_cet=yes])
60+ if test x$enable_cet = xno -a x$have_cet = xyes; then
61+ AC_MSG_ERROR([Intel CET must be enabled on Intel CET enabled host])
62+ fi
63 fi
64+else
65+ # Enable CET in cross compiler if possible so that it will run on both
66+ # CET and non-CET hosts.
67+ have_cet=yes
68 fi
69 if test x$enable_cet = xyes; then
70 $1="-fcf-protection"
71diff --git a/libiberty/configure b/libiberty/configure
72index bb76cf1b823..3f82c5bb865 100755
73--- a/libiberty/configure
74+++ b/libiberty/configure
75@@ -5375,7 +5375,8 @@ rm -f core conftest.err conftest.$ac_objext \
76 fi
77
78 if test x$may_have_cet = xyes; then
79- if test "$cross_compiling" = yes; then :
80+ if test x$cross_compiling = xno; then
81+ if test "$cross_compiling" = yes; then :
82 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
83 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
84 as_fn_error $? "cannot run test program while cross compiling
85@@ -5420,9 +5421,14 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
86 conftest.$ac_objext conftest.beam conftest.$ac_ext
87 fi
88
89- if test x$enable_cet = xno -a x$have_cet = xyes; then
90- as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
91+ if test x$enable_cet = xno -a x$have_cet = xyes; then
92+ as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
93+ fi
94 fi
95+else
96+ # Enable CET in cross compiler if possible so that it will run on both
97+ # CET and non-CET hosts.
98+ have_cet=yes
99 fi
100 if test x$enable_cet = xyes; then
101 CET_HOST_FLAGS="-fcf-protection"
102diff --git a/lto-plugin/configure b/lto-plugin/configure
103index 1baf6cc70b8..36c6ecc5875 100755
104--- a/lto-plugin/configure
105+++ b/lto-plugin/configure
106@@ -5768,7 +5768,8 @@ rm -f core conftest.err conftest.$ac_objext \
107 fi
108
109 if test x$may_have_cet = xyes; then
110- if test "$cross_compiling" = yes; then :
111+ if test x$cross_compiling = xno; then
112+ if test "$cross_compiling" = yes; then :
113 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
114 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
115 as_fn_error $? "cannot run test program while cross compiling
116@@ -5813,9 +5814,14 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
117 conftest.$ac_objext conftest.beam conftest.$ac_ext
118 fi
119
120- if test x$enable_cet = xno -a x$have_cet = xyes; then
121- as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
122+ if test x$enable_cet = xno -a x$have_cet = xyes; then
123+ as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
124+ fi
125 fi
126+else
127+ # Enable CET in cross compiler if possible so that it will run on both
128+ # CET and non-CET hosts.
129+ have_cet=yes
130 fi
131 if test x$enable_cet = xyes; then
132 CET_HOST_FLAGS="-fcf-protection"
133@@ -11941,7 +11947,7 @@ else
134 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
135 lt_status=$lt_dlunknown
136 cat > conftest.$ac_ext <<_LT_EOF
137-#line 11944 "configure"
138+#line 11950 "configure"
139 #include "confdefs.h"
140
141 #if HAVE_DLFCN_H
142@@ -12047,7 +12053,7 @@ else
143 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
144 lt_status=$lt_dlunknown
145 cat > conftest.$ac_ext <<_LT_EOF
146-#line 12050 "configure"
147+#line 12056 "configure"
148 #include "confdefs.h"
149
150 #if HAVE_DLFCN_H
diff --git a/meta/recipes-devtools/gcc/gcc-10.1/0037-mingw32-Enable-operation_not_supported.patch b/meta/recipes-devtools/gcc/gcc-10.1/0037-mingw32-Enable-operation_not_supported.patch
new file mode 100644
index 0000000000..de82a3a539
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-10.1/0037-mingw32-Enable-operation_not_supported.patch
@@ -0,0 +1,26 @@
1From 6f87a095f0e696bec07a50df789c9db8bdbca43d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 12 May 2020 10:39:09 -0700
4Subject: [PATCH] mingw32: Enable operation_not_supported
5
6Fixes nativesdk build errors on mingw32 gcc-runtime
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 libstdc++-v3/config/os/mingw32/error_constants.h | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/libstdc++-v3/config/os/mingw32/error_constants.h b/libstdc++-v3/config/os/mingw32/error_constants.h
15index 68ac72a78fb..71cd5815b81 100644
16--- a/libstdc++-v3/config/os/mingw32/error_constants.h
17+++ b/libstdc++-v3/config/os/mingw32/error_constants.h
18@@ -107,7 +107,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
19 #ifdef _GLIBCXX_HAVE_EPERM
20 operation_not_permitted = EPERM,
21 #endif
22-// operation_not_supported = EOPNOTSUPP,
23+ operation_not_supported = EOPNOTSUPP,
24 #ifdef _GLIBCXX_HAVE_EWOULDBLOCK
25 operation_would_block = EWOULDBLOCK,
26 #endif
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch b/meta/recipes-devtools/gcc/gcc-9.3/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
deleted file mode 100644
index 1d2182140f..0000000000
--- a/meta/recipes-devtools/gcc/gcc-9.3/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From a4740f1290e6a602fbbfa27b863be2e3b2675685 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 11:17:19 +0000
4Subject: [PATCH 20/39] gcc 4.8+ won't build with --disable-dependency-tracking
5
6since the *.Ppo files don't get created unless --enable-dependency-tracking is true.
7
8This patch ensures we only use those compiler options when its enabled.
9
10Upstream-Status: Submitted
11
12(Problem was already reported upstream, attached this patch there
13http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55930)
14
15RP
162012/09/22
17
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19---
20 libatomic/Makefile.am | 3 ++-
21 libatomic/Makefile.in | 3 ++-
22 2 files changed, 4 insertions(+), 2 deletions(-)
23
24diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am
25index c1b7c73934a..ef43d62c07a 100644
26--- a/libatomic/Makefile.am
27+++ b/libatomic/Makefile.am
28@@ -101,7 +101,8 @@ PAT_S = $(word 3,$(PAT_SPLIT))
29 IFUNC_DEF = -DIFUNC_ALT=$(PAT_S)
30 IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS))
31
32-M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
33+@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
34+@AMDEP_FALSE@M_DEPS =
35 M_SIZE = -DN=$(PAT_N)
36 M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
37 M_FILE = $(PAT_BASE)_n.c
38diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in
39index 29324e3e0ac..d5cdb4259ef 100644
40--- a/libatomic/Makefile.in
41+++ b/libatomic/Makefile.in
42@@ -414,7 +414,8 @@ PAT_N = $(word 2,$(PAT_SPLIT))
43 PAT_S = $(word 3,$(PAT_SPLIT))
44 IFUNC_DEF = -DIFUNC_ALT=$(PAT_S)
45 IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS))
46-M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
47+@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
48+@AMDEP_FALSE@M_DEPS =
49 M_SIZE = -DN=$(PAT_N)
50 M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
51 M_FILE = $(PAT_BASE)_n.c
52--
532.25.1
54
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0030-ldbl128-config.patch b/meta/recipes-devtools/gcc/gcc-9.3/0030-ldbl128-config.patch
deleted file mode 100644
index f8e8c07f62..0000000000
--- a/meta/recipes-devtools/gcc/gcc-9.3/0030-ldbl128-config.patch
+++ /dev/null
@@ -1,79 +0,0 @@
1From 1bfae624b27ea4a1f5c5a92050d741b511e7b3d5 Mon Sep 17 00:00:00 2001
2From: Szabolcs Nagy <nsz@port70.net>
3Date: Wed, 28 Feb 2018 00:54:05 +0000
4Subject: [PATCH 30/39] ldbl128 config
5
6Upstream-Status: Pending
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 gcc/configure | 13 +++++++++++++
11 gcc/configure.ac | 16 ++++++++++++++--
12 2 files changed, 27 insertions(+), 2 deletions(-)
13
14diff --git a/gcc/configure b/gcc/configure
15index 0788b7bf0b5..eb1a45bb263 100755
16--- a/gcc/configure
17+++ b/gcc/configure
18@@ -29370,6 +29370,15 @@ if test "${with_long_double_128+set}" = set; then :
19 withval=$with_long_double_128; gcc_cv_target_ldbl128="$with_long_double_128"
20 else
21
22+ case "$target" in
23+ s390*-*-linux-musl*)
24+ gcc_cv_target_ldbl128=yes
25+ ;;
26+ powerpc*-*-linux-musl*)
27+ gcc_cv_target_ldbl128=no
28+ ;;
29+ *)
30+
31 if test $glibc_version_major -gt 2 \
32 || ( test $glibc_version_major -eq 2 && test $glibc_version_minor -ge 4 ); then :
33 gcc_cv_target_ldbl128=yes
34@@ -29381,6 +29390,10 @@ else
35 && gcc_cv_target_ldbl128=yes
36
37 fi
38+
39+ ;;
40+ esac
41+
42 fi
43
44 ;;
45diff --git a/gcc/configure.ac b/gcc/configure.ac
46index 5ab50fae0f3..7ffe35ee1c3 100644
47--- a/gcc/configure.ac
48+++ b/gcc/configure.ac
49@@ -6030,13 +6030,25 @@ case "$target" in
50 AC_ARG_WITH(long-double-128,
51 [AS_HELP_STRING([--with-long-double-128],
52 [use 128-bit long double by default])],
53- gcc_cv_target_ldbl128="$with_long_double_128",
54+ gcc_cv_target_ldbl128="$with_long_double_128", [
55+ case "$target" in
56+ s390*-*-linux-musl*)
57+ gcc_cv_target_ldbl128=yes
58+ ;;
59+ powerpc*-*-linux-musl*)
60+ gcc_cv_target_ldbl128=no
61+ ;;
62+ *)]
63 [GCC_GLIBC_VERSION_GTE_IFELSE([2], [4], [gcc_cv_target_ldbl128=yes], [
64 [gcc_cv_target_ldbl128=no
65 grep '^[ ]*#[ ]*define[ ][ ]*__LONG_DOUBLE_MATH_OPTIONAL' \
66 $target_header_dir/bits/wordsize.h > /dev/null 2>&1 \
67 && gcc_cv_target_ldbl128=yes
68- ]])])
69+ ]])]
70+ [
71+ ;;
72+ esac
73+ ])
74 ;;
75 esac
76 if test x$gcc_cv_target_ldbl128 = xyes; then
77--
782.25.1
79
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch b/meta/recipes-devtools/gcc/gcc-9.3/0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch
deleted file mode 100644
index f268a4eb58..0000000000
--- a/meta/recipes-devtools/gcc/gcc-9.3/0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From ac4af583bd59f6631671ad4abf985799ce4a53d9 Mon Sep 17 00:00:00 2001
2From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>
3Date: Thu, 25 Jul 2019 10:46:54 +0000
4Subject: [PATCH 37/39] CVE-2019-14250: Check zero value in
5 simple_object_elf_match
6
72019-07-25 Richard Biener <rguenther@suse.de>
8
9 PR lto/90924
10 Backport from mainline
11 2019-07-12 Ren Kimura <rkx1209dev@gmail.com>
12
13 * simple-object-elf.c (simple_object_elf_match): Check zero value
14 shstrndx.
15
16git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@273793 138bc75d-0d04-0410-961f-82ee72b054a4
17
18Upstream-Status: Backport
19Affectes: < 9.2
20CVE: CVE-2019-14250
21Dropped changelog
22Signed-off-by: Armin Kuster <Akustre@mvista.com>
23---
24 libiberty/simple-object-elf.c | 8 ++++++++
25 1 file changed, 8 insertions(+)
26
27diff --git a/libiberty/simple-object-elf.c b/libiberty/simple-object-elf.c
28index 3d49f339631..c00cebdb6c7 100644
29--- a/libiberty/simple-object-elf.c
30+++ b/libiberty/simple-object-elf.c
31@@ -557,6 +557,14 @@ simple_object_elf_match (unsigned char header[SIMPLE_OBJECT_MATCH_HEADER_LEN],
32 return NULL;
33 }
34
35+ if (eor->shstrndx == 0)
36+ {
37+ *errmsg = "invalid ELF shstrndx == 0";
38+ *err = 0;
39+ XDELETE (eor);
40+ return NULL;
41+ }
42+
43 return (void *) eor;
44 }
45
46--
472.25.1
48
diff --git a/meta/recipes-devtools/gcc/gcc-9.3/0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch b/meta/recipes-devtools/gcc/gcc-9.3/0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch
deleted file mode 100644
index b69114d1e5..0000000000
--- a/meta/recipes-devtools/gcc/gcc-9.3/0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch
+++ /dev/null
@@ -1,100 +0,0 @@
1From e75bcc2ec4f1e7e081ce18713f0a25913ba15340 Mon Sep 17 00:00:00 2001
2From: Vladimir Makarov <vmakarov@redhat.com>
3Date: Wed, 10 Jul 2019 16:07:10 +0000
4Subject: [PATCH 39/39] process_alt_operands: Don't match user defined regs
5 only if they are early clobbers
6
7PR target/91102 (aarch64 ICE on Linux kernel with -Os starting with r270266)
8
92019-07-10 Vladimir Makarov <vmakarov@redhat.com>
10
11 PR target/91102
12 * lra-constraints.c (process_alt_operands): Don't match user
13 defined regs only if they are early clobbers.
14
152019-07-10 Vladimir Makarov <vmakarov@redhat.com>
16
17 PR target/91102
18 * gcc.target/aarch64/pr91102.c: New test.
19
20From-SVN: r273357
21Upstream-Status: Backport [https://github.com/gcc-mirror/gcc/commit/613caed2feb9cfc8158308670b59df3d031ec629]
22[takondra: dropped conflicting ChangeLog changes]
23Signed-off-by: Taras Kondratiuk <takondra@cisco.com>
24---
25 gcc/lra-constraints.c | 17 ++++++++++----
26 gcc/testsuite/gcc.target/aarch64/pr91102.c | 26 ++++++++++++++++++++++
27 2 files changed, 39 insertions(+), 4 deletions(-)
28 create mode 100644 gcc/testsuite/gcc.target/aarch64/pr91102.c
29
30diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
31index cf33da8013e..6382dbf852b 100644
32--- a/gcc/lra-constraints.c
33+++ b/gcc/lra-constraints.c
34@@ -2172,8 +2172,9 @@ process_alt_operands (int only_alternative)
35 else
36 {
37 /* Operands don't match. If the operands are
38- different user defined explicit hard registers,
39- then we cannot make them match. */
40+ different user defined explicit hard
41+ registers, then we cannot make them match
42+ when one is early clobber operand. */
43 if ((REG_P (*curr_id->operand_loc[nop])
44 || SUBREG_P (*curr_id->operand_loc[nop]))
45 && (REG_P (*curr_id->operand_loc[m])
46@@ -2192,9 +2193,17 @@ process_alt_operands (int only_alternative)
47 && REG_P (m_reg)
48 && HARD_REGISTER_P (m_reg)
49 && REG_USERVAR_P (m_reg))
50- break;
51+ {
52+ int i;
53+
54+ for (i = 0; i < early_clobbered_regs_num; i++)
55+ if (m == early_clobbered_nops[i])
56+ break;
57+ if (i < early_clobbered_regs_num
58+ || early_clobber_p)
59+ break;
60+ }
61 }
62-
63 /* Both operands must allow a reload register,
64 otherwise we cannot make them match. */
65 if (curr_alt[m] == NO_REGS)
66diff --git a/gcc/testsuite/gcc.target/aarch64/pr91102.c b/gcc/testsuite/gcc.target/aarch64/pr91102.c
67new file mode 100644
68index 00000000000..70b99045a48
69--- /dev/null
70+++ b/gcc/testsuite/gcc.target/aarch64/pr91102.c
71@@ -0,0 +1,26 @@
72+/* PR target/91102 */
73+/* { dg-do compile } */
74+/* { dg-options "-O2" } */
75+
76+int
77+foo (long d, long l)
78+{
79+ register long e asm ("x1") = d;
80+ register long f asm("x2") = l;
81+ asm ("" : : "r" (e), "r" (f));
82+ return 3;
83+}
84+
85+struct T { int i; int j; };
86+union S { long h; struct T t; };
87+
88+void
89+bar (union S b)
90+{
91+ while (1)
92+ {
93+ union S c = b;
94+ c.t.j++;
95+ b.h = foo (b.h, c.h);
96+ }
97+}
98--
992.25.1
100
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_9.3.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_10.1.bb
index bf53c5cd78..bf53c5cd78 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_9.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_10.1.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross_9.3.bb b/meta/recipes-devtools/gcc/gcc-cross_10.1.bb
index b43cca0c52..b43cca0c52 100644
--- a/meta/recipes-devtools/gcc/gcc-cross_9.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross_10.1.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_9.3.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_10.1.bb
index 40a6c4feff..40a6c4feff 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk_9.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk_10.1.bb
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index d9a4e483cc..38c1672876 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -263,6 +263,7 @@ FILES_libgomp-dev = "\
263 ${libdir}/libgomp*${SOLIBSDEV} \ 263 ${libdir}/libgomp*${SOLIBSDEV} \
264 ${libdir}/libgomp*.la \ 264 ${libdir}/libgomp*.la \
265 ${libdir}/libgomp.spec \ 265 ${libdir}/libgomp.spec \
266 ${libdir}/${TARGET_SYS}/${BINV}/include/acc_prof.h \
266 ${libdir}/${TARGET_SYS}/${BINV}/include/omp.h \ 267 ${libdir}/${TARGET_SYS}/${BINV}/include/omp.h \
267 ${libdir}/${TARGET_SYS}/${BINV}/include/openacc.h \ 268 ${libdir}/${TARGET_SYS}/${BINV}/include/openacc.h \
268" 269"
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_9.3.bb b/meta/recipes-devtools/gcc/gcc-runtime_10.1.bb
index dd430b57eb..dd430b57eb 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime_9.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-runtime_10.1.bb
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_9.3.bb b/meta/recipes-devtools/gcc/gcc-sanitizers_10.1.bb
index f3c7058114..f3c7058114 100644
--- a/meta/recipes-devtools/gcc/gcc-sanitizers_9.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-sanitizers_10.1.bb
diff --git a/meta/recipes-devtools/gcc/gcc-source_9.3.bb b/meta/recipes-devtools/gcc/gcc-source_10.1.bb
index b890fa33ea..b890fa33ea 100644
--- a/meta/recipes-devtools/gcc/gcc-source_9.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-source_10.1.bb
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc
index 6263e81497..1e25dad86b 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -42,6 +42,7 @@ PACKAGES = "\
42 42
43FILES_${PN} = "\ 43FILES_${PN} = "\
44 ${bindir}/${TARGET_PREFIX}gcc* \ 44 ${bindir}/${TARGET_PREFIX}gcc* \
45 ${bindir}/${TARGET_PREFIX}lto* \
45 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2* \ 46 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2* \
46 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \ 47 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
47 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \ 48 ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \
diff --git a/meta/recipes-devtools/gcc/gcc_9.3.bb b/meta/recipes-devtools/gcc/gcc_10.1.bb
index 7d93590588..7d93590588 100644
--- a/meta/recipes-devtools/gcc/gcc_9.3.bb
+++ b/meta/recipes-devtools/gcc/gcc_10.1.bb
diff --git a/meta/recipes-devtools/gcc/libgcc-initial_9.3.bb b/meta/recipes-devtools/gcc/libgcc-initial_10.1.bb
index 0c698c26ec..0c698c26ec 100644
--- a/meta/recipes-devtools/gcc/libgcc-initial_9.3.bb
+++ b/meta/recipes-devtools/gcc/libgcc-initial_10.1.bb
diff --git a/meta/recipes-devtools/gcc/libgcc_9.3.bb b/meta/recipes-devtools/gcc/libgcc_10.1.bb
index ea210a1130..ea210a1130 100644
--- a/meta/recipes-devtools/gcc/libgcc_9.3.bb
+++ b/meta/recipes-devtools/gcc/libgcc_10.1.bb
diff --git a/meta/recipes-devtools/gcc/libgfortran_9.3.bb b/meta/recipes-devtools/gcc/libgfortran_10.1.bb
index 71dd8b4bdc..71dd8b4bdc 100644
--- a/meta/recipes-devtools/gcc/libgfortran_9.3.bb
+++ b/meta/recipes-devtools/gcc/libgfortran_10.1.bb
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-13 11:35:14 +0000