summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-03-30 14:30:18 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-03 15:23:48 +0100
commitb621ead6d5b1caa2602a547ea8d9e0ffa1bb0cb4 (patch)
tree4adf4d6e075fc6a9145cd7d5bcf98cf08d7ab48c /meta/recipes-devtools/gcc
parent4a72c681fa784b926ca57e1e89f54d44aedf324a (diff)
downloadpoky-b621ead6d5b1caa2602a547ea8d9e0ffa1bb0cb4.tar.gz
gcc: Upgrade to GCC 11
Drop already upstream/backported patches (From OE-Core rev: e64bf999a92aed3c6be38eae9e75ec9277638b95) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-11.1.inc (renamed from meta/recipes-devtools/gcc/gcc-10.3.inc)12
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian_11.1.bb (renamed from meta/recipes-devtools/gcc/gcc-cross-canadian_10.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross_11.1.bb (renamed from meta/recipes-devtools/gcc/gcc-cross_10.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk_11.1.bb (renamed from meta/recipes-devtools/gcc/gcc-crosssdk_10.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime_11.1.bb (renamed from meta/recipes-devtools/gcc/gcc-runtime_10.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-sanitizers_11.1.bb (renamed from meta/recipes-devtools/gcc/gcc-sanitizers_10.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-source_11.1.bb (renamed from meta/recipes-devtools/gcc/gcc-source_10.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch10
-rw-r--r--meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch52
-rw-r--r--meta/recipes-devtools/gcc/gcc/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch6
-rw-r--r--meta/recipes-devtools/gcc/gcc/0004-64-bit-multilib-hack.patch10
-rw-r--r--meta/recipes-devtools/gcc/gcc/0005-optional-libstdc.patch26
-rw-r--r--meta/recipes-devtools/gcc/gcc/0006-COLLECT_GCC_OPTIONS.patch6
-rw-r--r--meta/recipes-devtools/gcc/gcc/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch16
-rw-r--r--meta/recipes-devtools/gcc/gcc/0008-fortran-cross-compile-hack.patch10
-rw-r--r--meta/recipes-devtools/gcc/gcc/0009-cpp-honor-sysroot.patch14
-rw-r--r--meta/recipes-devtools/gcc/gcc/0010-MIPS64-Default-to-N64-ABI.patch6
-rw-r--r--meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch28
-rw-r--r--meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch6
-rw-r--r--meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch16
-rw-r--r--meta/recipes-devtools/gcc/gcc/0014-libtool.patch2
-rw-r--r--meta/recipes-devtools/gcc/gcc/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch4
-rw-r--r--meta/recipes-devtools/gcc/gcc/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch14
-rw-r--r--meta/recipes-devtools/gcc/gcc/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch2
-rw-r--r--meta/recipes-devtools/gcc/gcc/0018-export-CPP.patch4
-rw-r--r--meta/recipes-devtools/gcc/gcc/0019-Ensure-target-gcc-headers-can-be-included.patch12
-rw-r--r--meta/recipes-devtools/gcc/gcc/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch2
-rw-r--r--meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch4
-rw-r--r--meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch4
-rw-r--r--meta/recipes-devtools/gcc/gcc/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch8
-rw-r--r--meta/recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch41
-rw-r--r--meta/recipes-devtools/gcc/gcc/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch8
-rw-r--r--meta/recipes-devtools/gcc/gcc/0026-Fix-various-_FOR_BUILD-and-related-variables.patch18
-rw-r--r--meta/recipes-devtools/gcc/gcc/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch4
-rw-r--r--meta/recipes-devtools/gcc/gcc/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch10
-rw-r--r--meta/recipes-devtools/gcc/gcc/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch4
-rw-r--r--meta/recipes-devtools/gcc/gcc/0030-sync-gcc-stddef.h-with-musl.patch4
-rw-r--r--meta/recipes-devtools/gcc/gcc/0031-fix-segmentation-fault-in-precompiled-header-generat.patch6
-rw-r--r--meta/recipes-devtools/gcc/gcc/0032-Fix-for-testsuite-failure.patch2
-rw-r--r--meta/recipes-devtools/gcc/gcc/0033-Re-introduce-spe-commandline-options.patch11
-rw-r--r--meta/recipes-devtools/gcc/gcc/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch12
-rw-r--r--meta/recipes-devtools/gcc/gcc/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch34
-rw-r--r--meta/recipes-devtools/gcc/gcc/0036-mingw32-Enable-operation_not_supported.patch4
-rw-r--r--meta/recipes-devtools/gcc/gcc/0037-libatomic-Do-not-enforce-march-on-aarch64.patch8
-rw-r--r--meta/recipes-devtools/gcc/gcc/0038-libatomic-libgomp-libitc-Fix-bootstrap-PR70454.patch209
-rw-r--r--meta/recipes-devtools/gcc/gcc_11.1.bb (renamed from meta/recipes-devtools/gcc/gcc_10.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgcc-initial_11.1.bb (renamed from meta/recipes-devtools/gcc/libgcc-initial_10.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgcc_11.1.bb (renamed from meta/recipes-devtools/gcc/libgcc_10.3.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgfortran_11.1.bb (renamed from meta/recipes-devtools/gcc/libgfortran_10.3.bb)0
49 files changed, 222 insertions, 427 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-10.3.inc b/meta/recipes-devtools/gcc/gcc-11.1.inc
index 7fcb058fea..713002266a 100644
--- a/meta/recipes-devtools/gcc/gcc-10.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-11.1.inc
@@ -2,11 +2,11 @@ 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 = "10.3.0" 5PV = "11.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 = "10.3.0" 9BINV = "11.1.0"
10 10
11FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:" 11FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:"
12 12
@@ -23,9 +23,9 @@ LIC_FILES_CHKSUM = "\
23 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 \ 23 file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 \
24" 24"
25 25
26BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz" 26#RELEASE ?= "5b2ac9b40c325e9209c0bd55955db84aad4a0cc5"
27#RELEASE ?= "93a49d2d2292893b9b7f38132df949c70942838c"
28#BASEURI ?= "https://github.com/gcc-mirror/gcc/archive/${RELEASE}.zip;downloadfilename=gcc-${PV}-${RELEASE}.zip" 27#BASEURI ?= "https://github.com/gcc-mirror/gcc/archive/${RELEASE}.zip;downloadfilename=gcc-${PV}-${RELEASE}.zip"
28BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz"
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 \
@@ -65,11 +65,11 @@ SRC_URI = "\
65 file://0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \ 65 file://0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \
66 file://0036-mingw32-Enable-operation_not_supported.patch \ 66 file://0036-mingw32-Enable-operation_not_supported.patch \
67 file://0037-libatomic-Do-not-enforce-march-on-aarch64.patch \ 67 file://0037-libatomic-Do-not-enforce-march-on-aarch64.patch \
68 file://0038-libatomic-libgomp-libitc-Fix-bootstrap-PR70454.patch \
69" 68"
70SRC_URI[sha256sum] = "64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344" 69SRC_URI[sha256sum] = "4c4a6fb8a8396059241c2e674b85b351c26a5d678274007f076957afa1cc9ddf"
71 70
72S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" 71S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
72
73# For dev release snapshotting 73# For dev release snapshotting
74#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${RELEASE}" 74#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${RELEASE}"
75#B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" 75#B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_10.3.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_11.1.bb
index bf53c5cd78..bf53c5cd78 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_10.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_11.1.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross_10.3.bb b/meta/recipes-devtools/gcc/gcc-cross_11.1.bb
index b43cca0c52..b43cca0c52 100644
--- a/meta/recipes-devtools/gcc/gcc-cross_10.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross_11.1.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_10.3.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_11.1.bb
index 40a6c4feff..40a6c4feff 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk_10.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk_11.1.bb
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_10.3.bb b/meta/recipes-devtools/gcc/gcc-runtime_11.1.bb
index dd430b57eb..dd430b57eb 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime_10.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-runtime_11.1.bb
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_10.3.bb b/meta/recipes-devtools/gcc/gcc-sanitizers_11.1.bb
index f3c7058114..f3c7058114 100644
--- a/meta/recipes-devtools/gcc/gcc-sanitizers_10.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-sanitizers_11.1.bb
diff --git a/meta/recipes-devtools/gcc/gcc-source_10.3.bb b/meta/recipes-devtools/gcc/gcc-source_11.1.bb
index b890fa33ea..b890fa33ea 100644
--- a/meta/recipes-devtools/gcc/gcc-source_10.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-source_11.1.bb
diff --git a/meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
index 6beedacf66..0a108ee51b 100644
--- a/meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ b/meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
@@ -1,4 +1,4 @@
1From 2b4a66cbe0bd52e77b37dbaee46e2605d3854412 Mon Sep 17 00:00:00 2001 1From 368eaf1846733a9920c7cf5bc547a377e7167785 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] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET 4Subject: [PATCH] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET
@@ -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 f2ec106a86e..9350b0cf3ed 100755 15index 504f6410274..bcebad264ec 100755
16--- a/configure 16--- a/configure
17+++ b/configure 17+++ b/configure
18@@ -7723,7 +7723,7 @@ fi 18@@ -9728,7 +9728,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 f2ec106a86e..9350b0cf3ed 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 115db3f402a..5ef61255710 100644 28index 088e735c5db..1289fe08760 100644
29--- a/configure.ac 29--- a/configure.ac
30+++ b/configure.ac 30+++ b/configure.ac
31@@ -3228,7 +3228,7 @@ fi 31@@ -3240,7 +3240,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
diff --git a/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch
index c96f170196..18a9fb8701 100644
--- a/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch
+++ b/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch
@@ -1,6 +1,6 @@
1From a4fd05ff8e8ed7252d7b302891ac842cbb190c41 Mon Sep 17 00:00:00 2001 1From 118c6f054711d437167ff125a88c9236bfc8099c 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: Mon, 8 Mar 2021 16:04:20 -0800
4Subject: [PATCH] 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
@@ -11,11 +11,9 @@ aborted.
11Instead, we add the two missing items to the current scan. If the user 11Instead, we add the two missing items to the current scan. If the user
12wants this to be a failure, they can add "-Werror=poison-system-directories". 12wants this to be a failure, they can add "-Werror=poison-system-directories".
13 13
14Upstream-Status: Pending
14Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 15Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
15Signed-off-by: Khem Raj <raj.khem@gmail.com> 16Signed-off-by: Khem Raj <raj.khem@gmail.com>
16Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
17
18Upstream-Status: Pending
19--- 17---
20 gcc/common.opt | 4 ++++ 18 gcc/common.opt | 4 ++++
21 gcc/config.in | 10 ++++++++++ 19 gcc/config.in | 10 ++++++++++
@@ -27,10 +25,10 @@ Upstream-Status: Pending
27 7 files changed, 86 insertions(+), 2 deletions(-) 25 7 files changed, 86 insertions(+), 2 deletions(-)
28 26
29diff --git a/gcc/common.opt b/gcc/common.opt 27diff --git a/gcc/common.opt b/gcc/common.opt
30index ec5235c3a41..ca942863064 100644 28index c75dd36843e..49acbd6ed44 100644
31--- a/gcc/common.opt 29--- a/gcc/common.opt
32+++ b/gcc/common.opt 30+++ b/gcc/common.opt
33@@ -682,6 +682,10 @@ Wreturn-local-addr 31@@ -683,6 +683,10 @@ Wreturn-local-addr
34 Common Var(warn_return_local_addr) Init(1) Warning 32 Common Var(warn_return_local_addr) Init(1) Warning
35 Warn about returning a pointer/reference to a local or temporary variable. 33 Warn about returning a pointer/reference to a local or temporary variable.
36 34
@@ -42,10 +40,10 @@ index ec5235c3a41..ca942863064 100644
42 Common Var(warn_shadow) Warning 40 Common Var(warn_shadow) Warning
43 Warn when one variable shadows another. Same as -Wshadow=global. 41 Warn when one variable shadows another. Same as -Wshadow=global.
44diff --git a/gcc/config.in b/gcc/config.in 42diff --git a/gcc/config.in b/gcc/config.in
45index 364eba47737..7d2c3bbf1a3 100644 43index 10a13cde586..8848284da41 100644
46--- a/gcc/config.in 44--- a/gcc/config.in
47+++ b/gcc/config.in 45+++ b/gcc/config.in
48@@ -224,6 +224,16 @@ 46@@ -218,6 +218,16 @@
49 #endif 47 #endif
50 48
51 49
@@ -63,18 +61,18 @@ index 364eba47737..7d2c3bbf1a3 100644
63 optimizer and back end) to be checked for dynamic type safety at runtime. 61 optimizer and back end) to be checked for dynamic type safety at runtime.
64 This is quite expensive. */ 62 This is quite expensive. */
65diff --git a/gcc/configure b/gcc/configure 63diff --git a/gcc/configure b/gcc/configure
66index 8fe9c91fd7c..8976850dff6 100755 64index 9bb436ce7bd..3f0734bff11 100755
67--- a/gcc/configure 65--- a/gcc/configure
68+++ b/gcc/configure 66+++ b/gcc/configure
69@@ -1010,6 +1010,7 @@ with_system_zlib 67@@ -1020,6 +1020,7 @@ enable_maintainer_mode
70 enable_maintainer_mode
71 enable_link_mutex 68 enable_link_mutex
69 enable_link_serialization
72 enable_version_specific_runtime_libs 70 enable_version_specific_runtime_libs
73+enable_poison_system_directories 71+enable_poison_system_directories
74 enable_plugin 72 enable_plugin
75 enable_host_shared 73 enable_host_shared
76 enable_libquadmath_support 74 enable_libquadmath_support
77@@ -1766,6 +1767,8 @@ Optional Features: 75@@ -1782,6 +1783,8 @@ Optional Features:
78 --enable-version-specific-runtime-libs 76 --enable-version-specific-runtime-libs
79 specify that runtime libraries should be installed 77 specify that runtime libraries should be installed
80 in a compiler-specific directory 78 in a compiler-specific directory
@@ -83,7 +81,7 @@ index 8fe9c91fd7c..8976850dff6 100755
83 --enable-plugin enable plugin support 81 --enable-plugin enable plugin support
84 --enable-host-shared build host code as shared libraries 82 --enable-host-shared build host code as shared libraries
85 --disable-libquadmath-support 83 --disable-libquadmath-support
86@@ -30276,6 +30279,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : 84@@ -31325,6 +31328,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
87 fi 85 fi
88 86
89 87
@@ -107,16 +105,16 @@ index 8fe9c91fd7c..8976850dff6 100755
107 105
108 106
109diff --git a/gcc/configure.ac b/gcc/configure.ac 107diff --git a/gcc/configure.ac b/gcc/configure.ac
110index 84dceb8074a..13eace6cfc6 100644 108index caa611933df..54e21764b3e 100644
111--- a/gcc/configure.ac 109--- a/gcc/configure.ac
112+++ b/gcc/configure.ac 110+++ b/gcc/configure.ac
113@@ -6608,6 +6608,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs, 111@@ -7123,6 +7123,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
114 [specify that runtime libraries should be 112 [specify that runtime libraries should be
115 installed in a compiler-specific directory])]) 113 installed in a compiler-specific directory])])
116 114
117+AC_ARG_ENABLE([poison-system-directories], 115+AC_ARG_ENABLE([poison-system-directories],
118+ AS_HELP_STRING([--enable-poison-system-directories], 116+ AS_HELP_STRING([--enable-poison-system-directories],
119+ [warn for use of native system header directories (no/yes/error)]),, 117+ [warn for use of native system header directories (no/yes/error)]),,
120+ [enable_poison_system_directories=no]) 118+ [enable_poison_system_directories=no])
121+AC_MSG_NOTICE([poisoned directories $enable_poison_system_directories]) 119+AC_MSG_NOTICE([poisoned directories $enable_poison_system_directories])
122+if test "x${enable_poison_system_directories}" != "xno"; then 120+if test "x${enable_poison_system_directories}" != "xno"; then
@@ -134,10 +132,10 @@ index 84dceb8074a..13eace6cfc6 100644
134 AC_SUBST(subdirs) 132 AC_SUBST(subdirs)
135 AC_SUBST(srcdir) 133 AC_SUBST(srcdir)
136diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi 134diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
137index eabeec944e7..cd31b522e42 100644 135index 7a368959e5e..6659a903bf0 100644
138--- a/gcc/doc/invoke.texi 136--- a/gcc/doc/invoke.texi
139+++ b/gcc/doc/invoke.texi 137+++ b/gcc/doc/invoke.texi
140@@ -348,6 +348,7 @@ Objective-C and Objective-C++ Dialects}. 138@@ -369,6 +369,7 @@ Objective-C and Objective-C++ Dialects}.
141 -Wpacked -Wno-packed-bitfield-compat -Wpacked-not-aligned -Wpadded @gol 139 -Wpacked -Wno-packed-bitfield-compat -Wpacked-not-aligned -Wpadded @gol
142 -Wparentheses -Wno-pedantic-ms-format @gol 140 -Wparentheses -Wno-pedantic-ms-format @gol
143 -Wpointer-arith -Wno-pointer-compare -Wno-pointer-to-int-cast @gol 141 -Wpointer-arith -Wno-pointer-compare -Wno-pointer-to-int-cast @gol
@@ -145,7 +143,7 @@ index eabeec944e7..cd31b522e42 100644
145 -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls @gol 143 -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls @gol
146 -Wrestrict -Wno-return-local-addr -Wreturn-type @gol 144 -Wrestrict -Wno-return-local-addr -Wreturn-type @gol
147 -Wno-scalar-storage-order -Wsequence-point @gol 145 -Wno-scalar-storage-order -Wsequence-point @gol
148@@ -6926,6 +6927,14 @@ made up of data only and thus requires no special treatment. But, for 146@@ -7735,6 +7736,14 @@ made up of data only and thus requires no special treatment. But, for
149 most targets, it is made up of code and thus requires the stack to be 147 most targets, it is made up of code and thus requires the stack to be
150 made executable in order for the program to work properly. 148 made executable in order for the program to work properly.
151 149
@@ -161,10 +159,10 @@ index eabeec944e7..cd31b522e42 100644
161 @opindex Wfloat-equal 159 @opindex Wfloat-equal
162 @opindex Wno-float-equal 160 @opindex Wno-float-equal
163diff --git a/gcc/gcc.c b/gcc/gcc.c 161diff --git a/gcc/gcc.c b/gcc/gcc.c
164index 9f790db0daf..f379f71da3d 100644 162index 7837553958b..19c75b6e20d 100644
165--- a/gcc/gcc.c 163--- a/gcc/gcc.c
166+++ b/gcc/gcc.c 164+++ b/gcc/gcc.c
167@@ -1041,6 +1041,8 @@ proper position among the other output files. */ 165@@ -1152,6 +1152,8 @@ proper position among the other output files. */
168 "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \ 166 "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
169 "%X %{o*} %{e*} %{N} %{n} %{r}\ 167 "%X %{o*} %{e*} %{N} %{n} %{r}\
170 %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \ 168 %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
@@ -173,7 +171,7 @@ index 9f790db0daf..f379f71da3d 100644
173 %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \ 171 %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
174 VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \ 172 VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
175 %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ 173 %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
176@@ -1134,8 +1136,11 @@ static const char *cpp_unique_options = 174@@ -1247,8 +1249,11 @@ static const char *cpp_unique_options =
177 static const char *cpp_options = 175 static const char *cpp_options =
178 "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\ 176 "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
179 %{f*} %{g*:%{%:debug-level-gt(0):%{g*}\ 177 %{f*} %{g*:%{%:debug-level-gt(0):%{g*}\
@@ -185,10 +183,10 @@ index 9f790db0daf..f379f71da3d 100644
185+#endif 183+#endif
186+ " %{undef} %{save-temps*:-fpch-preprocess}"; 184+ " %{undef} %{save-temps*:-fpch-preprocess}";
187 185
188 /* This contains cpp options which are not passed when the preprocessor 186 /* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al.
189 output will be used by another program. */ 187
190diff --git a/gcc/incpath.c b/gcc/incpath.c 188diff --git a/gcc/incpath.c b/gcc/incpath.c
191index 8a2bda00f80..9098ab044ab 100644 189index 446d280321d..fbfc0ce03b8 100644
192--- a/gcc/incpath.c 190--- a/gcc/incpath.c
193+++ b/gcc/incpath.c 191+++ b/gcc/incpath.c
194@@ -26,6 +26,7 @@ 192@@ -26,6 +26,7 @@
@@ -199,7 +197,7 @@ index 8a2bda00f80..9098ab044ab 100644
199 197
200 /* Microsoft Windows does not natively support inodes. 198 /* Microsoft Windows does not natively support inodes.
201 VMS has non-numeric inodes. */ 199 VMS has non-numeric inodes. */
202@@ -393,6 +394,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose) 200@@ -395,6 +396,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
203 } 201 }
204 fprintf (stderr, _("End of search list.\n")); 202 fprintf (stderr, _("End of search list.\n"));
205 } 203 }
diff --git a/meta/recipes-devtools/gcc/gcc/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
index 39b616e82e..7a67654555 100644
--- a/meta/recipes-devtools/gcc/gcc/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ b/meta/recipes-devtools/gcc/gcc/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
@@ -1,4 +1,4 @@
1From 860a8a2ec653e3c65bc5440f181b459dfe56c8a0 Mon Sep 17 00:00:00 2001 1From 274a27da6fe355c4c49953b3b69c8949d2412c62 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] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET 4Subject: [PATCH] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET
@@ -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 9350b0cf3ed..8ed565c51b3 100755 29index bcebad264ec..86e4ee7c383 100755
30--- a/configure 30--- a/configure
31+++ b/configure 31+++ b/configure
32@@ -6972,6 +6972,38 @@ fi 32@@ -8977,6 +8977,38 @@ fi
33 33
34 34
35 35
diff --git a/meta/recipes-devtools/gcc/gcc/0004-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc/0004-64-bit-multilib-hack.patch
index 04d8bdf331..789f57343b 100644
--- a/meta/recipes-devtools/gcc/gcc/0004-64-bit-multilib-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc/0004-64-bit-multilib-hack.patch
@@ -1,4 +1,4 @@
1From d166c36206b276f769e175f39cf44b33c98bd153 Mon Sep 17 00:00:00 2001 1From 28e7c312b1292ca216d4b54ec9f6b7ac055907a8 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] 64-bit multilib hack. 4Subject: [PATCH] 64-bit multilib hack.
@@ -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 83e59e33b85..b1356be1fb4 100644 40index 241b0ef20b6..a7dadb2d64f 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 83e59e33b85..b1356be1fb4 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 1171e218578..5e057b7e5db 100644 57index d288b093522..7b5980a9d21 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 1171e218578..5e057b7e5db 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 ceb58d3b5f3..43fe2bf28ab 100644 71index 130e1f04707..3b7eb6b2a2f 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 264a7e27524..dc9d440f66b 100644 101index e11a118cb5f..4eaffb416fe 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 @@
diff --git a/meta/recipes-devtools/gcc/gcc/0005-optional-libstdc.patch b/meta/recipes-devtools/gcc/gcc/0005-optional-libstdc.patch
index 9f5b96eb63..c921ac3340 100644
--- a/meta/recipes-devtools/gcc/gcc/0005-optional-libstdc.patch
+++ b/meta/recipes-devtools/gcc/gcc/0005-optional-libstdc.patch
@@ -1,4 +1,4 @@
1From dcbfaf57a213e3beaafb0561b007c61501961f03 Mon Sep 17 00:00:00 2001 1From 57e2c5e35732988c0b287289eb0997b4e9769371 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] optional libstdc 4Subject: [PATCH] optional 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 c49da99d395..35f712e2c84 100644 28index 64e46e7573e..1824380f27a 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@@ -2025,6 +2025,10 @@ nostdinc++ 31@@ -2166,6 +2166,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,10 +40,10 @@ index c49da99d395..35f712e2c84 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 0ab63bcd211..7b081e9e4f0 100644 43index 3c9bd1490b4..818beb61cee 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@@ -159,6 +159,7 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
47 switch (decoded_options[i].opt_index) 47 switch (decoded_options[i].opt_index)
48 { 48 {
49 case OPT_nostdlib: 49 case OPT_nostdlib:
@@ -52,10 +52,10 @@ index 0ab63bcd211..7b081e9e4f0 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 cd31b522e42..1f14df48bda 100644 55index 6659a903bf0..9ee63dbe52f 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@@ -230,6 +230,9 @@ in the following sections. 58@@ -239,6 +239,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 cd31b522e42..1f14df48bda 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-tag -Wcatch-value -Wcatch-value=@var{n} @gol 66 -flang-info-include-translate@r{[}=@var{header}@r{]} @gol
67 -Wno-class-conversion -Wclass-memaccess @gol 67 -flang-info-include-translate-not @gol
68@@ -600,7 +603,7 @@ Objective-C and Objective-C++ Dialects}. 68@@ -632,7 +635,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 cd31b522e42..1f14df48bda 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@@ -14468,6 +14471,33 @@ Specify that the program entry point is @var{entry}. The argument is 77@@ -15708,6 +15711,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 cd31b522e42..1f14df48bda 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 f379f71da3d..1ee962acfaa 100644 112index 19c75b6e20d..be7630ffd8c 100644
113--- a/gcc/gcc.c 113--- a/gcc/gcc.c
114+++ b/gcc/gcc.c 114+++ b/gcc/gcc.c
115@@ -1051,6 +1051,7 @@ proper position among the other output files. */ 115@@ -1162,6 +1162,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)}}}\
diff --git a/meta/recipes-devtools/gcc/gcc/0006-COLLECT_GCC_OPTIONS.patch b/meta/recipes-devtools/gcc/gcc/0006-COLLECT_GCC_OPTIONS.patch
index 7e43284c17..265ca0e218 100644
--- a/meta/recipes-devtools/gcc/gcc/0006-COLLECT_GCC_OPTIONS.patch
+++ b/meta/recipes-devtools/gcc/gcc/0006-COLLECT_GCC_OPTIONS.patch
@@ -1,4 +1,4 @@
1From a03125f58038c89637445fdfbb6c38d2b276633e Mon Sep 17 00:00:00 2001 1From 127716a32a11ca2a6b3aac068054bfc69c4dcfd8 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] COLLECT_GCC_OPTIONS 4Subject: [PATCH] COLLECT_GCC_OPTIONS
@@ -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 1ee962acfaa..39b1635651a 100644 17index be7630ffd8c..1bc45285384 100644
18--- a/gcc/gcc.c 18--- a/gcc/gcc.c
19+++ b/gcc/gcc.c 19+++ b/gcc/gcc.c
20@@ -4809,6 +4809,15 @@ set_collect_gcc_options (void) 20@@ -5383,6 +5383,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;
diff --git a/meta/recipes-devtools/gcc/gcc/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/meta/recipes-devtools/gcc/gcc/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
index c7693a8b77..9844c2ae8a 100644
--- a/meta/recipes-devtools/gcc/gcc/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
+++ b/meta/recipes-devtools/gcc/gcc/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
@@ -1,4 +1,4 @@
1From 938b65c6ba6cb4af24285f288126fe65b3e1fa9e Mon Sep 17 00:00:00 2001 1From e64342df647829d3e1c52fd480a5be7c1281ced0 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] Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B} 4Subject: [PATCH] Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}
@@ -26,10 +26,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
26 4 files changed, 7 insertions(+), 7 deletions(-) 26 4 files changed, 7 insertions(+), 7 deletions(-)
27 27
28diff --git a/gcc/Makefile.in b/gcc/Makefile.in 28diff --git a/gcc/Makefile.in b/gcc/Makefile.in
29index 646db219460..501a5f16d9f 100644 29index 8a5fb3fd99c..7da6f439fff 100644
30--- a/gcc/Makefile.in 30--- a/gcc/Makefile.in
31+++ b/gcc/Makefile.in 31+++ b/gcc/Makefile.in
32@@ -540,7 +540,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ 32@@ -552,7 +552,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
33 TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@ 33 TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@
34 34
35 xmake_file=@xmake_file@ 35 xmake_file=@xmake_file@
@@ -39,10 +39,10 @@ index 646db219460..501a5f16d9f 100644
39 TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@ 39 TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@
40 TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@ 40 TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@
41diff --git a/gcc/configure b/gcc/configure 41diff --git a/gcc/configure b/gcc/configure
42index 8976850dff6..4d903cf40e8 100755 42index 3f0734bff11..c5d3bc4ee2d 100755
43--- a/gcc/configure 43--- a/gcc/configure
44+++ b/gcc/configure 44+++ b/gcc/configure
45@@ -12710,8 +12710,8 @@ for f in $tm_file; do 45@@ -13090,8 +13090,8 @@ for f in $tm_file; do
46 tm_include_list="${tm_include_list} $f" 46 tm_include_list="${tm_include_list} $f"
47 ;; 47 ;;
48 defaults.h ) 48 defaults.h )
@@ -54,10 +54,10 @@ index 8976850dff6..4d903cf40e8 100755
54 * ) 54 * )
55 tm_file_list="${tm_file_list} \$(srcdir)/config/$f" 55 tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
56diff --git a/gcc/configure.ac b/gcc/configure.ac 56diff --git a/gcc/configure.ac b/gcc/configure.ac
57index 13eace6cfc6..07aacfee055 100644 57index 54e21764b3e..f83420326d6 100644
58--- a/gcc/configure.ac 58--- a/gcc/configure.ac
59+++ b/gcc/configure.ac 59+++ b/gcc/configure.ac
60@@ -2143,8 +2143,8 @@ for f in $tm_file; do 60@@ -2263,8 +2263,8 @@ for f in $tm_file; do
61 tm_include_list="${tm_include_list} $f" 61 tm_include_list="${tm_include_list} $f"
62 ;; 62 ;;
63 defaults.h ) 63 defaults.h )
@@ -69,7 +69,7 @@ index 13eace6cfc6..07aacfee055 100644
69 * ) 69 * )
70 tm_file_list="${tm_file_list} \$(srcdir)/config/$f" 70 tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
71diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh 71diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh
72index d2c677a4a42..d03852481cb 100644 72index c49acd8f7e4..a0a657bdbb9 100644
73--- a/gcc/mkconfig.sh 73--- a/gcc/mkconfig.sh
74+++ b/gcc/mkconfig.sh 74+++ b/gcc/mkconfig.sh
75@@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then 75@@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then
diff --git a/meta/recipes-devtools/gcc/gcc/0008-fortran-cross-compile-hack.patch b/meta/recipes-devtools/gcc/gcc/0008-fortran-cross-compile-hack.patch
index 707066291f..47f611e37e 100644
--- a/meta/recipes-devtools/gcc/gcc/0008-fortran-cross-compile-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc/0008-fortran-cross-compile-hack.patch
@@ -1,4 +1,4 @@
1From 660bf2b932273e2cde495f31cc031bb084572862 Mon Sep 17 00:00:00 2001 1From 904d102e3ccb93296b16ceb2e283a6ccf3c1d718 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] fortran cross-compile hack. 4Subject: [PATCH] fortran cross-compile hack.
@@ -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 1b4a8b10609..d7ab18fc9f9 100755 19index f3634389cf8..f974e874b8e 100755
20--- a/libgfortran/configure 20--- a/libgfortran/configure
21+++ b/libgfortran/configure 21+++ b/libgfortran/configure
22@@ -13092,7 +13092,7 @@ esac 22@@ -13102,7 +13102,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 1b4a8b10609..d7ab18fc9f9 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 711dc60ff78..3c9bbfbf47d 100644 32index 8961e314d82..49c8221cb6b 100644
33--- a/libgfortran/configure.ac 33--- a/libgfortran/configure.ac
34+++ b/libgfortran/configure.ac 34+++ b/libgfortran/configure.ac
35@@ -258,7 +258,7 @@ AC_SUBST(enable_static) 35@@ -271,7 +271,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)
diff --git a/meta/recipes-devtools/gcc/gcc/0009-cpp-honor-sysroot.patch b/meta/recipes-devtools/gcc/gcc/0009-cpp-honor-sysroot.patch
index 3f6b69a3cc..c720defa35 100644
--- a/meta/recipes-devtools/gcc/gcc/0009-cpp-honor-sysroot.patch
+++ b/meta/recipes-devtools/gcc/gcc/0009-cpp-honor-sysroot.patch
@@ -1,4 +1,4 @@
1From 303cc9292cc0a1bd7bae994dd1e86197fb94068d Mon Sep 17 00:00:00 2001 1From 33a7a55d39c040ba09af2d69f7fa9cf8e6f84c91 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] cpp: honor sysroot. 4Subject: [PATCH] cpp: honor sysroot.
@@ -26,21 +26,23 @@ 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 0ad4a33b93e..16c744f4f90 100644 29index 8902ae1d2ed..e99e2fcd6ad 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@@ -116,7 +116,7 @@ along with GCC; see the file COPYING3. If not see
33 {".ii", "@c++-cpp-output", 0, 0, 0}, 33 {".ii", "@c++-cpp-output", 0, 0, 0},
34 {"@c++-cpp-output", 34 {"@c++-cpp-output",
35 "%{!E:%{!M:%{!MM:" 35 "%{!E:%{!M:%{!MM:"
36- " cc1plus -fpreprocessed %i %(cc1_options) %2" 36- " cc1plus -fpreprocessed %i %(cc1_options) %2"
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:"
39 " %{fmodule-only:%{!S:-o %g.s%V}}"
40 " %{!fmodule-only:%{!fmodule-header*:%(invoke_as)}}}"
39diff --git a/gcc/gcc.c b/gcc/gcc.c 41diff --git a/gcc/gcc.c b/gcc/gcc.c
40index 39b1635651a..e2e0bcee9b2 100644 42index 1bc45285384..8737bae5353 100644
41--- a/gcc/gcc.c 43--- a/gcc/gcc.c
42+++ b/gcc/gcc.c 44+++ b/gcc/gcc.c
43@@ -1351,7 +1351,7 @@ static const struct compiler default_compilers[] = 45@@ -1470,7 +1470,7 @@ static const struct compiler default_compilers[] =
44 %W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0}, 46 %W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0},
45 {".i", "@cpp-output", 0, 0, 0}, 47 {".i", "@cpp-output", 0, 0, 0},
46 {"@cpp-output", 48 {"@cpp-output",
diff --git a/meta/recipes-devtools/gcc/gcc/0010-MIPS64-Default-to-N64-ABI.patch b/meta/recipes-devtools/gcc/gcc/0010-MIPS64-Default-to-N64-ABI.patch
index 1aa29e6ac5..f385f8c5a2 100644
--- a/meta/recipes-devtools/gcc/gcc/0010-MIPS64-Default-to-N64-ABI.patch
+++ b/meta/recipes-devtools/gcc/gcc/0010-MIPS64-Default-to-N64-ABI.patch
@@ -1,4 +1,4 @@
1From b75e8fb1cc1607077a113de40ae0d16ad273f05a Mon Sep 17 00:00:00 2001 1From a2dc2fa4cc7e5d54544d4a7b6601eef79bc26cad 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] MIPS64: Default to N64 ABI 4Subject: [PATCH] MIPS64: Default 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 6fcdd771d4c..feafcadfcac 100644 17index 3ec7582f5dd..a046fa6945c 100644
18--- a/gcc/config.gcc 18--- a/gcc/config.gcc
19+++ b/gcc/config.gcc 19+++ b/gcc/config.gcc
20@@ -2542,29 +2542,29 @@ mips*-*-linux*) # Linux MIPS, either endian. 20@@ -2543,29 +2543,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)
diff --git a/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
index ee34836ea0..4726267a80 100644
--- a/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
+++ b/meta/recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
@@ -1,4 +1,4 @@
1From 438b8d40f6060c0d62b474b2ae970241f9635f6b Mon Sep 17 00:00:00 2001 1From 8e9d6efecdc8c42f47e3a012dee764b13c3dad59 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 Mar 2013 09:24:50 +0400 3Date: Fri, 29 Mar 2013 09:24:50 +0400
4Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER 4Subject: [PATCH] Define 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 e25fcac3c59..01aca0c6542 100644 34index c1dae8ca2cf..3ce2b76c1a4 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 e25fcac3c59..01aca0c6542 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 5bdcfa0c5d3..0c0332f317f 100644 49index 85d0136e76e..6bd95855827 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 5bdcfa0c5d3..0c0332f317f 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 0ec3aa53189..abfa9566d74 100644 64index 0c1c4e70b6b..6bd643ade11 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 0ec3aa53189..abfa9566d74 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 9f823f125ed..e0390b7d5e3 100644 77index 04b274f1654..7aafcf3ac2d 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 9f823f125ed..e0390b7d5e3 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 6cb68d1ccfa..7de09ec857c 100644 90index b3822ced528..92d303e80d6 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 6cb68d1ccfa..7de09ec857c 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 95654bcdb5a..0c1a8118a26 100644 107index 4e1db60fced..87efc5f69fe 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 95654bcdb5a..0c1a8118a26 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 54446e58e5f..4786ee304c1 100644 126index 44a85e410d9..8d41b5574f6 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 54446e58e5f..4786ee304c1 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 4afef7c228c..01997330741 100644 157index 9238de5bc92..7136a83260a 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 4afef7c228c..01997330741 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 2ded3301282..80969a8fd89 100644 170index e3f2cd254f6..a11e01faa3d 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@@ -419,24 +419,19 @@ extern int dot_symbols; 173@@ -336,24 +336,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 2ded3301282..80969a8fd89 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 c1d0441d488..81373eb8336 100644 204index 7558d2f7195..3aaa6c3a078 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 c1d0441d488..81373eb8336 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 63853e60c03..31219e9892c 100644 217index 2550d7ee8f0..a94f4cd8ba2 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@@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); 220@@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
@@ -227,7 +227,7 @@ index 63853e60c03..31219e9892c 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 19ce84d7adb..0d9cc752931 100644 230index 95af8afa9b5..63127afb074 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@@ -78,8 +78,8 @@ along with GCC; see the file COPYING3. If not see 233@@ -78,8 +78,8 @@ along with GCC; see the file COPYING3. If not see
diff --git a/meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch b/meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch
index ad2df92192..814ce18b98 100644
--- a/meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch
+++ b/meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch
@@ -1,4 +1,4 @@
1From cc2aac0b93f2f22a5fd0ecd80743e88d4e244597 Mon Sep 17 00:00:00 2001 1From 12646c0899dec1b127ce71ebacf2571c1c7360f4 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] gcc: Fix argument list too long error. 4Subject: [PATCH] gcc: Fix argument list too long error.
@@ -28,10 +28,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
28 1 file changed, 1 insertion(+), 1 deletion(-) 28 1 file changed, 1 insertion(+), 1 deletion(-)
29 29
30diff --git a/gcc/Makefile.in b/gcc/Makefile.in 30diff --git a/gcc/Makefile.in b/gcc/Makefile.in
31index 501a5f16d9f..674f1057aaf 100644 31index 7da6f439fff..59c45c81393 100644
32--- a/gcc/Makefile.in 32--- a/gcc/Makefile.in
33+++ b/gcc/Makefile.in 33+++ b/gcc/Makefile.in
34@@ -3609,7 +3609,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype 34@@ -3678,7 +3678,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype
35 # We keep the directory structure for files in config, common/config or 35 # We keep the directory structure for files in config, common/config or
36 # c-family and .def files. All other files are flattened to a single directory. 36 # c-family and .def files. All other files are flattened to a single directory.
37 $(mkinstalldirs) $(DESTDIR)$(plugin_includedir) 37 $(mkinstalldirs) $(DESTDIR)$(plugin_includedir)
diff --git a/meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch b/meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch
index b93ae837ac..1e657666df 100644
--- a/meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch
+++ b/meta/recipes-devtools/gcc/gcc/0013-Disable-sdt.patch
@@ -1,4 +1,4 @@
1From d87eef0037d15f363b2614bac531626b87189d4f Mon Sep 17 00:00:00 2001 1From 7928a4eddc4a6d821a6aa6eaaea1fd60d54e3da9 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] Disable sdt. 4Subject: [PATCH] Disable sdt.
@@ -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 4d903cf40e8..156090550c2 100755 28index c5d3bc4ee2d..5160917d73e 100755
29--- a/gcc/configure 29--- a/gcc/configure
30+++ b/gcc/configure 30+++ b/gcc/configure
31@@ -29830,12 +29830,12 @@ fi 31@@ -30812,12 +30812,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 4d903cf40e8..156090550c2 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 07aacfee055..f31a43e7dd3 100644 51index f83420326d6..50f78308e8a 100644
52--- a/gcc/configure.ac 52--- a/gcc/configure.ac
53+++ b/gcc/configure.ac 53+++ b/gcc/configure.ac
54@@ -6203,15 +6203,15 @@ fi 54@@ -6653,15 +6653,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 07aacfee055..f31a43e7dd3 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 766a0a8d504..ba59088a722 100755 80index a310e9feb6c..c879445b8a6 100755
81--- a/libstdc++-v3/configure 81--- a/libstdc++-v3/configure
82+++ b/libstdc++-v3/configure 82+++ b/libstdc++-v3/configure
83@@ -21986,11 +21986,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 83@@ -22014,11 +22014,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
84 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 84 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
85 ac_compiler_gnu=$ac_cv_c_compiler_gnu 85 ac_compiler_gnu=$ac_cv_c_compiler_gnu
86 86
@@ -96,7 +96,7 @@ index 766a0a8d504..ba59088a722 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 07cf05b6856..dd5f26957d5 100644 99index 3c799be82b1..3f63a8ec9ce 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@@ -240,7 +240,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN 102@@ -240,7 +240,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN
diff --git a/meta/recipes-devtools/gcc/gcc/0014-libtool.patch b/meta/recipes-devtools/gcc/gcc/0014-libtool.patch
index 3da3261bfe..f2b8924ebf 100644
--- a/meta/recipes-devtools/gcc/gcc/0014-libtool.patch
+++ b/meta/recipes-devtools/gcc/gcc/0014-libtool.patch
@@ -1,4 +1,4 @@
1From d1584292b3a199dc6318f7508fd0c74ec4169a21 Mon Sep 17 00:00:00 2001 1From a5b984db9669cf38a7bd76c3fcdb41c086f740db 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] libtool 4Subject: [PATCH] libtool
diff --git a/meta/recipes-devtools/gcc/gcc/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/meta/recipes-devtools/gcc/gcc/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
index e08e44cc04..1ccf39ceba 100644
--- a/meta/recipes-devtools/gcc/gcc/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
+++ b/meta/recipes-devtools/gcc/gcc/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
@@ -1,4 +1,4 @@
1From b7a96ff62cc0daa3a789c720d30e2edaabbafe5d Mon Sep 17 00:00:00 2001 1From 0ae7090dec149cb2ff0c87eef87c043d4000ece1 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] gcc: armv4: pass fix-v4bx to linker to support EABI. 4Subject: [PATCH] gcc: armv4: pass fix-v4bx to linker to support EABI.
@@ -19,7 +19,7 @@ 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 0c0332f317f..7b3769e8459 100644 22index 6bd95855827..77befab5da8 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 @@
diff --git a/meta/recipes-devtools/gcc/gcc/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/meta/recipes-devtools/gcc/gcc/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch
index d86da6517f..bde7ec6609 100644
--- a/meta/recipes-devtools/gcc/gcc/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch
+++ b/meta/recipes-devtools/gcc/gcc/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch
@@ -1,4 +1,4 @@
1From 187e962aed3b3f39a96eb4419a7fa23e88634efb Mon Sep 17 00:00:00 2001 1From 5ce8aa4615a3816d12c43752323154744517ae9f 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] Use the multilib config files from ${B} instead of using the 4Subject: [PATCH] Use the multilib config files from ${B} instead of using the
@@ -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 156090550c2..fde89ad8e89 100755 21index 5160917d73e..e663052cad2 100755
22--- a/gcc/configure 22--- a/gcc/configure
23+++ b/gcc/configure 23+++ b/gcc/configure
24@@ -12690,10 +12690,20 @@ done 24@@ -13070,10 +13070,20 @@ done
25 tmake_file_= 25 tmake_file_=
26 for f in ${tmake_file} 26 for f in ${tmake_file}
27 do 27 do
@@ -46,7 +46,7 @@ index 156090550c2..fde89ad8e89 100755
46 done 46 done
47 tmake_file="${tmake_file_}${omp_device_property_tmake_file}" 47 tmake_file="${tmake_file_}${omp_device_property_tmake_file}"
48 48
49@@ -12704,6 +12714,10 @@ tm_file_list="options.h" 49@@ -13084,6 +13094,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 156090550c2..fde89ad8e89 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 f31a43e7dd3..cad69549a01 100644 61index 50f78308e8a..2b84875b028 100644
62--- a/gcc/configure.ac 62--- a/gcc/configure.ac
63+++ b/gcc/configure.ac 63+++ b/gcc/configure.ac
64@@ -2123,10 +2123,20 @@ done 64@@ -2243,10 +2243,20 @@ done
65 tmake_file_= 65 tmake_file_=
66 for f in ${tmake_file} 66 for f in ${tmake_file}
67 do 67 do
@@ -86,7 +86,7 @@ index f31a43e7dd3..cad69549a01 100644
86 done 86 done
87 tmake_file="${tmake_file_}${omp_device_property_tmake_file}" 87 tmake_file="${tmake_file_}${omp_device_property_tmake_file}"
88 88
89@@ -2137,6 +2147,10 @@ tm_file_list="options.h" 89@@ -2257,6 +2267,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
diff --git a/meta/recipes-devtools/gcc/gcc/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/meta/recipes-devtools/gcc/gcc/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
index 55eb44e326..3e0a1b4136 100644
--- a/meta/recipes-devtools/gcc/gcc/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
+++ b/meta/recipes-devtools/gcc/gcc/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
@@ -1,4 +1,4 @@
1From 6211545ca5aa4a5bfb7c4dfcfdb9db7e5511b40e Mon Sep 17 00:00:00 2001 1From 75a1ce0265ca123f74f17a40ad8bd8f26d9c2ab3 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] Avoid using libdir from .la which usually points to a host 4Subject: [PATCH] Avoid using libdir from .la which usually points to a host
diff --git a/meta/recipes-devtools/gcc/gcc/0018-export-CPP.patch b/meta/recipes-devtools/gcc/gcc/0018-export-CPP.patch
index 5f28e868e2..e6596da5c7 100644
--- a/meta/recipes-devtools/gcc/gcc/0018-export-CPP.patch
+++ b/meta/recipes-devtools/gcc/gcc/0018-export-CPP.patch
@@ -1,4 +1,4 @@
1From 9d8512e3efa0d125714bafb907734a0c095b84ce Mon Sep 17 00:00:00 2001 1From b6e229a13aebfbb3fe38c216fd51b68bf71cfa9c 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] export CPP 4Subject: [PATCH] export CPP
@@ -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 36e369df6e7..c717903bb13 100644 40index 047be0255e2..af19589fa95 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 = \
diff --git a/meta/recipes-devtools/gcc/gcc/0019-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc/0019-Ensure-target-gcc-headers-can-be-included.patch
index 9e9f2874db..98472dd2b5 100644
--- a/meta/recipes-devtools/gcc/gcc/0019-Ensure-target-gcc-headers-can-be-included.patch
+++ b/meta/recipes-devtools/gcc/gcc/0019-Ensure-target-gcc-headers-can-be-included.patch
@@ -1,4 +1,4 @@
1From 468604663f799d3d80d0db760f03ba32678801aa Mon Sep 17 00:00:00 2001 1From 9b4eb0e18a953d79d20c78d3ba741af6d71ab9ca 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] Ensure target gcc headers can be included 4Subject: [PATCH] Ensure target gcc headers can be included
@@ -21,10 +21,10 @@ 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 674f1057aaf..087bf3f1137 100644 24index 59c45c81393..9b17d120aa1 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@@ -630,6 +630,7 @@ libexecdir = @libexecdir@
28 28
29 # Directory in which the compiler finds libraries etc. 29 # Directory in which the compiler finds libraries etc.
30 libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) 30 libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
@@ -32,7 +32,7 @@ index 674f1057aaf..087bf3f1137 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@@ -2948,6 +2949,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" 35@@ -3016,6 +3017,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,10 +41,10 @@ index 674f1057aaf..087bf3f1137 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 af38cc494ea..2f43b88a0c3 100644 44index c503d14fc3f..d54d6ce0076 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@@ -64,6 +64,10 @@ const struct default_include cpp_include_defaults[]
48 /* This is the dir for gcc's private headers. */ 48 /* This is the dir for gcc's private headers. */
49 { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, 49 { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 },
50 #endif 50 #endif
diff --git a/meta/recipes-devtools/gcc/gcc/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/meta/recipes-devtools/gcc/gcc/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch
index ce838ebcdb..bb2a3671f0 100644
--- a/meta/recipes-devtools/gcc/gcc/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch
+++ b/meta/recipes-devtools/gcc/gcc/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch
@@ -1,4 +1,4 @@
1From dbdf19800e24571603b0baee1734a58ff2cf2974 Mon Sep 17 00:00:00 2001 1From cd09adb1e7f2a7e81a9f595a17c36f24911b90ac 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] Don't search host directory during "relink" if $inst_prefix 4Subject: [PATCH] Don't search host directory during "relink" if $inst_prefix
diff --git a/meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
index 58327209d4..0f3b3869b0 100644
--- a/meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
+++ b/meta/recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
@@ -1,4 +1,4 @@
1From 7c019b932f06bdce624b4739fba75dacff794076 Mon Sep 17 00:00:00 2001 1From 7faad21154a76b200efcced9e12945057c94dff3 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] Use SYSTEMLIBS_DIR replacement instead of hardcoding 4Subject: [PATCH] Use SYSTEMLIBS_DIR replacement instead of hardcoding
@@ -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 e587e2e9ad6..ddc62895693 100644 15index 7f2529a2a1d..5303b39186f 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 @@
diff --git a/meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch b/meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch
index 851f8ed063..41536a8a3b 100644
--- a/meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch
+++ b/meta/recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch
@@ -1,4 +1,4 @@
1From ce93292090b1a8cb0b0b0061ec09243936bf9bcf Mon Sep 17 00:00:00 2001 1From 96aa24a874331a318693e4fccc4bc4e7d3fbad2b 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] aarch64: Add support for musl ldso 4Subject: [PATCH] aarch64: Add support for musl ldso
@@ -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 ddc62895693..b301825313a 100644 14index 5303b39186f..4bcae7f3110 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 @@
diff --git a/meta/recipes-devtools/gcc/gcc/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/meta/recipes-devtools/gcc/gcc/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch
index d981b37658..fb4511cc1a 100644
--- a/meta/recipes-devtools/gcc/gcc/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch
+++ b/meta/recipes-devtools/gcc/gcc/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch
@@ -1,4 +1,4 @@
1From cc298bd514d32cea58bfbdbda503d710355e97b4 Mon Sep 17 00:00:00 2001 1From 2cfc5ee38b3f5ec1d7965aae0991bcd48b5dc2e6 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Sun, 5 Jul 2015 20:25:18 -0700 3Date: Sun, 5 Jul 2015 20:25:18 -0700
4Subject: [PATCH] libcc1: fix libcc1's install path and rpath 4Subject: [PATCH] libcc1: fix libcc1's install path and rpath
@@ -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 fe7b64cbc6f..bdd0617049b 100644 23index f148fdd7aa2..0b6eb8f2855 100644
24--- a/libcc1/Makefile.am 24--- a/libcc1/Makefile.am
25+++ b/libcc1/Makefile.am 25+++ b/libcc1/Makefile.am
26@@ -40,8 +40,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ 26@@ -40,8 +40,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \
@@ -35,10 +35,10 @@ index fe7b64cbc6f..bdd0617049b 100644
35 if ENABLE_PLUGIN 35 if ENABLE_PLUGIN
36 plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la 36 plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la
37diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in 37diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in
38index 2def836cb06..98e12a9d369 100644 38index 753d435c9cb..455627b0a3b 100644
39--- a/libcc1/Makefile.in 39--- a/libcc1/Makefile.in
40+++ b/libcc1/Makefile.in 40+++ b/libcc1/Makefile.in
41@@ -394,8 +394,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ 41@@ -398,8 +398,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \
42 $(Wc)$(libiberty_normal))) 42 $(Wc)$(libiberty_normal)))
43 43
44 libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty)) 44 libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty))
diff --git a/meta/recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch b/meta/recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch
index 6c75c0f2bf..3958e9c212 100644
--- a/meta/recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch
+++ b/meta/recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch
@@ -1,4 +1,4 @@
1From 2966f3c43382fa4f79cbac761232dae2e92e7012 Mon Sep 17 00:00:00 2001 1From 35c084a051bcd6587ebc73e4acb045cb2bdf7e99 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] handle sysroot support for nativesdk-gcc 4Subject: [PATCH] handle sysroot support for nativesdk-gcc
@@ -41,10 +41,10 @@ Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
41 6 files changed, 70 insertions(+), 48 deletions(-) 41 6 files changed, 70 insertions(+), 48 deletions(-)
42 42
43diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c 43diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
44index c51d6d34726..aa7507df2cf 100644 44index bd15b9cd902..2bd667e3f58 100644
45--- a/gcc/c-family/c-opts.c 45--- a/gcc/c-family/c-opts.c
46+++ b/gcc/c-family/c-opts.c 46+++ b/gcc/c-family/c-opts.c
47@@ -1409,8 +1409,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain) 47@@ -1436,8 +1436,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain)
48 size_t prefix_len, suffix_len; 48 size_t prefix_len, suffix_len;
49 49
50 suffix_len = strlen (suffix); 50 suffix_len = strlen (suffix);
@@ -56,7 +56,7 @@ index c51d6d34726..aa7507df2cf 100644
56 path = (char *) xmalloc (prefix_len + suffix_len + 1); 56 path = (char *) xmalloc (prefix_len + suffix_len + 1);
57 memcpy (path, prefix, prefix_len); 57 memcpy (path, prefix, prefix_len);
58diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c 58diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c
59index 2f43b88a0c3..6b6be04686c 100644 59index d54d6ce0076..784a92a0c24 100644
60--- a/gcc/cppdefault.c 60--- a/gcc/cppdefault.c
61+++ b/gcc/cppdefault.c 61+++ b/gcc/cppdefault.c
62@@ -35,6 +35,30 @@ 62@@ -35,6 +35,30 @@
@@ -90,7 +90,7 @@ index 2f43b88a0c3..6b6be04686c 100644
90 const struct default_include cpp_include_defaults[] 90 const struct default_include cpp_include_defaults[]
91 #ifdef INCLUDE_DEFAULTS 91 #ifdef INCLUDE_DEFAULTS
92 = INCLUDE_DEFAULTS; 92 = INCLUDE_DEFAULTS;
93@@ -42,38 +66,38 @@ const struct default_include cpp_include_defaults[] 93@@ -42,17 +66,17 @@ const struct default_include cpp_include_defaults[]
94 = { 94 = {
95 #ifdef GPLUSPLUS_INCLUDE_DIR 95 #ifdef GPLUSPLUS_INCLUDE_DIR
96 /* Pick up GNU C++ generic include files. */ 96 /* Pick up GNU C++ generic include files. */
@@ -110,6 +110,9 @@ index 2f43b88a0c3..6b6be04686c 100644
110+ { GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR, "G++", 1, 1, 110+ { GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR, "G++", 1, 1,
111 GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, 111 GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
112 #endif 112 #endif
113 #ifdef GPLUSPLUS_LIBCXX_INCLUDE_DIR
114@@ -62,23 +86,23 @@ const struct default_include cpp_include_defaults[]
115 #endif
113 #ifdef GCC_INCLUDE_DIR 116 #ifdef GCC_INCLUDE_DIR
114 /* This is the dir for gcc's private headers. */ 117 /* This is the dir for gcc's private headers. */
115- { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, 118- { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 },
@@ -138,7 +141,7 @@ index 2f43b88a0c3..6b6be04686c 100644
138 /* A multilib suffix needs adding if different multilibs use 141 /* A multilib suffix needs adding if different multilibs use
139 different headers. */ 142 different headers. */
140 #ifdef SYSROOT_HEADERS_SUFFIX_SPEC 143 #ifdef SYSROOT_HEADERS_SUFFIX_SPEC
141@@ -85,33 +109,24 @@ const struct default_include cpp_include_defaults[] 144@@ -90,33 +114,24 @@ const struct default_include cpp_include_defaults[]
142 #endif 145 #endif
143 #ifdef CROSS_INCLUDE_DIR 146 #ifdef CROSS_INCLUDE_DIR
144 /* One place the target system's headers might be. */ 147 /* One place the target system's headers might be. */
@@ -179,7 +182,7 @@ index 2f43b88a0c3..6b6be04686c 100644
179 /* This value is set by cpp_relocated at runtime */ 182 /* This value is set by cpp_relocated at runtime */
180 const char *gcc_exec_prefix; 183 const char *gcc_exec_prefix;
181diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h 184diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h
182index a681264f75e..5e10a2fa140 100644 185index fd3c655db1c..20669ac427d 100644
183--- a/gcc/cppdefault.h 186--- a/gcc/cppdefault.h
184+++ b/gcc/cppdefault.h 187+++ b/gcc/cppdefault.h
185@@ -33,7 +33,8 @@ 188@@ -33,7 +33,8 @@
@@ -191,8 +194,8 @@ index a681264f75e..5e10a2fa140 100644
191+ 194+
192 const char *const component; /* The component containing the directory 195 const char *const component; /* The component containing the directory
193 (see update_path in prefix.c) */ 196 (see update_path in prefix.c) */
194 const char cplusplus; /* Only look here if we're compiling C++. */ 197 const char cplusplus; /* When this is non-zero, we should only
195@@ -50,17 +51,13 @@ struct default_include 198@@ -55,17 +56,13 @@ struct default_include
196 }; 199 };
197 200
198 extern const struct default_include cpp_include_defaults[]; 201 extern const struct default_include cpp_include_defaults[];
@@ -214,7 +217,7 @@ index a681264f75e..5e10a2fa140 100644
214 subdirectory of the actual installation. */ 217 subdirectory of the actual installation. */
215 extern const char *gcc_exec_prefix; 218 extern const char *gcc_exec_prefix;
216diff --git a/gcc/gcc.c b/gcc/gcc.c 219diff --git a/gcc/gcc.c b/gcc/gcc.c
217index e2e0bcee9b2..912c2febf94 100644 220index 8737bae5353..aa6fbe43965 100644
218--- a/gcc/gcc.c 221--- a/gcc/gcc.c
219+++ b/gcc/gcc.c 222+++ b/gcc/gcc.c
220@@ -252,6 +252,8 @@ FILE *report_times_to_file = NULL; 223@@ -252,6 +252,8 @@ FILE *report_times_to_file = NULL;
@@ -226,7 +229,7 @@ index e2e0bcee9b2..912c2febf94 100644
226 /* Nonzero means pass the updated target_system_root to the compiler. */ 229 /* Nonzero means pass the updated target_system_root to the compiler. */
227 230
228 static int target_system_root_changed; 231 static int target_system_root_changed;
229@@ -526,6 +528,7 @@ or with constant text in a single argument. 232@@ -568,6 +570,7 @@ or with constant text in a single argument.
230 %G process LIBGCC_SPEC as a spec. 233 %G process LIBGCC_SPEC as a spec.
231 %R Output the concatenation of target_system_root and 234 %R Output the concatenation of target_system_root and
232 target_sysroot_suffix. 235 target_sysroot_suffix.
@@ -234,7 +237,7 @@ index e2e0bcee9b2..912c2febf94 100644
234 %S process STARTFILE_SPEC as a spec. A capital S is actually used here. 237 %S process STARTFILE_SPEC as a spec. A capital S is actually used here.
235 %E process ENDFILE_SPEC as a spec. A capital E is actually used here. 238 %E process ENDFILE_SPEC as a spec. A capital E is actually used here.
236 %C process CPP_SPEC as a spec. 239 %C process CPP_SPEC as a spec.
237@@ -1502,10 +1505,10 @@ static const char *gcc_libexec_prefix; 240@@ -1621,10 +1624,10 @@ static const char *gcc_libexec_prefix;
238 gcc_exec_prefix is set because, in that case, we know where the 241 gcc_exec_prefix is set because, in that case, we know where the
239 compiler has been installed, and use paths relative to that 242 compiler has been installed, and use paths relative to that
240 location instead. */ 243 location instead. */
@@ -249,7 +252,7 @@ index e2e0bcee9b2..912c2febf94 100644
249 252
250 /* For native compilers, these are well-known paths containing 253 /* For native compilers, these are well-known paths containing
251 components that may be provided by the system. For cross 254 components that may be provided by the system. For cross
252@@ -1513,9 +1516,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; 255@@ -1632,9 +1635,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
253 static const char *md_exec_prefix = MD_EXEC_PREFIX; 256 static const char *md_exec_prefix = MD_EXEC_PREFIX;
254 static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; 257 static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
255 static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1; 258 static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
@@ -261,7 +264,7 @@ index e2e0bcee9b2..912c2febf94 100644
261 = STANDARD_STARTFILE_PREFIX_2; 264 = STANDARD_STARTFILE_PREFIX_2;
262 265
263 /* A relative path to be used in finding the location of tools 266 /* A relative path to be used in finding the location of tools
264@@ -5955,6 +5958,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) 267@@ -6564,6 +6567,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part)
265 } 268 }
266 break; 269 break;
267 270
@@ -274,7 +277,7 @@ index e2e0bcee9b2..912c2febf94 100644
274 value = do_spec_1 (startfile_spec, 0, NULL); 277 value = do_spec_1 (startfile_spec, 0, NULL);
275 if (value != 0) 278 if (value != 0)
276diff --git a/gcc/incpath.c b/gcc/incpath.c 279diff --git a/gcc/incpath.c b/gcc/incpath.c
277index 9098ab044ab..bfad4ebe382 100644 280index fbfc0ce03b8..a82e543428b 100644
278--- a/gcc/incpath.c 281--- a/gcc/incpath.c
279+++ b/gcc/incpath.c 282+++ b/gcc/incpath.c
280@@ -131,7 +131,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, 283@@ -131,7 +131,7 @@ add_standard_paths (const char *sysroot, const char *iprefix,
@@ -286,7 +289,7 @@ index 9098ab044ab..bfad4ebe382 100644
286 { 289 {
287 /* Look for directories that start with the standard prefix. 290 /* Look for directories that start with the standard prefix.
288 "Translate" them, i.e. replace /usr/local/lib/gcc... with 291 "Translate" them, i.e. replace /usr/local/lib/gcc... with
289@@ -145,7 +145,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, 292@@ -146,7 +146,7 @@ add_standard_paths (const char *sysroot, const char *iprefix,
290 now. */ 293 now. */
291 if (sysroot && p->add_sysroot) 294 if (sysroot && p->add_sysroot)
292 continue; 295 continue;
@@ -295,7 +298,7 @@ index 9098ab044ab..bfad4ebe382 100644
295 { 298 {
296 char *str = concat (iprefix, p->fname + len, NULL); 299 char *str = concat (iprefix, p->fname + len, NULL);
297 if (p->multilib == 1 && imultilib) 300 if (p->multilib == 1 && imultilib)
298@@ -185,7 +185,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, 301@@ -187,7 +187,7 @@ add_standard_paths (const char *sysroot, const char *iprefix,
299 free (sysroot_no_trailing_dir_separator); 302 free (sysroot_no_trailing_dir_separator);
300 } 303 }
301 else if (!p->add_sysroot && relocated 304 else if (!p->add_sysroot && relocated
@@ -304,7 +307,7 @@ index 9098ab044ab..bfad4ebe382 100644
304 { 307 {
305 static const char *relocated_prefix; 308 static const char *relocated_prefix;
306 char *ostr; 309 char *ostr;
307@@ -202,12 +202,12 @@ add_standard_paths (const char *sysroot, const char *iprefix, 310@@ -204,12 +204,12 @@ add_standard_paths (const char *sysroot, const char *iprefix,
308 dummy = concat (gcc_exec_prefix, "dummy", NULL); 311 dummy = concat (gcc_exec_prefix, "dummy", NULL);
309 relocated_prefix 312 relocated_prefix
310 = make_relative_prefix (dummy, 313 = make_relative_prefix (dummy,
@@ -321,7 +324,7 @@ index 9098ab044ab..bfad4ebe382 100644
321 str = update_path (ostr, p->component); 324 str = update_path (ostr, p->component);
322 free (ostr); 325 free (ostr);
323diff --git a/gcc/prefix.c b/gcc/prefix.c 326diff --git a/gcc/prefix.c b/gcc/prefix.c
324index 1a403e535bd..c26d07bde12 100644 327index 747c09de638..f728638dc65 100644
325--- a/gcc/prefix.c 328--- a/gcc/prefix.c
326+++ b/gcc/prefix.c 329+++ b/gcc/prefix.c
327@@ -72,7 +72,9 @@ License along with GCC; see the file COPYING3. If not see 330@@ -72,7 +72,9 @@ License along with GCC; see the file COPYING3. If not see
diff --git a/meta/recipes-devtools/gcc/gcc/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/meta/recipes-devtools/gcc/gcc/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch
index e8b52daf25..ff622b1056 100644
--- a/meta/recipes-devtools/gcc/gcc/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch
+++ b/meta/recipes-devtools/gcc/gcc/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch
@@ -1,4 +1,4 @@
1From 5fdf6a0e959c26512c795bf904b35348f749406c Mon Sep 17 00:00:00 2001 1From c55e24459370ad96577496ecd87475e3a9de7dad 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] Search target sysroot gcc version specific dirs with 4Subject: [PATCH] Search target sysroot gcc version specific dirs with
@@ -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 912c2febf94..24a92bf27f9 100644 54index aa6fbe43965..f8a71a13826 100644
55--- a/gcc/gcc.c 55--- a/gcc/gcc.c
56+++ b/gcc/gcc.c 56+++ b/gcc/gcc.c
57@@ -2619,7 +2619,7 @@ for_each_path (const struct path_prefix *paths, 57@@ -2811,7 +2811,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 912c2febf94..24a92bf27f9 100644
63 path = XNEWVEC (char, len); 63 path = XNEWVEC (char, len);
64 } 64 }
65 65
66@@ -2631,6 +2631,33 @@ for_each_path (const struct path_prefix *paths, 66@@ -2823,6 +2823,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 {
diff --git a/meta/recipes-devtools/gcc/gcc/0026-Fix-various-_FOR_BUILD-and-related-variables.patch b/meta/recipes-devtools/gcc/gcc/0026-Fix-various-_FOR_BUILD-and-related-variables.patch
index 0356baac5c..c2698f9eeb 100644
--- a/meta/recipes-devtools/gcc/gcc/0026-Fix-various-_FOR_BUILD-and-related-variables.patch
+++ b/meta/recipes-devtools/gcc/gcc/0026-Fix-various-_FOR_BUILD-and-related-variables.patch
@@ -1,4 +1,4 @@
1From b647a62ddbbb7fbc58aa865cd2d34539677eb107 Mon Sep 17 00:00:00 2001 1From cd5db101e3c4e72248f988a67ce28be8e24f66d4 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] Fix various _FOR_BUILD and related variables 4Subject: [PATCH] Fix various _FOR_BUILD and related variables
@@ -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 c717903bb13..5abc649868d 100644 29index af19589fa95..d0116a23e1a 100644
30--- a/Makefile.in 30--- a/Makefile.in
31+++ b/Makefile.in 31+++ b/Makefile.in
32@@ -152,6 +152,7 @@ BUILD_EXPORTS = \ 32@@ -152,6 +152,7 @@ BUILD_EXPORTS = \
@@ -64,7 +64,7 @@ index c717903bb13..5abc649868d 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 efed1511750..778beb705b4 100644 67index 6e0337fb48f..4fcac93d3d8 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,10 +94,10 @@ index efed1511750..778beb705b4 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 087bf3f1137..272d521a276 100644 97index 9b17d120aa1..3053d05903c 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@@ -820,7 +820,7 @@ BUILD_LDFLAGS=@BUILD_LDFLAGS@
101 BUILD_NO_PIE_FLAG = @BUILD_NO_PIE_FLAG@ 101 BUILD_NO_PIE_FLAG = @BUILD_NO_PIE_FLAG@
102 BUILD_LDFLAGS += $(BUILD_NO_PIE_FLAG) 102 BUILD_LDFLAGS += $(BUILD_NO_PIE_FLAG)
103 BUILD_CPPFLAGS= -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \ 103 BUILD_CPPFLAGS= -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
@@ -107,10 +107,10 @@ index 087bf3f1137..272d521a276 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 fde89ad8e89..e042e992419 100755 110index e663052cad2..b0906aa3e96 100755
111--- a/gcc/configure 111--- a/gcc/configure
112+++ b/gcc/configure 112+++ b/gcc/configure
113@@ -12319,7 +12319,7 @@ else 113@@ -12699,7 +12699,7 @@ else
114 CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ 114 CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
115 CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \ 115 CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \
116 LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \ 116 LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \
@@ -120,10 +120,10 @@ index fde89ad8e89..e042e992419 100755
120 --enable-languages=${enable_languages-all} \ 120 --enable-languages=${enable_languages-all} \
121 ${enable_obsolete+--enable-obsolete="$enable_obsolete"} \ 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 cad69549a01..8e35c9be7f9 100644 123index 2b84875b028..bfbd8946e8a 100644
124--- a/gcc/configure.ac 124--- a/gcc/configure.ac
125+++ b/gcc/configure.ac 125+++ b/gcc/configure.ac
126@@ -1903,7 +1903,7 @@ else 126@@ -2023,7 +2023,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}" \
diff --git a/meta/recipes-devtools/gcc/gcc/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch b/meta/recipes-devtools/gcc/gcc/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch
index 47de3c354c..2e65740ec0 100644
--- a/meta/recipes-devtools/gcc/gcc/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch
+++ b/meta/recipes-devtools/gcc/gcc/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch
@@ -1,4 +1,4 @@
1From f7a6ddd3fb612393595f6e959e99d48c26f4d14f Mon Sep 17 00:00:00 2001 1From 9bbce1b5a10caf636eee137e5a229e5434a6c8f5 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] nios2: Define MUSL_DYNAMIC_LINKER 4Subject: [PATCH] nios2: Define MUSL_DYNAMIC_LINKER
@@ -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 4bdcdcca1f0..e7943a9d640 100644 15index 08edf1521f6..15696d86241 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 @@
diff --git a/meta/recipes-devtools/gcc/gcc/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta/recipes-devtools/gcc/gcc/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
index cd409a894c..edca9e3ca4 100644
--- a/meta/recipes-devtools/gcc/gcc/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
+++ b/meta/recipes-devtools/gcc/gcc/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
@@ -1,4 +1,4 @@
1From 0bb86e4d2ab0bb44bab37a005f971cf94046ff0d Mon Sep 17 00:00:00 2001 1From 745a2ac7825c73102b888226c54397d21512f86b 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] Add ssp_nonshared to link commandline for musl targets 4Subject: [PATCH] Add ssp_nonshared to link commandline for musl targets
@@ -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 0c1a8118a26..bdc2a2d0659 100644 26index 87efc5f69fe..3c7b7c538b9 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 0c1a8118a26..bdc2a2d0659 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 b7026fcbee7..dd54d6c393e 100644 44index 47c9d9ac0b6..d065f88b377 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 b7026fcbee7..dd54d6c393e 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 80969a8fd89..97a78ae945c 100644 65index a11e01faa3d..ce464f3626b 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@@ -452,6 +452,16 @@ extern int dot_symbols; 68@@ -369,6 +369,16 @@ extern int dot_symbols;
69 " -m elf64ppc") 69 " -m elf64ppc")
70 #endif 70 #endif
71 71
diff --git a/meta/recipes-devtools/gcc/gcc/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch b/meta/recipes-devtools/gcc/gcc/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
index 9342329ecf..b74aeb8bb6 100644
--- a/meta/recipes-devtools/gcc/gcc/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
+++ b/meta/recipes-devtools/gcc/gcc/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
@@ -1,4 +1,4 @@
1From 61b000792f32d4ca9b4b4498ebb7fd5d1deed710 Mon Sep 17 00:00:00 2001 1From 695adb4dffb23c6f5cbc757e05cf4187a2bd6528 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] Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS 4Subject: [PATCH] Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS
@@ -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 c997553447c..330352c2c81 100644 15index c59b43b7b69..ca4c141f526 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) \
diff --git a/meta/recipes-devtools/gcc/gcc/0030-sync-gcc-stddef.h-with-musl.patch b/meta/recipes-devtools/gcc/gcc/0030-sync-gcc-stddef.h-with-musl.patch
index ffbf6b97ab..86f75d0d51 100644
--- a/meta/recipes-devtools/gcc/gcc/0030-sync-gcc-stddef.h-with-musl.patch
+++ b/meta/recipes-devtools/gcc/gcc/0030-sync-gcc-stddef.h-with-musl.patch
@@ -1,4 +1,4 @@
1From 92f588c68008176e7f6f1b3d534670bddedae783 Mon Sep 17 00:00:00 2001 1From a9173429ae256c4b4a3ab4d758a6adf42f8c4239 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] sync gcc stddef.h with musl 4Subject: [PATCH] sync gcc stddef.h with musl
@@ -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 9d67eac4947..6cb5edbedb4 100644 17index 66619fe43b1..3f843d6f365 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;
diff --git a/meta/recipes-devtools/gcc/gcc/0031-fix-segmentation-fault-in-precompiled-header-generat.patch b/meta/recipes-devtools/gcc/gcc/0031-fix-segmentation-fault-in-precompiled-header-generat.patch
index 0b93a055c2..70afa4f9e9 100644
--- a/meta/recipes-devtools/gcc/gcc/0031-fix-segmentation-fault-in-precompiled-header-generat.patch
+++ b/meta/recipes-devtools/gcc/gcc/0031-fix-segmentation-fault-in-precompiled-header-generat.patch
@@ -1,4 +1,4 @@
1From d3b25e66c7f9c86b5da0fd3e9e6236e0b59dc934 Mon Sep 17 00:00:00 2001 1From 3d59f763b824ac11f8360931092baf0bc1719562 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] fix segmentation fault in precompiled header generation 4Subject: [PATCH] fix segmentation fault in precompiled header generation
@@ -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 665297af776..0ac5d67ddf0 100644 22index 06bcc31c87e..24bed9a35fa 100644
23--- a/libcpp/lex.c 23--- a/libcpp/lex.c
24+++ b/libcpp/lex.c 24+++ b/libcpp/lex.c
25@@ -3311,11 +3311,27 @@ cpp_spell_token (cpp_reader *pfile, const cpp_token *token, 25@@ -3531,11 +3531,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)
diff --git a/meta/recipes-devtools/gcc/gcc/0032-Fix-for-testsuite-failure.patch b/meta/recipes-devtools/gcc/gcc/0032-Fix-for-testsuite-failure.patch
index 515c1d8186..0be03e652b 100644
--- a/meta/recipes-devtools/gcc/gcc/0032-Fix-for-testsuite-failure.patch
+++ b/meta/recipes-devtools/gcc/gcc/0032-Fix-for-testsuite-failure.patch
@@ -1,4 +1,4 @@
1From a3beed38a5eaa122c375451adafd78289512ac5f Mon Sep 17 00:00:00 2001 1From bb171ef618f8892bd56e57ae41ecb6e02caa8173 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] Fix for testsuite failure 4Subject: [PATCH] Fix for testsuite failure
diff --git a/meta/recipes-devtools/gcc/gcc/0033-Re-introduce-spe-commandline-options.patch b/meta/recipes-devtools/gcc/gcc/0033-Re-introduce-spe-commandline-options.patch
index 8a8eda89b1..129f555a48 100644
--- a/meta/recipes-devtools/gcc/gcc/0033-Re-introduce-spe-commandline-options.patch
+++ b/meta/recipes-devtools/gcc/gcc/0033-Re-introduce-spe-commandline-options.patch
@@ -1,4 +1,4 @@
1From c1675b1dbc8b662eadaaa8ebf5bbfc783b7ecc75 Mon Sep 17 00:00:00 2001 1From 0b900d6410b7c1938e86eceb87b032fd538566a9 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] Re-introduce spe commandline options 4Subject: [PATCH] Re-introduce spe commandline options
@@ -10,17 +10,18 @@ Upstream-Status: Inappropriate [SPE port is removed from rs600 port]
10 10
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12--- 12---
13 gcc/config/rs6000/rs6000.opt | 12 ++++++++++++ 13 gcc/config/rs6000/rs6000.opt | 13 +++++++++++++
14 1 file changed, 12 insertions(+) 14 1 file changed, 13 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 4e3792bcefa..edfa4f7de48 100644 17index 0dbdf753673..b273eb65c35 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@@ -344,6 +344,18 @@ mdebug= 20@@ -352,6 +352,19 @@ mdebug=
21 Target RejectNegative Joined 21 Target RejectNegative Joined
22 -mdebug= Enable debug output. 22 -mdebug= Enable debug output.
23 23
24+; PPC SPE ABI
24+mspe 25+mspe
25+Target Var(rs6000_spe) Save 26+Target Var(rs6000_spe) Save
26+Generate SPE SIMD instructions on E500. 27+Generate SPE SIMD instructions on E500.
diff --git a/meta/recipes-devtools/gcc/gcc/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/meta/recipes-devtools/gcc/gcc/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
index 7dd334494d..3f666dc7bd 100644
--- a/meta/recipes-devtools/gcc/gcc/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
+++ b/meta/recipes-devtools/gcc/gcc/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
@@ -1,4 +1,4 @@
1From 0c8d6cd3a5de6cdb832fdba4ec39d029432e76e6 Mon Sep 17 00:00:00 2001 1From ea9154338cb3acbd75945fddde4202e73c20dd1a 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] libgcc_s: Use alias for __cpu_indicator_init instead of 4Subject: [PATCH] libgcc_s: Use alias for __cpu_indicator_init instead of
@@ -39,10 +39,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
39 3 files changed, 6 insertions(+), 6 deletions(-) 39 3 files changed, 6 insertions(+), 6 deletions(-)
40 40
41diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c 41diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c
42index 47d52550e5e..9cb8cc7950e 100644 42index ac69eed4d32..ffaa44a16fc 100644
43--- a/gcc/config/i386/i386-expand.c 43--- a/gcc/config/i386/i386-expand.c
44+++ b/gcc/config/i386/i386-expand.c 44+++ b/gcc/config/i386/i386-expand.c
45@@ -10976,10 +10976,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, 45@@ -11038,10 +11038,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,11 +56,11 @@ index 47d52550e5e..9cb8cc7950e 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 83301a1445f..89fdc7eb587 100644 59index ef463848f9d..1a3de052c80 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@@ -516,7 +516,7 @@ __cpu_indicator_init (void) 62@@ -63,7 +63,7 @@ __cpu_indicator_init (void)
63 return 0; 63 __cpu_features2);
64 } 64 }
65 65
66-#if defined SHARED && defined USE_ELF_SYMVER 66-#if defined SHARED && defined USE_ELF_SYMVER
diff --git a/meta/recipes-devtools/gcc/gcc/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch b/meta/recipes-devtools/gcc/gcc/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch
index b746f17e4e..874cd7798d 100644
--- a/meta/recipes-devtools/gcc/gcc/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch
+++ b/meta/recipes-devtools/gcc/gcc/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch
@@ -1,4 +1,4 @@
1From febc910933faf6868805546e0df4a8452a82c225 Mon Sep 17 00:00:00 2001 1From 520411cf364ee4b0b5a8f0857498aaabd790afb3 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org> 2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Tue, 10 Mar 2020 08:26:53 -0700 3Date: Tue, 10 Mar 2020 08:26:53 -0700
4Subject: [PATCH] gentypes/genmodes: Do not use __LINE__ for maintaining 4Subject: [PATCH] gentypes/genmodes: Do not use __LINE__ for maintaining
@@ -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 981577481af..d5700fff401 100644 20index 5f50242e857..cbaca9b8cd0 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 981577481af..d5700fff401 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@@ -5187,7 +5187,7 @@ main (int argc, char **argv) 41@@ -5189,7 +5189,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 981577481af..d5700fff401 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 21e5f536976..a22f65a232f 100644 51index c268ebc4c6e..4361f3f1563 100644
52--- a/gcc/genmodes.c 52--- a/gcc/genmodes.c
53+++ b/gcc/genmodes.c 53+++ b/gcc/genmodes.c
54@@ -430,7 +430,7 @@ complete_all_modes (void) 54@@ -438,7 +438,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,7 +60,7 @@ index 21e5f536976..a22f65a232f 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@@ -489,7 +489,7 @@ make_complex_modes (enum mode_class cl, 63@@ -497,7 +497,7 @@ make_complex_modes (enum mode_class cl,
64 having as many components as necessary. ORDER is the sorting order 64 having as many components as necessary. ORDER is the sorting order
65 of the mode, with smaller numbers indicating a higher priority. */ 65 of the mode, with smaller numbers indicating a higher priority. */
66 #define VECTOR_MODES_WITH_PREFIX(PREFIX, C, W, ORDER) \ 66 #define VECTOR_MODES_WITH_PREFIX(PREFIX, C, W, ORDER) \
@@ -69,7 +69,7 @@ index 21e5f536976..a22f65a232f 100644
69 #define VECTOR_MODES(C, W) VECTOR_MODES_WITH_PREFIX (V, C, W, 0) 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@@ -541,7 +541,7 @@ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, 72@@ -549,7 +549,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 21e5f536976..a22f65a232f 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@@ -563,7 +563,7 @@ make_vector_bool_mode (const char *name, unsigned int count, 81@@ -571,7 +571,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 21e5f536976..a22f65a232f 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@@ -576,7 +576,7 @@ make_special_mode (enum mode_class cl, const char *name, 90@@ -584,7 +584,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 21e5f536976..a22f65a232f 100644
96 96
97 static void 97 static void
98 make_int_mode (const char *name, 98 make_int_mode (const char *name,
99@@ -589,16 +589,16 @@ make_int_mode (const char *name, 99@@ -611,16 +611,16 @@ make_opaque_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 21e5f536976..a22f65a232f 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@@ -619,7 +619,7 @@ make_fixed_point_mode (enum mode_class cl, 120@@ -641,7 +641,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 21e5f536976..a22f65a232f 100644
126 126
127 static void 127 static void
128 make_float_mode (const char *name, 128 make_float_mode (const char *name,
129@@ -636,7 +636,7 @@ make_float_mode (const char *name, 129@@ -658,7 +658,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 21e5f536976..a22f65a232f 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@@ -651,7 +651,7 @@ make_decimal_float_mode (const char *name, 138@@ -673,7 +673,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 21e5f536976..a22f65a232f 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@@ -672,7 +672,7 @@ reset_float_format (const char *name, const char *format, 147@@ -694,7 +694,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 21e5f536976..a22f65a232f 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@@ -701,7 +701,7 @@ make_int_n (const char *m, int bitsize, 156@@ -723,7 +723,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 21e5f536976..a22f65a232f 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@@ -728,7 +728,7 @@ make_partial_integer_mode (const char *base, const char *name, 165@@ -750,7 +750,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 21e5f536976..a22f65a232f 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@@ -771,7 +771,7 @@ make_vector_mode (enum mode_class bclass, 174@@ -793,7 +793,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) \
diff --git a/meta/recipes-devtools/gcc/gcc/0036-mingw32-Enable-operation_not_supported.patch b/meta/recipes-devtools/gcc/gcc/0036-mingw32-Enable-operation_not_supported.patch
index f2d6e30a07..3a7618c820 100644
--- a/meta/recipes-devtools/gcc/gcc/0036-mingw32-Enable-operation_not_supported.patch
+++ b/meta/recipes-devtools/gcc/gcc/0036-mingw32-Enable-operation_not_supported.patch
@@ -1,4 +1,4 @@
1From 6d9d080ce16de2fda138a8aac579e531bd64221d Mon Sep 17 00:00:00 2001 1From 96d895c8d5dc895d24fe37aa2b4f201a2566b4cc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 12 May 2020 10:39:09 -0700 3Date: Tue, 12 May 2020 10:39:09 -0700
4Subject: [PATCH] mingw32: Enable operation_not_supported 4Subject: [PATCH] mingw32: Enable operation_not_supported
@@ -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/libstdc++-v3/config/os/mingw32/error_constants.h b/libstdc++-v3/config/os/mingw32/error_constants.h 14diff --git a/libstdc++-v3/config/os/mingw32/error_constants.h b/libstdc++-v3/config/os/mingw32/error_constants.h
15index 2222c5227c4..35290eabfa7 100644 15index eca06a97014..933cfab49cf 100644
16--- a/libstdc++-v3/config/os/mingw32/error_constants.h 16--- a/libstdc++-v3/config/os/mingw32/error_constants.h
17+++ b/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 18@@ -107,7 +107,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
diff --git a/meta/recipes-devtools/gcc/gcc/0037-libatomic-Do-not-enforce-march-on-aarch64.patch b/meta/recipes-devtools/gcc/gcc/0037-libatomic-Do-not-enforce-march-on-aarch64.patch
index a55fbffb2c..4c9a79cb64 100644
--- a/meta/recipes-devtools/gcc/gcc/0037-libatomic-Do-not-enforce-march-on-aarch64.patch
+++ b/meta/recipes-devtools/gcc/gcc/0037-libatomic-Do-not-enforce-march-on-aarch64.patch
@@ -1,4 +1,4 @@
1From f572efe2cee2d580007beb4540925965365ceeb9 Mon Sep 17 00:00:00 2001 1From 36d4fdbc99e69f9d70a29e2bada40cc3c1534557 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 13 May 2020 15:10:38 -0700 3Date: Wed, 13 May 2020 15:10:38 -0700
4Subject: [PATCH] libatomic: Do not enforce march on aarch64 4Subject: [PATCH] libatomic: Do not enforce march on aarch64
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 2 files changed, 2 deletions(-) 17 2 files changed, 2 deletions(-)
18 18
19diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am 19diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am
20index 133fbbca77e..ac1ca645876 100644 20index 0f3cd6f7121..c8124c1d5aa 100644
21--- a/libatomic/Makefile.am 21--- a/libatomic/Makefile.am
22+++ b/libatomic/Makefile.am 22+++ b/libatomic/Makefile.am
23@@ -125,7 +125,6 @@ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix _$(s)_.lo,$(SIZEOBJS))) 23@@ -125,7 +125,6 @@ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix _$(s)_.lo,$(SIZEOBJS)))
@@ -29,10 +29,10 @@ index 133fbbca77e..ac1ca645876 100644
29 endif 29 endif
30 if ARCH_ARM_LINUX 30 if ARCH_ARM_LINUX
31diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in 31diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in
32index a51807e95c9..97df2d7ff03 100644 32index 0a51bd55f01..6d5b1581706 100644
33--- a/libatomic/Makefile.in 33--- a/libatomic/Makefile.in
34+++ b/libatomic/Makefile.in 34+++ b/libatomic/Makefile.in
35@@ -431,7 +431,6 @@ M_SRC = $(firstword $(filter %/$(M_FILE), $(all_c_files))) 35@@ -432,7 +432,6 @@ M_SRC = $(firstword $(filter %/$(M_FILE), $(all_c_files)))
36 libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix \ 36 libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix \
37 _$(s)_.lo,$(SIZEOBJS))) $(am__append_1) $(am__append_2) \ 37 _$(s)_.lo,$(SIZEOBJS))) $(am__append_1) $(am__append_2) \
38 $(am__append_3) $(am__append_4) 38 $(am__append_3) $(am__append_4)
diff --git a/meta/recipes-devtools/gcc/gcc/0038-libatomic-libgomp-libitc-Fix-bootstrap-PR70454.patch b/meta/recipes-devtools/gcc/gcc/0038-libatomic-libgomp-libitc-Fix-bootstrap-PR70454.patch
deleted file mode 100644
index 65c3e398fe..0000000000
--- a/meta/recipes-devtools/gcc/gcc/0038-libatomic-libgomp-libitc-Fix-bootstrap-PR70454.patch
+++ /dev/null
@@ -1,209 +0,0 @@
1From eb5a17c7b8ed676d83ce4dd0e9623e2ee0191f91 Mon Sep 17 00:00:00 2001
2From: Jakub Jelinek <jakub@redhat.com>
3Date: Fri, 15 Jan 2021 13:12:59 +0100
4Subject: [PATCH] libatomic, libgomp, libitc: Fix bootstrap [PR70454]
5
6The recent changes to error on mixing -march=i386 and -fcf-protection broke
7bootstrap. This patch changes lib{atomic,gomp,itm} configury, so that it
8only adds -march=i486 to flags if really needed (i.e. when 486 or later isn't
9on by default already). Similarly, it will not use ifuncs if -mcx16
10(or -march=i686 for 32-bit) is on by default.
11
122021-01-15 Jakub Jelinek <jakub@redhat.com>
13
14 PR target/70454
15libatomic/
16 * configure.tgt: For i?86 and x86_64 determine if -march=i486 needs to
17 be added through preprocessor check on
18 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4. Determine if try_ifunc is needed
19 based on preprocessor check on __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16
20 or __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8.
21libgomp/
22 * configure.tgt: For i?86 and x86_64 determine if -march=i486 needs to
23 be added through preprocessor check on
24 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4.
25libitm/
26 * configure.tgt: For i?86 and x86_64 determine if -march=i486 needs to
27 be added through preprocessor check on
28 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4.
29
30Upstream-Status: Backport [master post 10.x release]
31Signed-off-by: Khem Raj <raj.khem@gmail.com>
32---
33 libatomic/configure.tgt | 56 +++++++++++++++++++++++------------------
34 libgomp/configure.tgt | 35 +++++++++++---------------
35 libitm/configure.tgt | 37 +++++++++++++--------------
36 3 files changed, 64 insertions(+), 64 deletions(-)
37
38diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
39index 5dd0926d207..6ea082a29bc 100644
40--- a/libatomic/configure.tgt
41+++ b/libatomic/configure.tgt
42@@ -81,32 +81,40 @@ case "${target_cpu}" in
43 ARCH=sparc
44 ;;
45
46- i[3456]86)
47- case " ${CC} ${CFLAGS} " in
48- *" -m64 "*|*" -mx32 "*)
49- ;;
50- *)
51- if test -z "$with_arch"; then
52- XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
53- XCFLAGS="${XCFLAGS} -fomit-frame-pointer"
54- fi
55- esac
56- ARCH=x86
57- # ??? Detect when -march=i686 is already enabled.
58- try_ifunc=yes
59- ;;
60- x86_64)
61- case " ${CC} ${CFLAGS} " in
62- *" -m32 "*)
63+ i[3456]86 | x86_64)
64+ cat > conftestx.c <<EOF
65+#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
66+#error need -march=i486
67+#endif
68+EOF
69+ if ${CC} ${CFLAGS} -E conftestx.c > /dev/null 2>&1; then
70+ :
71+ else
72+ if test "${target_cpu}" = x86_64; then
73 XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
74- XCFLAGS="${XCFLAGS} -fomit-frame-pointer"
75- ;;
76- *)
77- ;;
78- esac
79+ else
80+ XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
81+ fi
82+ XCFLAGS="${XCFLAGS} -fomit-frame-pointer"
83+ fi
84+ cat > conftestx.c <<EOF
85+#ifdef __x86_64__
86+#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16
87+#error need -mcx16
88+#endif
89+#else
90+#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8
91+#error need -march=i686
92+#endif
93+#endif
94+EOF
95+ if ${CC} ${CFLAGS} -E conftestx.c > /dev/null 2>&1; then
96+ try_ifunc=no
97+ else
98+ try_ifunc=yes
99+ fi
100+ rm -f conftestx.c
101 ARCH=x86
102- # ??? Detect when -mcx16 is already enabled.
103- try_ifunc=yes
104 ;;
105
106 *) ARCH="${target_cpu}" ;;
107diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt
108index 4790a31e394..761ef2a7db2 100644
109--- a/libgomp/configure.tgt
110+++ b/libgomp/configure.tgt
111@@ -70,28 +70,23 @@ if test x$enable_linux_futex = xyes; then
112 ;;
113
114 # Note that bare i386 is not included here. We need cmpxchg.
115- i[456]86-*-linux*)
116+ i[456]86-*-linux* | x86_64-*-linux*)
117 config_path="linux/x86 linux posix"
118- case " ${CC} ${CFLAGS} " in
119- *" -m64 "*|*" -mx32 "*)
120- ;;
121- *)
122- if test -z "$with_arch"; then
123- XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
124- fi
125- esac
126- ;;
127-
128- # Similar jiggery-pokery for x86_64 multilibs, except here we
129- # can't rely on the --with-arch configure option, since that
130- # applies to the 64-bit side.
131- x86_64-*-linux*)
132- config_path="linux/x86 linux posix"
133- case " ${CC} ${CFLAGS} " in
134- *" -m32 "*)
135+ cat > conftestx.c <<EOF
136+#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
137+#error need -march=i486
138+#endif
139+EOF
140+ if ${CC} ${CFLAGS} -E conftestx.c > /dev/null 2>&1; then
141+ :
142+ else
143+ if test "${target_cpu}" = x86_64; then
144 XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
145- ;;
146- esac
147+ else
148+ XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
149+ fi
150+ fi
151+ rm -f conftestx.c
152 ;;
153
154 # Note that sparcv7 and sparcv8 is not included here. We need cas.
155diff --git a/libitm/configure.tgt b/libitm/configure.tgt
156index d1beb5c9ec8..608462e184e 100644
157--- a/libitm/configure.tgt
158+++ b/libitm/configure.tgt
159@@ -59,16 +59,23 @@ case "${target_cpu}" in
160
161 arm*) ARCH=arm ;;
162
163- i[3456]86)
164- case " ${CC} ${CFLAGS} " in
165- *" -m64 "*|*" -mx32 "*)
166- ;;
167- *)
168- if test -z "$with_arch"; then
169- XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
170- XCFLAGS="${XCFLAGS} -fomit-frame-pointer"
171- fi
172- esac
173+ i[3456]86 | x86_64)
174+ cat > conftestx.c <<EOF
175+#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
176+#error need -march=i486
177+#endif
178+EOF
179+ if ${CC} ${CFLAGS} -E conftestx.c > /dev/null 2>&1; then
180+ :
181+ else
182+ if test "${target_cpu}" = x86_64; then
183+ XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
184+ else
185+ XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
186+ fi
187+ XCFLAGS="${XCFLAGS} -fomit-frame-pointer"
188+ fi
189+ rm -f conftestx.c
190 XCFLAGS="${XCFLAGS} -mrtm"
191 ARCH=x86
192 ;;
193@@ -103,16 +110,6 @@ case "${target_cpu}" in
194 ARCH=sparc
195 ;;
196
197- x86_64)
198- case " ${CC} ${CFLAGS} " in
199- *" -m32 "*)
200- XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
201- XCFLAGS="${XCFLAGS} -fomit-frame-pointer"
202- ;;
203- esac
204- XCFLAGS="${XCFLAGS} -mrtm"
205- ARCH=x86
206- ;;
207 s390|s390x)
208 XCFLAGS="${XCFLAGS} -mzarch -mhtm"
209 ARCH=s390
diff --git a/meta/recipes-devtools/gcc/gcc_10.3.bb b/meta/recipes-devtools/gcc/gcc_11.1.bb
index 7d93590588..7d93590588 100644
--- a/meta/recipes-devtools/gcc/gcc_10.3.bb
+++ b/meta/recipes-devtools/gcc/gcc_11.1.bb
diff --git a/meta/recipes-devtools/gcc/libgcc-initial_10.3.bb b/meta/recipes-devtools/gcc/libgcc-initial_11.1.bb
index 0c698c26ec..0c698c26ec 100644
--- a/meta/recipes-devtools/gcc/libgcc-initial_10.3.bb
+++ b/meta/recipes-devtools/gcc/libgcc-initial_11.1.bb
diff --git a/meta/recipes-devtools/gcc/libgcc_10.3.bb b/meta/recipes-devtools/gcc/libgcc_11.1.bb
index ea210a1130..ea210a1130 100644
--- a/meta/recipes-devtools/gcc/libgcc_10.3.bb
+++ b/meta/recipes-devtools/gcc/libgcc_11.1.bb
diff --git a/meta/recipes-devtools/gcc/libgfortran_10.3.bb b/meta/recipes-devtools/gcc/libgfortran_11.1.bb
index 71dd8b4bdc..71dd8b4bdc 100644
--- a/meta/recipes-devtools/gcc/libgfortran_10.3.bb
+++ b/meta/recipes-devtools/gcc/libgfortran_11.1.bb
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-17 12:12:06 +0000