diff options
Diffstat (limited to 'meta')
41 files changed, 338 insertions, 423 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index e99fbe4aef..f0b952cfd5 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
@@ -189,7 +189,7 @@ RECIPE_MAINTAINER:pn-gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj <r | |||
189 | RECIPE_MAINTAINER:pn-gcc-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>" | 189 | RECIPE_MAINTAINER:pn-gcc-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>" |
190 | RECIPE_MAINTAINER:pn-gcc-runtime = "Khem Raj <raj.khem@gmail.com>" | 190 | RECIPE_MAINTAINER:pn-gcc-runtime = "Khem Raj <raj.khem@gmail.com>" |
191 | RECIPE_MAINTAINER:pn-gcc-sanitizers = "Khem Raj <raj.khem@gmail.com>" | 191 | RECIPE_MAINTAINER:pn-gcc-sanitizers = "Khem Raj <raj.khem@gmail.com>" |
192 | RECIPE_MAINTAINER:pn-gcc-source-12.2.0 = "Khem Raj <raj.khem@gmail.com>" | 192 | RECIPE_MAINTAINER:pn-gcc-source-13.1.0 = "Khem Raj <raj.khem@gmail.com>" |
193 | RECIPE_MAINTAINER:pn-gconf = "Ross Burton <ross.burton@arm.com>" | 193 | RECIPE_MAINTAINER:pn-gconf = "Ross Burton <ross.burton@arm.com>" |
194 | RECIPE_MAINTAINER:pn-gcr3 = "Markus Volk <f_l_k@t-online.de>" | 194 | RECIPE_MAINTAINER:pn-gcr3 = "Markus Volk <f_l_k@t-online.de>" |
195 | RECIPE_MAINTAINER:pn-gcr = "Alexander Kanavin <alex.kanavin@gmail.com>" | 195 | RECIPE_MAINTAINER:pn-gcr = "Alexander Kanavin <alex.kanavin@gmail.com>" |
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 853a20bfe2..52b050ec41 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc | |||
@@ -16,7 +16,7 @@ PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime" | |||
16 | # Default libc config | 16 | # Default libc config |
17 | PREFERRED_PROVIDER_virtual/gettext ??= "gettext" | 17 | PREFERRED_PROVIDER_virtual/gettext ??= "gettext" |
18 | 18 | ||
19 | GCCVERSION ?= "12.%" | 19 | GCCVERSION ?= "13.%" |
20 | SDKGCCVERSION ?= "${GCCVERSION}" | 20 | SDKGCCVERSION ?= "${GCCVERSION}" |
21 | BINUVERSION ?= "2.40%" | 21 | BINUVERSION ?= "2.40%" |
22 | GDBVERSION ?= "13.%" | 22 | GDBVERSION ?= "13.%" |
diff --git a/meta/recipes-devtools/gcc/gcc-12.2.inc b/meta/recipes-devtools/gcc/gcc-13.1.inc index 0dbbecad4a..d361b680f4 100644 --- a/meta/recipes-devtools/gcc/gcc-12.2.inc +++ b/meta/recipes-devtools/gcc/gcc-13.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 | ||
5 | PV = "12.2.0" | 5 | PV = "13.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 | ||
9 | BINV = "12.2.0" | 9 | BINV = "13.1.0" |
10 | 10 | ||
11 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:" | 11 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:" |
12 | 12 | ||
@@ -22,13 +22,15 @@ LIC_FILES_CHKSUM = "\ | |||
22 | file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ | 22 | file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ |
23 | file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 \ | 23 | file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 \ |
24 | " | 24 | " |
25 | # from git | 25 | # snapshot from git |
26 | #RELEASE ?= "7092b7aea122a91824d048aeb23834cf1d19b1a1" | 26 | #RELEASE ?= "9b6bf076c11cba0f9ccdace63e8b4044b1a858ea" |
27 | #BASEURI ?= "https://git.linaro.org/toolchain/gcc.git/snapshot/gcc-${RELEASE}.tar.gz" | ||
28 | #SOURCEDIR = "gcc-${RELEASE}" | ||
27 | #BASEURI ?= "https://repo.or.cz/official-gcc.git/snapshot/${RELEASE}.tar.gz;downloadfilename=gcc-${PV}-${RELEASE}.tar.gz" | 29 | #BASEURI ?= "https://repo.or.cz/official-gcc.git/snapshot/${RELEASE}.tar.gz;downloadfilename=gcc-${PV}-${RELEASE}.tar.gz" |
28 | #SOURCEDIR ?= "official-gcc-${@'${RELEASE}'[0:7]}" | 30 | #SOURCEDIR ?= "official-gcc-${@'${RELEASE}'[0:7]}" |
29 | 31 | ||
30 | # from snapshot | 32 | # from snapshot |
31 | #RELEASE ?= "12.1.0-RC-20220429" | 33 | #RELEASE ?= "13.1.0-RC-20230421" |
32 | #SOURCEDIR ?= "gcc-${RELEASE}" | 34 | #SOURCEDIR ?= "gcc-${RELEASE}" |
33 | #BASEURI ?= "https://gcc.gnu.org/pub/gcc/snapshots/${RELEASE}/gcc-${RELEASE}.tar.xz" | 35 | #BASEURI ?= "https://gcc.gnu.org/pub/gcc/snapshots/${RELEASE}/gcc-${RELEASE}.tar.xz" |
34 | 36 | ||
@@ -48,7 +50,8 @@ SRC_URI = "${BASEURI} \ | |||
48 | file://0008-libtool.patch \ | 50 | file://0008-libtool.patch \ |
49 | file://0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ | 51 | file://0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ |
50 | file://0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ | 52 | file://0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ |
51 | file://0011-Avoid-using-libdir-from-.la-which-usually-points-to-.patch \ | 53 | file://0011-aarch64-Fix-include-paths-when-S-B.patch \ |
54 | file://0012-Avoid-using-libdir-from-.la-which-usually-points-to-.patch \ | ||
52 | file://0013-Ensure-target-gcc-headers-can-be-included.patch \ | 55 | file://0013-Ensure-target-gcc-headers-can-be-included.patch \ |
53 | file://0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch \ | 56 | file://0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch \ |
54 | file://0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch \ | 57 | file://0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch \ |
@@ -58,13 +61,11 @@ SRC_URI = "${BASEURI} \ | |||
58 | file://0019-Re-introduce-spe-commandline-options.patch \ | 61 | file://0019-Re-introduce-spe-commandline-options.patch \ |
59 | file://0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \ | 62 | file://0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \ |
60 | file://0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \ | 63 | file://0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \ |
61 | file://0023-libatomic-Do-not-enforce-march-on-aarch64.patch \ | 64 | file://0022-libatomic-Do-not-enforce-march-on-aarch64.patch \ |
62 | file://0024-Fix-install-path-of-linux64.h.patch \ | 65 | file://0023-Fix-install-path-of-linux64.h.patch \ |
63 | file://0026-rust-recursion-limit.patch \ | 66 | file://0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch \ |
64 | file://prefix-map-realpath.patch \ | ||
65 | file://hardcoded-paths.patch \ | ||
66 | " | 67 | " |
67 | SRC_URI[sha256sum] = "e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff" | 68 | SRC_URI[sha256sum] = "61d684f0aa5e76ac6585ad8898a2427aade8979ed5e7f85492286c4dfc13ee86" |
68 | 69 | ||
69 | S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}" | 70 | S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}" |
70 | B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" | 71 | B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" |
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_12.2.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_13.1.bb index bf53c5cd78..bf53c5cd78 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian_12.2.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_13.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/gcc-cross_12.2.bb b/meta/recipes-devtools/gcc/gcc-cross_13.1.bb index b43cca0c52..b43cca0c52 100644 --- a/meta/recipes-devtools/gcc/gcc-cross_12.2.bb +++ b/meta/recipes-devtools/gcc/gcc-cross_13.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_12.2.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_13.1.bb index 40a6c4feff..40a6c4feff 100644 --- a/meta/recipes-devtools/gcc/gcc-crosssdk_12.2.bb +++ b/meta/recipes-devtools/gcc/gcc-crosssdk_13.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_12.2.bb b/meta/recipes-devtools/gcc/gcc-runtime_13.1.bb index dd430b57eb..dd430b57eb 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime_12.2.bb +++ b/meta/recipes-devtools/gcc/gcc-runtime_13.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers.inc b/meta/recipes-devtools/gcc/gcc-sanitizers.inc index 9881afa837..9016f7f937 100644 --- a/meta/recipes-devtools/gcc/gcc-sanitizers.inc +++ b/meta/recipes-devtools/gcc/gcc-sanitizers.inc | |||
@@ -86,6 +86,7 @@ COMPATIBLE_HOST:libc-musl = 'null' | |||
86 | FILES:libasan += "${libdir}/libasan.so.* ${libdir}/libhwasan.so.*" | 86 | FILES:libasan += "${libdir}/libasan.so.* ${libdir}/libhwasan.so.*" |
87 | FILES:libasan-dev += "\ | 87 | FILES:libasan-dev += "\ |
88 | ${libdir}/libasan_preinit.o \ | 88 | ${libdir}/libasan_preinit.o \ |
89 | ${libdir}/libhwasan_preinit.o \ | ||
89 | ${libdir}/libasan.so \ | 90 | ${libdir}/libasan.so \ |
90 | ${libdir}/libhwasan.so \ | 91 | ${libdir}/libhwasan.so \ |
91 | ${libdir}/libasan.la \ | 92 | ${libdir}/libasan.la \ |
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_12.2.bb b/meta/recipes-devtools/gcc/gcc-sanitizers_13.1.bb index 8bda2ccad6..8bda2ccad6 100644 --- a/meta/recipes-devtools/gcc/gcc-sanitizers_12.2.bb +++ b/meta/recipes-devtools/gcc/gcc-sanitizers_13.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/gcc-source_12.2.bb b/meta/recipes-devtools/gcc/gcc-source_13.1.bb index b890fa33ea..b890fa33ea 100644 --- a/meta/recipes-devtools/gcc/gcc-source_12.2.bb +++ b/meta/recipes-devtools/gcc/gcc-source_13.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 66e582ca98..0f1340491f 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 @@ | |||
1 | From 31f94ef5b43a984a98f0eebd2dcf1b53aa1d7bce Mon Sep 17 00:00:00 2001 | 1 | From 3875ab692a7d7ee796a6d5d2ece6daa3db81d5c4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 08:37:11 +0400 | 3 | Date: Fri, 29 Mar 2013 08:37:11 +0400 |
4 | Subject: [PATCH] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET | 4 | Subject: [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 | ||
14 | diff --git a/configure b/configure | 14 | diff --git a/configure b/configure |
15 | index 5dcaab14ae9..f76310a36bb 100755 | 15 | index 85883099410..044315af1da 100755 |
16 | --- a/configure | 16 | --- a/configure |
17 | +++ b/configure | 17 | +++ b/configure |
18 | @@ -10165,7 +10165,7 @@ fi | 18 | @@ -10183,7 +10183,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 5dcaab14ae9..f76310a36bb 100755 | |||
25 | *" newlib "*) | 25 | *" newlib "*) |
26 | case " $target_configargs " in | 26 | case " $target_configargs " in |
27 | diff --git a/configure.ac b/configure.ac | 27 | diff --git a/configure.ac b/configure.ac |
28 | index 85977482aee..8b9097c7a45 100644 | 28 | index 2b612dce6e9..f26fffd4f62 100644 |
29 | --- a/configure.ac | 29 | --- a/configure.ac |
30 | +++ b/configure.ac | 30 | +++ b/configure.ac |
31 | @@ -3346,7 +3346,7 @@ fi | 31 | @@ -3339,7 +3339,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 5aa635b3d4..6fa5494efc 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,4 +1,4 @@ | |||
1 | From 99f1e61b2957226254a116fde7fd73bf07034012 Mon Sep 17 00:00:00 2001 | 1 | From e09aa9c3565585390328dd514cc286c20b74e76a Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 8 Mar 2021 16:04:20 -0800 | 3 | Date: Mon, 8 Mar 2021 16:04:20 -0800 |
4 | Subject: [PATCH] gcc: poison-system-directories | 4 | Subject: [PATCH] gcc: poison-system-directories |
@@ -20,15 +20,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
20 | gcc/configure | 19 +++++++++++++++++++ | 20 | gcc/configure | 19 +++++++++++++++++++ |
21 | gcc/configure.ac | 16 ++++++++++++++++ | 21 | gcc/configure.ac | 16 ++++++++++++++++ |
22 | gcc/doc/invoke.texi | 9 +++++++++ | 22 | gcc/doc/invoke.texi | 9 +++++++++ |
23 | gcc/gcc.cc | 15 ++++++++++++--- | 23 | gcc/gcc.cc | 9 +++++++-- |
24 | gcc/incpath.cc | 21 +++++++++++++++++++++ | 24 | gcc/incpath.cc | 21 +++++++++++++++++++++ |
25 | 7 files changed, 91 insertions(+), 3 deletions(-) | 25 | 7 files changed, 86 insertions(+), 2 deletions(-) |
26 | 26 | ||
27 | diff --git a/gcc/common.opt b/gcc/common.opt | 27 | diff --git a/gcc/common.opt b/gcc/common.opt |
28 | index 8a0dafc52..0357868e2 100644 | 28 | index 862c474d3c8..64c4277c991 100644 |
29 | --- a/gcc/common.opt | 29 | --- a/gcc/common.opt |
30 | +++ b/gcc/common.opt | 30 | +++ b/gcc/common.opt |
31 | @@ -710,6 +710,10 @@ Wreturn-local-addr | 31 | @@ -711,6 +711,10 @@ Wreturn-local-addr |
32 | Common Var(warn_return_local_addr) Init(1) Warning | 32 | Common Var(warn_return_local_addr) Init(1) Warning |
33 | 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. |
34 | 34 | ||
@@ -40,10 +40,10 @@ index 8a0dafc52..0357868e2 100644 | |||
40 | Common Var(warn_shadow) Warning | 40 | Common Var(warn_shadow) Warning |
41 | Warn when one variable shadows another. Same as -Wshadow=global. | 41 | Warn when one variable shadows another. Same as -Wshadow=global. |
42 | diff --git a/gcc/config.in b/gcc/config.in | 42 | diff --git a/gcc/config.in b/gcc/config.in |
43 | index 64c27c9cf..a693cb8a8 100644 | 43 | index 4cad077bfbe..80e832fdb84 100644 |
44 | --- a/gcc/config.in | 44 | --- a/gcc/config.in |
45 | +++ b/gcc/config.in | 45 | +++ b/gcc/config.in |
46 | @@ -230,6 +230,16 @@ | 46 | @@ -236,6 +236,16 @@ |
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | 49 | ||
@@ -61,10 +61,10 @@ index 64c27c9cf..a693cb8a8 100644 | |||
61 | 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. |
62 | This is quite expensive. */ | 62 | This is quite expensive. */ |
63 | diff --git a/gcc/configure b/gcc/configure | 63 | diff --git a/gcc/configure b/gcc/configure |
64 | index 2b83acfb0..8bb97578c 100755 | 64 | index c7b26d1927d..3508be7b439 100755 |
65 | --- a/gcc/configure | 65 | --- a/gcc/configure |
66 | +++ b/gcc/configure | 66 | +++ b/gcc/configure |
67 | @@ -1023,6 +1023,7 @@ enable_maintainer_mode | 67 | @@ -1026,6 +1026,7 @@ enable_maintainer_mode |
68 | enable_link_mutex | 68 | enable_link_mutex |
69 | enable_link_serialization | 69 | enable_link_serialization |
70 | enable_version_specific_runtime_libs | 70 | enable_version_specific_runtime_libs |
@@ -72,7 +72,7 @@ index 2b83acfb0..8bb97578c 100755 | |||
72 | enable_plugin | 72 | enable_plugin |
73 | enable_host_shared | 73 | enable_host_shared |
74 | enable_libquadmath_support | 74 | enable_libquadmath_support |
75 | @@ -1785,6 +1786,8 @@ Optional Features: | 75 | @@ -1788,6 +1789,8 @@ Optional Features: |
76 | --enable-version-specific-runtime-libs | 76 | --enable-version-specific-runtime-libs |
77 | specify that runtime libraries should be installed | 77 | specify that runtime libraries should be installed |
78 | in a compiler-specific directory | 78 | in a compiler-specific directory |
@@ -81,7 +81,7 @@ index 2b83acfb0..8bb97578c 100755 | |||
81 | --enable-plugin enable plugin support | 81 | --enable-plugin enable plugin support |
82 | --enable-host-shared build host code as shared libraries | 82 | --enable-host-shared build host code as shared libraries |
83 | --disable-libquadmath-support | 83 | --disable-libquadmath-support |
84 | @@ -31996,6 +31999,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : | 84 | @@ -31753,6 +31756,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : |
85 | fi | 85 | fi |
86 | 86 | ||
87 | 87 | ||
@@ -105,10 +105,10 @@ index 2b83acfb0..8bb97578c 100755 | |||
105 | 105 | ||
106 | 106 | ||
107 | diff --git a/gcc/configure.ac b/gcc/configure.ac | 107 | diff --git a/gcc/configure.ac b/gcc/configure.ac |
108 | index daf2a708c..6155b83a7 100644 | 108 | index 09082e8ccae..6cd01a8966b 100644 |
109 | --- a/gcc/configure.ac | 109 | --- a/gcc/configure.ac |
110 | +++ b/gcc/configure.ac | 110 | +++ b/gcc/configure.ac |
111 | @@ -7435,6 +7435,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs, | 111 | @@ -7292,6 +7292,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs, |
112 | [specify that runtime libraries should be | 112 | [specify that runtime libraries should be |
113 | installed in a compiler-specific directory])]) | 113 | installed in a compiler-specific directory])]) |
114 | 114 | ||
@@ -132,37 +132,37 @@ index daf2a708c..6155b83a7 100644 | |||
132 | AC_SUBST(subdirs) | 132 | AC_SUBST(subdirs) |
133 | AC_SUBST(srcdir) | 133 | AC_SUBST(srcdir) |
134 | diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi | 134 | diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi |
135 | index ff6c338be..a8ebfa59a 100644 | 135 | index c9482886c5a..f302c637908 100644 |
136 | --- a/gcc/doc/invoke.texi | 136 | --- a/gcc/doc/invoke.texi |
137 | +++ b/gcc/doc/invoke.texi | 137 | +++ b/gcc/doc/invoke.texi |
138 | @@ -379,6 +379,7 @@ Objective-C and Objective-C++ Dialects}. | 138 | @@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}. |
139 | -Wpacked -Wno-packed-bitfield-compat -Wpacked-not-aligned -Wpadded @gol | 139 | -Wpacked -Wno-packed-bitfield-compat -Wpacked-not-aligned -Wpadded |
140 | -Wparentheses -Wno-pedantic-ms-format @gol | 140 | -Wparentheses -Wno-pedantic-ms-format |
141 | -Wpointer-arith -Wno-pointer-compare -Wno-pointer-to-int-cast @gol | 141 | -Wpointer-arith -Wno-pointer-compare -Wno-pointer-to-int-cast |
142 | +-Wno-poison-system-directories @gol | 142 | +-Wno-poison-system-directories |
143 | -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls @gol | 143 | -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls |
144 | -Wrestrict -Wno-return-local-addr -Wreturn-type @gol | 144 | -Wrestrict -Wno-return-local-addr -Wreturn-type |
145 | -Wno-scalar-storage-order -Wsequence-point @gol | 145 | -Wno-scalar-storage-order -Wsequence-point |
146 | @@ -8029,6 +8030,14 @@ made up of data only and thus requires no special treatment. But, for | 146 | @@ -8422,6 +8423,14 @@ made up of data only and thus requires no special treatment. But, for |
147 | 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 |
148 | made executable in order for the program to work properly. | 148 | made executable in order for the program to work properly. |
149 | 149 | ||
150 | +@item -Wno-poison-system-directories | ||
151 | +@opindex Wno-poison-system-directories | 150 | +@opindex Wno-poison-system-directories |
151 | +@item -Wno-poison-system-directories | ||
152 | +Do not warn for @option{-I} or @option{-L} options using system | 152 | +Do not warn for @option{-I} or @option{-L} options using system |
153 | +directories such as @file{/usr/include} when cross compiling. This | 153 | +directories such as @file{/usr/include} when cross compiling. This |
154 | +option is intended for use in chroot environments when such | 154 | +option is intended for use in chroot environments when such |
155 | +directories contain the correct headers and libraries for the target | 155 | +directories contain the correct headers and libraries for the target |
156 | +system rather than the host. | 156 | +system rather than the host. |
157 | + | 157 | + |
158 | @item -Wfloat-equal | ||
159 | @opindex Wfloat-equal | 158 | @opindex Wfloat-equal |
160 | @opindex Wno-float-equal | 159 | @opindex Wno-float-equal |
160 | @item -Wfloat-equal | ||
161 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc | 161 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc |
162 | index beefde7f6..4e6557b3c 100644 | 162 | index 16bb07f2cdc..5feae021545 100644 |
163 | --- a/gcc/gcc.cc | 163 | --- a/gcc/gcc.cc |
164 | +++ b/gcc/gcc.cc | 164 | +++ b/gcc/gcc.cc |
165 | @@ -1162,6 +1162,8 @@ proper position among the other output files. */ | 165 | @@ -1146,6 +1146,8 @@ proper position among the other output files. */ |
166 | "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \ | 166 | "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \ |
167 | "%X %{o*} %{e*} %{N} %{n} %{r}\ | 167 | "%X %{o*} %{e*} %{N} %{n} %{r}\ |
168 | %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \ | 168 | %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \ |
@@ -171,7 +171,7 @@ index beefde7f6..4e6557b3c 100644 | |||
171 | %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \ | 171 | %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \ |
172 | VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \ | 172 | VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \ |
173 | %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ | 173 | %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ |
174 | @@ -1257,8 +1259,11 @@ static const char *cpp_unique_options = | 174 | @@ -1241,8 +1243,11 @@ static const char *cpp_unique_options = |
175 | static const char *cpp_options = | 175 | static const char *cpp_options = |
176 | "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\ | 176 | "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\ |
177 | %{f*} %{g*:%{%:debug-level-gt(0):%{g*}\ | 177 | %{f*} %{g*:%{%:debug-level-gt(0):%{g*}\ |
@@ -179,27 +179,14 @@ index beefde7f6..4e6557b3c 100644 | |||
179 | - %{undef} %{save-temps*:-fpch-preprocess}"; | 179 | - %{undef} %{save-temps*:-fpch-preprocess}"; |
180 | + %{!fno-working-directory:-fworking-directory}}} %{O*}" | 180 | + %{!fno-working-directory:-fworking-directory}}} %{O*}" |
181 | +#ifdef POISON_BY_DEFAULT | 181 | +#ifdef POISON_BY_DEFAULT |
182 | + " %{!Wno-error=poison-system-directories:-Werror=poison-system-directories}" | 182 | + " -Werror=poison-system-directories" |
183 | +#endif | 183 | +#endif |
184 | + " %{undef} %{save-temps*:-fpch-preprocess}"; | 184 | + " %{undef} %{save-temps*:-fpch-preprocess}"; |
185 | 185 | ||
186 | /* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al. | 186 | /* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al. |
187 | 187 | ||
188 | @@ -1287,7 +1292,11 @@ static const char *cc1_options = | ||
189 | %{coverage:-fprofile-arcs -ftest-coverage}\ | ||
190 | %{fprofile-arcs|fprofile-generate*|coverage:\ | ||
191 | %{!fprofile-update=single:\ | ||
192 | - %{pthread:-fprofile-update=prefer-atomic}}}"; | ||
193 | + %{pthread:-fprofile-update=prefer-atomic}}}" | ||
194 | +#ifdef POISON_BY_DEFAULT | ||
195 | + " %{!Wno-error=poison-system-directories:-Werror=poison-system-directories}" | ||
196 | +#endif | ||
197 | + ; | ||
198 | |||
199 | static const char *asm_options = | ||
200 | "%{-target-help:%:print-asm-header()} " | ||
201 | diff --git a/gcc/incpath.cc b/gcc/incpath.cc | 188 | diff --git a/gcc/incpath.cc b/gcc/incpath.cc |
202 | index 622204a38..5ac03c086 100644 | 189 | index 4d44321183f..46c0d543205 100644 |
203 | --- a/gcc/incpath.cc | 190 | --- a/gcc/incpath.cc |
204 | +++ b/gcc/incpath.cc | 191 | +++ b/gcc/incpath.cc |
205 | @@ -26,6 +26,7 @@ | 192 | @@ -26,6 +26,7 @@ |
@@ -221,17 +208,17 @@ index 622204a38..5ac03c086 100644 | |||
221 | + struct cpp_dir *p; | 208 | + struct cpp_dir *p; |
222 | + | 209 | + |
223 | + for (p = heads[INC_QUOTE]; p; p = p->next) | 210 | + for (p = heads[INC_QUOTE]; p; p = p->next) |
224 | + { | 211 | + { |
225 | + if ((!strncmp (p->name, "/usr/include", 12)) | 212 | + if ((!strncmp (p->name, "/usr/include", 12)) |
226 | + || (!strncmp (p->name, "/usr/local/include", 18)) | 213 | + || (!strncmp (p->name, "/usr/local/include", 18)) |
227 | + || (!strncmp (p->name, "/usr/X11R6/include", 18)) | 214 | + || (!strncmp (p->name, "/usr/X11R6/include", 18)) |
228 | + || (!strncmp (p->name, "/sw/include", 11)) | 215 | + || (!strncmp (p->name, "/sw/include", 11)) |
229 | + || (!strncmp (p->name, "/opt/include", 12))) | 216 | + || (!strncmp (p->name, "/opt/include", 12))) |
230 | + warning (OPT_Wpoison_system_directories, | 217 | + warning (OPT_Wpoison_system_directories, |
231 | + "include location \"%s\" is unsafe for " | 218 | + "include location \"%s\" is unsafe for " |
232 | + "cross-compilation", | 219 | + "cross-compilation", |
233 | + p->name); | 220 | + p->name); |
234 | + } | 221 | + } |
235 | + } | 222 | + } |
236 | +#endif | 223 | +#endif |
237 | } | 224 | } |
diff --git a/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch index e83f05b8aa..d547d7e48a 100644 --- a/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch +++ b/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 34b861e7a4cfd7b1f0d2c0f8cf9bb0b0b81eb61a Mon Sep 17 00:00:00 2001 | 1 | From 86664e09670efa5a8662ef59590e01707f8e0cc3 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 09:10:06 +0400 | 3 | Date: Fri, 29 Mar 2013 09:10:06 +0400 |
4 | Subject: [PATCH] 64-bit multilib hack. | 4 | Subject: [PATCH] 64-bit multilib hack |
5 | 5 | ||
6 | GCC has internal multilib handling code but it assumes a very specific rigid directory | 6 | GCC has internal multilib handling code but it assumes a very specific rigid directory |
7 | layout. The build system implementation of multilib layout is very generic and allows | 7 | layout. The build system implementation of multilib layout is very generic and allows |
@@ -28,18 +28,17 @@ Upstream-Status: Inappropriate [OE-Specific] | |||
28 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 28 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
29 | Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com> | 29 | Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com> |
30 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 30 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
31 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
32 | --- | 31 | --- |
33 | gcc/config/aarch64/t-aarch64-linux | 8 ++++---- | 32 | gcc/config/aarch64/t-aarch64-linux | 8 ++++---- |
34 | gcc/config/arc/t-multilib-linux | 4 ++-- | 33 | gcc/config/arc/t-multilib-linux | 4 ++-- |
35 | gcc/config/i386/t-linux64 | 6 ++---- | 34 | gcc/config/i386/t-linux64 | 6 ++---- |
36 | gcc/config/mips/t-linux64 | 10 +++------- | 35 | gcc/config/mips/t-linux64 | 28 ++-------------------------- |
37 | gcc/config/riscv/t-linux | 6 ++++-- | 36 | gcc/config/riscv/t-linux | 4 ++-- |
38 | gcc/config/rs6000/t-linux64 | 5 ++--- | 37 | gcc/config/rs6000/t-linux64 | 5 ++--- |
39 | 6 files changed, 17 insertions(+), 22 deletions(-) | 38 | 6 files changed, 14 insertions(+), 41 deletions(-) |
40 | 39 | ||
41 | diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux | 40 | diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux |
42 | index d0cd546002a..f4056d68372 100644 | 41 | index 57bf4100fcd..aaef5da8059 100644 |
43 | --- a/gcc/config/aarch64/t-aarch64-linux | 42 | --- a/gcc/config/aarch64/t-aarch64-linux |
44 | +++ b/gcc/config/aarch64/t-aarch64-linux | 43 | +++ b/gcc/config/aarch64/t-aarch64-linux |
45 | @@ -21,8 +21,8 @@ | 44 | @@ -21,8 +21,8 @@ |
@@ -56,7 +55,7 @@ index d0cd546002a..f4056d68372 100644 | |||
56 | -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) |
57 | +#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) | 56 | +#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) |
58 | diff --git a/gcc/config/arc/t-multilib-linux b/gcc/config/arc/t-multilib-linux | 57 | diff --git a/gcc/config/arc/t-multilib-linux b/gcc/config/arc/t-multilib-linux |
59 | index ecb9ae6859f..12a164028d4 100644 | 58 | index a839e4ea67c..f92664573a9 100644 |
60 | --- a/gcc/config/arc/t-multilib-linux | 59 | --- a/gcc/config/arc/t-multilib-linux |
61 | +++ b/gcc/config/arc/t-multilib-linux | 60 | +++ b/gcc/config/arc/t-multilib-linux |
62 | @@ -16,9 +16,9 @@ | 61 | @@ -16,9 +16,9 @@ |
@@ -72,7 +71,7 @@ index ecb9ae6859f..12a164028d4 100644 | |||
72 | # Aliases: | 71 | # Aliases: |
73 | MULTILIB_MATCHES += mcpu?arc700=mA7 | 72 | MULTILIB_MATCHES += mcpu?arc700=mA7 |
74 | diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 | 73 | diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 |
75 | index 5526ad0e6cc..fa51c88912b 100644 | 74 | index 138956b0962..d6e0cdc4342 100644 |
76 | --- a/gcc/config/i386/t-linux64 | 75 | --- a/gcc/config/i386/t-linux64 |
77 | +++ b/gcc/config/i386/t-linux64 | 76 | +++ b/gcc/config/i386/t-linux64 |
78 | @@ -32,7 +32,5 @@ | 77 | @@ -32,7 +32,5 @@ |
@@ -86,37 +85,53 @@ index 5526ad0e6cc..fa51c88912b 100644 | |||
86 | +MULTILIB_DIRNAMES = . . | 85 | +MULTILIB_DIRNAMES = . . |
87 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | 86 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) |
88 | diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 | 87 | diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 |
89 | index 2fdd8e00407..04f2099250f 100644 | 88 | index 176091cabb6..8258ef40559 100644 |
90 | --- a/gcc/config/mips/t-linux64 | 89 | --- a/gcc/config/mips/t-linux64 |
91 | +++ b/gcc/config/mips/t-linux64 | 90 | +++ b/gcc/config/mips/t-linux64 |
92 | @@ -17,10 +17,6 @@ | 91 | @@ -17,29 +17,5 @@ |
93 | # <http://www.gnu.org/licenses/>. | 92 | # <http://www.gnu.org/licenses/>. |
94 | 93 | ||
95 | MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 | 94 | MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 |
96 | -MULTILIB_DIRNAMES = n32 32 64 | 95 | -MULTILIB_DIRNAMES = n32 32 64 |
97 | -MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) | 96 | -MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) |
98 | -MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) | 97 | -MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) |
99 | -MULTILIB_OSDIRNAMES = \ | 98 | -ifeq (yes,$(enable_multiarch)) |
99 | - ifneq (,$(findstring gnuabi64,$(target))) | ||
100 | - MULTILIB_OSDIRNAMES = \ | ||
101 | - ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ | ||
102 | - ../libo32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ | ||
103 | - ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) | ||
104 | - else ifneq (,$(findstring gnuabin32,$(target))) | ||
105 | - MULTILIB_OSDIRNAMES = \ | ||
106 | - ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ | ||
107 | - ../libo32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ | ||
108 | - ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) | ||
109 | - else | ||
110 | - MULTILIB_OSDIRNAMES = \ | ||
100 | - ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ | 111 | - ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ |
101 | - ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ | 112 | - ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ |
102 | - ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) | 113 | - ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) |
114 | - endif | ||
115 | -else | ||
116 | - MULTILIB_OSDIRNAMES = \ | ||
117 | - ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ | ||
118 | - ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ | ||
119 | - ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) | ||
120 | -endif | ||
103 | +MULTILIB_DIRNAMES = . . . | 121 | +MULTILIB_DIRNAMES = . . . |
104 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | 122 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) |
105 | + | ||
106 | diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux | 123 | diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux |
107 | index 216d2776a18..e4d817621fc 100644 | 124 | index 216d2776a18..e3c520f4bf6 100644 |
108 | --- a/gcc/config/riscv/t-linux | 125 | --- a/gcc/config/riscv/t-linux |
109 | +++ b/gcc/config/riscv/t-linux | 126 | +++ b/gcc/config/riscv/t-linux |
110 | @@ -1,3 +1,5 @@ | 127 | @@ -1,3 +1,3 @@ |
111 | # Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/ | 128 | # Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/ |
112 | -MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES))) | 129 | -MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES))) |
113 | -MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) | 130 | -MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) |
114 | +#MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES))) | 131 | +#MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES))) |
115 | +MULTILIB_DIRNAMES := . . | ||
116 | +#MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) | 132 | +#MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) |
117 | +MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | ||
118 | diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 | 133 | diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 |
119 | index 47e0efd5764..05f5a3f188e 100644 | 134 | index 01a94242308..1429eceaebf 100644 |
120 | --- a/gcc/config/rs6000/t-linux64 | 135 | --- a/gcc/config/rs6000/t-linux64 |
121 | +++ b/gcc/config/rs6000/t-linux64 | 136 | +++ b/gcc/config/rs6000/t-linux64 |
122 | @@ -26,10 +26,9 @@ | 137 | @@ -26,10 +26,9 @@ |
diff --git a/meta/recipes-devtools/gcc/gcc/0004-Pass-CXXFLAGS_FOR_BUILD-in-a-couple-of-places-to-avo.patch b/meta/recipes-devtools/gcc/gcc/0004-Pass-CXXFLAGS_FOR_BUILD-in-a-couple-of-places-to-avo.patch index e8f2163476..d749ff12d4 100644 --- a/meta/recipes-devtools/gcc/gcc/0004-Pass-CXXFLAGS_FOR_BUILD-in-a-couple-of-places-to-avo.patch +++ b/meta/recipes-devtools/gcc/gcc/0004-Pass-CXXFLAGS_FOR_BUILD-in-a-couple-of-places-to-avo.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7f40f8321fb999e9b34d948724517d3fb0d26820 Mon Sep 17 00:00:00 2001 | 1 | From 2a1336d2e2ba08747acd7368264fc5813a37b049 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Thu, 28 Oct 2021 11:33:40 +0100 | 3 | Date: Thu, 28 Oct 2021 11:33:40 +0100 |
4 | Subject: [PATCH] Pass CXXFLAGS_FOR_BUILD in a couple of places to avoid these | 4 | Subject: [PATCH] Pass CXXFLAGS_FOR_BUILD in a couple of places to avoid these |
@@ -23,10 +23,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
23 | 2 files changed, 4 insertions(+) | 23 | 2 files changed, 4 insertions(+) |
24 | 24 | ||
25 | diff --git a/Makefile.in b/Makefile.in | 25 | diff --git a/Makefile.in b/Makefile.in |
26 | index 593495e1650..1d9c83cc566 100644 | 26 | index 06a9398e172..4b0069b257c 100644 |
27 | --- a/Makefile.in | 27 | --- a/Makefile.in |
28 | +++ b/Makefile.in | 28 | +++ b/Makefile.in |
29 | @@ -176,6 +176,7 @@ BUILD_EXPORTS = \ | 29 | @@ -178,6 +178,7 @@ BUILD_EXPORTS = \ |
30 | # built for the build system to override those in BASE_FLAGS_TO_PASS. | 30 | # built for the build system to override those in BASE_FLAGS_TO_PASS. |
31 | EXTRA_BUILD_FLAGS = \ | 31 | EXTRA_BUILD_FLAGS = \ |
32 | CFLAGS="$(CFLAGS_FOR_BUILD)" \ | 32 | CFLAGS="$(CFLAGS_FOR_BUILD)" \ |
@@ -34,7 +34,7 @@ index 593495e1650..1d9c83cc566 100644 | |||
34 | LDFLAGS="$(LDFLAGS_FOR_BUILD)" | 34 | LDFLAGS="$(LDFLAGS_FOR_BUILD)" |
35 | 35 | ||
36 | # This is the list of directories to built for the host system. | 36 | # This is the list of directories to built for the host system. |
37 | @@ -207,6 +208,7 @@ HOST_EXPORTS = \ | 37 | @@ -210,6 +211,7 @@ HOST_EXPORTS = \ |
38 | CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ | 38 | CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ |
39 | CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ | 39 | CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ |
40 | CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ | 40 | CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ |
@@ -43,10 +43,10 @@ index 593495e1650..1d9c83cc566 100644 | |||
43 | DSYMUTIL="$(DSYMUTIL)"; export DSYMUTIL; \ | 43 | DSYMUTIL="$(DSYMUTIL)"; export DSYMUTIL; \ |
44 | LD="$(LD)"; export LD; \ | 44 | LD="$(LD)"; export LD; \ |
45 | diff --git a/Makefile.tpl b/Makefile.tpl | 45 | diff --git a/Makefile.tpl b/Makefile.tpl |
46 | index ef58fac2b9a..bab04f335c2 100644 | 46 | index dfbd74b68f8..419b332953b 100644 |
47 | --- a/Makefile.tpl | 47 | --- a/Makefile.tpl |
48 | +++ b/Makefile.tpl | 48 | +++ b/Makefile.tpl |
49 | @@ -179,6 +179,7 @@ BUILD_EXPORTS = \ | 49 | @@ -181,6 +181,7 @@ BUILD_EXPORTS = \ |
50 | # built for the build system to override those in BASE_FLAGS_TO_PASS. | 50 | # built for the build system to override those in BASE_FLAGS_TO_PASS. |
51 | EXTRA_BUILD_FLAGS = \ | 51 | EXTRA_BUILD_FLAGS = \ |
52 | CFLAGS="$(CFLAGS_FOR_BUILD)" \ | 52 | CFLAGS="$(CFLAGS_FOR_BUILD)" \ |
@@ -54,7 +54,7 @@ index ef58fac2b9a..bab04f335c2 100644 | |||
54 | LDFLAGS="$(LDFLAGS_FOR_BUILD)" | 54 | LDFLAGS="$(LDFLAGS_FOR_BUILD)" |
55 | 55 | ||
56 | # This is the list of directories to built for the host system. | 56 | # This is the list of directories to built for the host system. |
57 | @@ -210,6 +211,7 @@ HOST_EXPORTS = \ | 57 | @@ -213,6 +214,7 @@ HOST_EXPORTS = \ |
58 | CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ | 58 | CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ |
59 | CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ | 59 | CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ |
60 | CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ | 60 | CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ |
diff --git a/meta/recipes-devtools/gcc/gcc/0005-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/meta/recipes-devtools/gcc/gcc/0005-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch index e34eb2cf3f..2eba38e375 100644 --- a/meta/recipes-devtools/gcc/gcc/0005-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch +++ b/meta/recipes-devtools/gcc/gcc/0005-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5455fc1de74897a27c1199dc5611ec02243e24af Mon Sep 17 00:00:00 2001 | 1 | From 6cce395992a1b573e6795fdad2f9086db921e924 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 09:17:25 +0400 | 3 | Date: Fri, 29 Mar 2013 09:17:25 +0400 |
4 | Subject: [PATCH] Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B} | 4 | Subject: [PATCH] Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B} |
@@ -7,16 +7,16 @@ Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that | |||
7 | the source can be shared between gcc-cross-initial, | 7 | the source can be shared between gcc-cross-initial, |
8 | gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build. | 8 | gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build. |
9 | 9 | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | While compiling gcc-crosssdk-initial-x86_64 on some host, there is | 10 | While compiling gcc-crosssdk-initial-x86_64 on some host, there is |
15 | occasionally failure that test the existance of default.h doesn't | 11 | occasionally failure that test the existance of default.h doesn't |
16 | work, the reason is tm_include_list='** defaults.h' rather than | 12 | work, the reason is tm_include_list='** defaults.h' rather than |
17 | tm_include_list='** ./defaults.h' | 13 | tm_include_list='** ./defaults.h' |
18 | 14 | ||
19 | So we add the test condition for this situation. | 15 | So we add the test condition for this situation. |
16 | |||
17 | Upstream-Status: Inappropriate [embedded specific] | ||
18 | |||
19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
20 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 20 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
21 | --- | 21 | --- |
22 | gcc/Makefile.in | 2 +- | 22 | gcc/Makefile.in | 2 +- |
@@ -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 | ||
28 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in | 28 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in |
29 | index 31ff95500c9..a8277254696 100644 | 29 | index ad9a5d94cd0..fe636af3f63 100644 |
30 | --- a/gcc/Makefile.in | 30 | --- a/gcc/Makefile.in |
31 | +++ b/gcc/Makefile.in | 31 | +++ b/gcc/Makefile.in |
32 | @@ -553,7 +553,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ | 32 | @@ -561,7 +561,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 31ff95500c9..a8277254696 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@ |
41 | diff --git a/gcc/configure b/gcc/configure | 41 | diff --git a/gcc/configure b/gcc/configure |
42 | index dc2d59701ad..3fc0e2f5813 100755 | 42 | index 3508be7b439..cf773a8b854 100755 |
43 | --- a/gcc/configure | 43 | --- a/gcc/configure |
44 | +++ b/gcc/configure | 44 | +++ b/gcc/configure |
45 | @@ -13381,8 +13381,8 @@ for f in $tm_file; do | 45 | @@ -13507,8 +13507,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 dc2d59701ad..3fc0e2f5813 100755 | |||
54 | * ) | 54 | * ) |
55 | tm_file_list="${tm_file_list} \$(srcdir)/config/$f" | 55 | tm_file_list="${tm_file_list} \$(srcdir)/config/$f" |
56 | diff --git a/gcc/configure.ac b/gcc/configure.ac | 56 | diff --git a/gcc/configure.ac b/gcc/configure.ac |
57 | index 36ce78924de..46de496b256 100644 | 57 | index 6cd01a8966b..22591478b72 100644 |
58 | --- a/gcc/configure.ac | 58 | --- a/gcc/configure.ac |
59 | +++ b/gcc/configure.ac | 59 | +++ b/gcc/configure.ac |
60 | @@ -2332,8 +2332,8 @@ for f in $tm_file; do | 60 | @@ -2357,8 +2357,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 36ce78924de..46de496b256 100644 | |||
69 | * ) | 69 | * ) |
70 | tm_file_list="${tm_file_list} \$(srcdir)/config/$f" | 70 | tm_file_list="${tm_file_list} \$(srcdir)/config/$f" |
71 | diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh | 71 | diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh |
72 | index 91cc43f69ff..8de33713cd8 100644 | 72 | index 054ede89647..3b2c2b9df37 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/0006-cpp-honor-sysroot.patch b/meta/recipes-devtools/gcc/gcc/0006-cpp-honor-sysroot.patch index b08aecc736..3887aa3a05 100644 --- a/meta/recipes-devtools/gcc/gcc/0006-cpp-honor-sysroot.patch +++ b/meta/recipes-devtools/gcc/gcc/0006-cpp-honor-sysroot.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From abc3b82ab24169277f2090e9df1ceac3573142be Mon Sep 17 00:00:00 2001 | 1 | From 223ff12852a8c8974f6e542ee3a8b276639d2452 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 09:22:00 +0400 | 3 | Date: Fri, 29 Mar 2013 09:22:00 +0400 |
4 | Subject: [PATCH] cpp: honor sysroot. | 4 | Subject: [PATCH] cpp: honor sysroot. |
@@ -17,16 +17,16 @@ The fix below adds %I to the cpp-output spec macro so the default substitutions | |||
17 | 17 | ||
18 | RP 2012/04/13 | 18 | RP 2012/04/13 |
19 | 19 | ||
20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
21 | |||
22 | Upstream-Status: Pending | 20 | Upstream-Status: Pending |
21 | |||
22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
23 | --- | 23 | --- |
24 | gcc/cp/lang-specs.h | 2 +- | 24 | gcc/cp/lang-specs.h | 2 +- |
25 | gcc/gcc.cc | 2 +- | 25 | gcc/gcc.cc | 2 +- |
26 | 2 files changed, 2 insertions(+), 2 deletions(-) | 26 | 2 files changed, 2 insertions(+), 2 deletions(-) |
27 | 27 | ||
28 | diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h | 28 | diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h |
29 | index f35c9fab76b..19ddc98ce7f 100644 | 29 | index c591d155cc1..61927869fe1 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 | @@ -116,7 +116,7 @@ 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 |
@@ -39,11 +39,11 @@ index f35c9fab76b..19ddc98ce7f 100644 | |||
39 | " %{fmodule-only:%{!S:-o %g.s%V}}" | 39 | " %{fmodule-only:%{!S:-o %g.s%V}}" |
40 | " %{!fmodule-only:%{!fmodule-header*:%(invoke_as)}}}" | 40 | " %{!fmodule-only:%{!fmodule-header*:%(invoke_as)}}}" |
41 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc | 41 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc |
42 | index ce161d3c853..aa4cf92fb78 100644 | 42 | index 5feae021545..8af0c814c33 100644 |
43 | --- a/gcc/gcc.cc | 43 | --- a/gcc/gcc.cc |
44 | +++ b/gcc/gcc.cc | 44 | +++ b/gcc/gcc.cc |
45 | @@ -1476,7 +1476,7 @@ static const struct compiler default_compilers[] = | 45 | @@ -1468,7 +1468,7 @@ static const struct compiler default_compilers[] = |
46 | %W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0}, | 46 | %W{o*:--output-pch %*}}%V}}}}}}}", 0, 0, 0}, |
47 | {".i", "@cpp-output", 0, 0, 0}, | 47 | {".i", "@cpp-output", 0, 0, 0}, |
48 | {"@cpp-output", | 48 | {"@cpp-output", |
49 | - "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, | 49 | - "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, |
diff --git a/meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch index b59eed57e9..a42a044142 100644 --- a/meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch +++ b/meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4de00af67b57b5440bdf61ab364ad959ad0aeee7 Mon Sep 17 00:00:00 2001 | 1 | From ba2e308f7993099708ef3d8cbf2db5f134f08941 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 09:24:50 +0400 | 3 | Date: Fri, 29 Mar 2013 09:24:50 +0400 |
4 | Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER | 4 | Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER |
@@ -12,8 +12,6 @@ SH, sparc, alpha for possible future support (if any) | |||
12 | 12 | ||
13 | Removes the do_headerfix task in metadata | 13 | Removes the do_headerfix task in metadata |
14 | 14 | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | |||
17 | Upstream-Status: Inappropriate [OE configuration] | 15 | Upstream-Status: Inappropriate [OE configuration] |
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
19 | --- | 17 | --- |
@@ -38,7 +36,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
38 | 18 files changed, 53 insertions(+), 58 deletions(-) | 36 | 18 files changed, 53 insertions(+), 58 deletions(-) |
39 | 37 | ||
40 | diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h | 38 | diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h |
41 | index 5e4553d79f5..877e8841eb2 100644 | 39 | index 4277f03da2a..e4c92c03291 100644 |
42 | --- a/gcc/config/aarch64/aarch64-linux.h | 40 | --- a/gcc/config/aarch64/aarch64-linux.h |
43 | +++ b/gcc/config/aarch64/aarch64-linux.h | 41 | +++ b/gcc/config/aarch64/aarch64-linux.h |
44 | @@ -21,10 +21,10 @@ | 42 | @@ -21,10 +21,10 @@ |
@@ -55,7 +53,7 @@ index 5e4553d79f5..877e8841eb2 100644 | |||
55 | #undef ASAN_CC1_SPEC | 53 | #undef ASAN_CC1_SPEC |
56 | #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" | 54 | #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" |
57 | diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h | 55 | diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h |
58 | index 17f16a55910..0a7be38fa63 100644 | 56 | index 03f783f2ad1..4fa02668aa7 100644 |
59 | --- a/gcc/config/alpha/linux-elf.h | 57 | --- a/gcc/config/alpha/linux-elf.h |
60 | +++ b/gcc/config/alpha/linux-elf.h | 58 | +++ b/gcc/config/alpha/linux-elf.h |
61 | @@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see | 59 | @@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see |
@@ -70,10 +68,10 @@ index 17f16a55910..0a7be38fa63 100644 | |||
70 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" | 68 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" |
71 | #elif DEFAULT_LIBC == LIBC_GLIBC | 69 | #elif DEFAULT_LIBC == LIBC_GLIBC |
72 | diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h | 70 | diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h |
73 | index 50cc0bc6d08..17c18b27145 100644 | 71 | index a119875599d..dce7f59eeea 100644 |
74 | --- a/gcc/config/arm/linux-eabi.h | 72 | --- a/gcc/config/arm/linux-eabi.h |
75 | +++ b/gcc/config/arm/linux-eabi.h | 73 | +++ b/gcc/config/arm/linux-eabi.h |
76 | @@ -65,8 +65,8 @@ | 74 | @@ -62,8 +62,8 @@ |
77 | GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */ | 75 | GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */ |
78 | 76 | ||
79 | #undef GLIBC_DYNAMIC_LINKER | 77 | #undef GLIBC_DYNAMIC_LINKER |
@@ -84,7 +82,7 @@ index 50cc0bc6d08..17c18b27145 100644 | |||
84 | #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT | 82 | #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT |
85 | 83 | ||
86 | #define GLIBC_DYNAMIC_LINKER \ | 84 | #define GLIBC_DYNAMIC_LINKER \ |
87 | @@ -89,7 +89,7 @@ | 85 | @@ -86,7 +86,7 @@ |
88 | #define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}" | 86 | #define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}" |
89 | #endif | 87 | #endif |
90 | #define MUSL_DYNAMIC_LINKER \ | 88 | #define MUSL_DYNAMIC_LINKER \ |
@@ -94,7 +92,7 @@ index 50cc0bc6d08..17c18b27145 100644 | |||
94 | /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to | 92 | /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to |
95 | use the GNU/Linux version, not the generic BPABI version. */ | 93 | use the GNU/Linux version, not the generic BPABI version. */ |
96 | diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h | 94 | diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h |
97 | index df3da67c4f0..37456e9d5a4 100644 | 95 | index 7b7b7cbbe14..98ef2267117 100644 |
98 | --- a/gcc/config/arm/linux-elf.h | 96 | --- a/gcc/config/arm/linux-elf.h |
99 | +++ b/gcc/config/arm/linux-elf.h | 97 | +++ b/gcc/config/arm/linux-elf.h |
100 | @@ -60,7 +60,7 @@ | 98 | @@ -60,7 +60,7 @@ |
@@ -107,7 +105,7 @@ index df3da67c4f0..37456e9d5a4 100644 | |||
107 | #define LINUX_TARGET_LINK_SPEC "%{h*} \ | 105 | #define LINUX_TARGET_LINK_SPEC "%{h*} \ |
108 | %{static:-Bstatic} \ | 106 | %{static:-Bstatic} \ |
109 | diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h | 107 | diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h |
110 | index 5d99ee56d5b..a76022c9ccc 100644 | 108 | index bbb7cc7115e..7d9272040ee 100644 |
111 | --- a/gcc/config/i386/linux.h | 109 | --- a/gcc/config/i386/linux.h |
112 | +++ b/gcc/config/i386/linux.h | 110 | +++ b/gcc/config/i386/linux.h |
113 | @@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see | 111 | @@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see |
@@ -121,7 +119,7 @@ index 5d99ee56d5b..a76022c9ccc 100644 | |||
121 | -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" | 119 | -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" |
122 | +#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-i386.so.1" | 120 | +#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-i386.so.1" |
123 | diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h | 121 | diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h |
124 | index 8681e36f10d..ddce49b6b60 100644 | 122 | index 2bd9f48e271..dbbe7ca5440 100644 |
125 | --- a/gcc/config/i386/linux64.h | 123 | --- a/gcc/config/i386/linux64.h |
126 | +++ b/gcc/config/i386/linux64.h | 124 | +++ b/gcc/config/i386/linux64.h |
127 | @@ -27,13 +27,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | 125 | @@ -27,13 +27,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
@@ -145,10 +143,10 @@ index 8681e36f10d..ddce49b6b60 100644 | |||
145 | -#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" | 143 | -#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" |
146 | +#define MUSL_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-musl-x32.so.1" | 144 | +#define MUSL_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-musl-x32.so.1" |
147 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h | 145 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h |
148 | index 74f70793d90..4ce173384ef 100644 | 146 | index e3aca79cccc..6491c6b84f5 100644 |
149 | --- a/gcc/config/linux.h | 147 | --- a/gcc/config/linux.h |
150 | +++ b/gcc/config/linux.h | 148 | +++ b/gcc/config/linux.h |
151 | @@ -99,10 +99,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | 149 | @@ -86,10 +86,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
152 | GLIBC_DYNAMIC_LINKER must be defined for each target using them, or | 150 | GLIBC_DYNAMIC_LINKER must be defined for each target using them, or |
153 | GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets | 151 | GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets |
154 | supporting both 32-bit and 64-bit compilation. */ | 152 | supporting both 32-bit and 64-bit compilation. */ |
@@ -164,7 +162,7 @@ index 74f70793d90..4ce173384ef 100644 | |||
164 | #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" | 162 | #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" |
165 | #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" | 163 | #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" |
166 | diff --git a/gcc/config/loongarch/gnu-user.h b/gcc/config/loongarch/gnu-user.h | 164 | diff --git a/gcc/config/loongarch/gnu-user.h b/gcc/config/loongarch/gnu-user.h |
167 | index 664dc9206ad..082bd7cfc6f 100644 | 165 | index aecaa02a199..62f88f7f9a2 100644 |
168 | --- a/gcc/config/loongarch/gnu-user.h | 166 | --- a/gcc/config/loongarch/gnu-user.h |
169 | +++ b/gcc/config/loongarch/gnu-user.h | 167 | +++ b/gcc/config/loongarch/gnu-user.h |
170 | @@ -31,11 +31,11 @@ along with GCC; see the file COPYING3. If not see | 168 | @@ -31,11 +31,11 @@ along with GCC; see the file COPYING3. If not see |
@@ -182,7 +180,7 @@ index 664dc9206ad..082bd7cfc6f 100644 | |||
182 | #undef GNU_USER_TARGET_LINK_SPEC | 180 | #undef GNU_USER_TARGET_LINK_SPEC |
183 | #define GNU_USER_TARGET_LINK_SPEC \ | 181 | #define GNU_USER_TARGET_LINK_SPEC \ |
184 | diff --git a/gcc/config/microblaze/linux.h b/gcc/config/microblaze/linux.h | 182 | diff --git a/gcc/config/microblaze/linux.h b/gcc/config/microblaze/linux.h |
185 | index 5b1a365eda4..2e63df1ae9c 100644 | 183 | index e2e2c421c52..6f26480e3b5 100644 |
186 | --- a/gcc/config/microblaze/linux.h | 184 | --- a/gcc/config/microblaze/linux.h |
187 | +++ b/gcc/config/microblaze/linux.h | 185 | +++ b/gcc/config/microblaze/linux.h |
188 | @@ -28,7 +28,7 @@ | 186 | @@ -28,7 +28,7 @@ |
@@ -204,7 +202,7 @@ index 5b1a365eda4..2e63df1ae9c 100644 | |||
204 | #undef SUBTARGET_EXTRA_SPECS | 202 | #undef SUBTARGET_EXTRA_SPECS |
205 | #define SUBTARGET_EXTRA_SPECS \ | 203 | #define SUBTARGET_EXTRA_SPECS \ |
206 | diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h | 204 | diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h |
207 | index 230b7789bb8..d96d134bfcf 100644 | 205 | index 5add34ea134..34692b433b8 100644 |
208 | --- a/gcc/config/mips/linux.h | 206 | --- a/gcc/config/mips/linux.h |
209 | +++ b/gcc/config/mips/linux.h | 207 | +++ b/gcc/config/mips/linux.h |
210 | @@ -22,29 +22,29 @@ along with GCC; see the file COPYING3. If not see | 208 | @@ -22,29 +22,29 @@ along with GCC; see the file COPYING3. If not see |
@@ -247,22 +245,24 @@ index 230b7789bb8..d96d134bfcf 100644 | |||
247 | #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" | 245 | #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" |
248 | #define GNU_USER_DYNAMIC_LINKERN32 \ | 246 | #define GNU_USER_DYNAMIC_LINKERN32 \ |
249 | diff --git a/gcc/config/nios2/linux.h b/gcc/config/nios2/linux.h | 247 | diff --git a/gcc/config/nios2/linux.h b/gcc/config/nios2/linux.h |
250 | index f5dd813acad..7a13e1c9799 100644 | 248 | index 2ce097ebbce..1d45d7b4962 100644 |
251 | --- a/gcc/config/nios2/linux.h | 249 | --- a/gcc/config/nios2/linux.h |
252 | +++ b/gcc/config/nios2/linux.h | 250 | +++ b/gcc/config/nios2/linux.h |
253 | @@ -29,8 +29,8 @@ | 251 | @@ -29,10 +29,10 @@ |
254 | #undef CPP_SPEC | 252 | #undef CPP_SPEC |
255 | #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" | 253 | #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" |
256 | 254 | ||
257 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-nios2.so.1" | 255 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-nios2.so.1" |
258 | -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-nios2.so.1" | ||
259 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-nios2.so.1" | 256 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-nios2.so.1" |
257 | |||
258 | #undef MUSL_DYNAMIC_LINKER | ||
259 | -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-nios2.so.1" | ||
260 | +#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-nios2.so.1" | 260 | +#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-nios2.so.1" |
261 | 261 | ||
262 | #undef LINK_SPEC | 262 | #undef LINK_SPEC |
263 | #define LINK_SPEC LINK_SPEC_ENDIAN \ | 263 | #define LINK_SPEC LINK_SPEC_ENDIAN \ |
264 | diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h | 264 | diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h |
265 | index 38803723ba9..d5ef8a96a19 100644 | 265 | index b9557a75dc7..e10ca1f97e7 100644 |
266 | --- a/gcc/config/riscv/linux.h | 266 | --- a/gcc/config/riscv/linux.h |
267 | +++ b/gcc/config/riscv/linux.h | 267 | +++ b/gcc/config/riscv/linux.h |
268 | @@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see | 268 | @@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see |
@@ -284,7 +284,7 @@ index 38803723ba9..d5ef8a96a19 100644 | |||
284 | /* Because RISC-V only has word-sized atomics, it requries libatomic where | 284 | /* Because RISC-V only has word-sized atomics, it requries libatomic where |
285 | others do not. So link libatomic by default, as needed. */ | 285 | others do not. So link libatomic by default, as needed. */ |
286 | diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h | 286 | diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h |
287 | index b2a7afabc73..364c1a5b155 100644 | 287 | index 9e457033d11..2ddab7c99c1 100644 |
288 | --- a/gcc/config/rs6000/linux64.h | 288 | --- a/gcc/config/rs6000/linux64.h |
289 | +++ b/gcc/config/rs6000/linux64.h | 289 | +++ b/gcc/config/rs6000/linux64.h |
290 | @@ -339,24 +339,19 @@ extern int dot_symbols; | 290 | @@ -339,24 +339,19 @@ extern int dot_symbols; |
@@ -318,10 +318,10 @@ index b2a7afabc73..364c1a5b155 100644 | |||
318 | #undef DEFAULT_ASM_ENDIAN | 318 | #undef DEFAULT_ASM_ENDIAN |
319 | #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) | 319 | #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) |
320 | diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h | 320 | diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h |
321 | index 7e2519de5d4..a73954d9de5 100644 | 321 | index ae932fc22f0..26db003cb3a 100644 |
322 | --- a/gcc/config/rs6000/sysv4.h | 322 | --- a/gcc/config/rs6000/sysv4.h |
323 | +++ b/gcc/config/rs6000/sysv4.h | 323 | +++ b/gcc/config/rs6000/sysv4.h |
324 | @@ -779,10 +779,10 @@ GNU_USER_TARGET_CC1_SPEC | 324 | @@ -771,10 +771,10 @@ GNU_USER_TARGET_CC1_SPEC |
325 | 325 | ||
326 | #define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","") | 326 | #define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","") |
327 | 327 | ||
@@ -335,7 +335,7 @@ index 7e2519de5d4..a73954d9de5 100644 | |||
335 | #ifndef GNU_USER_DYNAMIC_LINKER | 335 | #ifndef GNU_USER_DYNAMIC_LINKER |
336 | #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER | 336 | #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER |
337 | diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h | 337 | diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h |
338 | index d7b7e7a7b02..0139b4d06ca 100644 | 338 | index 02aa1edaff8..fab268d61f4 100644 |
339 | --- a/gcc/config/s390/linux.h | 339 | --- a/gcc/config/s390/linux.h |
340 | +++ b/gcc/config/s390/linux.h | 340 | +++ b/gcc/config/s390/linux.h |
341 | @@ -72,13 +72,13 @@ along with GCC; see the file COPYING3. If not see | 341 | @@ -72,13 +72,13 @@ along with GCC; see the file COPYING3. If not see |
@@ -357,7 +357,7 @@ index d7b7e7a7b02..0139b4d06ca 100644 | |||
357 | #undef LINK_SPEC | 357 | #undef LINK_SPEC |
358 | #define LINK_SPEC \ | 358 | #define LINK_SPEC \ |
359 | diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h | 359 | diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h |
360 | index d96d077c99e..7d27f9893ee 100644 | 360 | index 29f5902b98b..83d1e53e6e2 100644 |
361 | --- a/gcc/config/sh/linux.h | 361 | --- a/gcc/config/sh/linux.h |
362 | +++ b/gcc/config/sh/linux.h | 362 | +++ b/gcc/config/sh/linux.h |
363 | @@ -61,10 +61,10 @@ along with GCC; see the file COPYING3. If not see | 363 | @@ -61,10 +61,10 @@ along with GCC; see the file COPYING3. If not see |
@@ -374,7 +374,7 @@ index d96d077c99e..7d27f9893ee 100644 | |||
374 | #undef SUBTARGET_LINK_EMUL_SUFFIX | 374 | #undef SUBTARGET_LINK_EMUL_SUFFIX |
375 | #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}" | 375 | #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}" |
376 | diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h | 376 | diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h |
377 | index 6a809e9092d..60603765ad6 100644 | 377 | index 0e33b3cac2c..84f29adbb35 100644 |
378 | --- a/gcc/config/sparc/linux.h | 378 | --- a/gcc/config/sparc/linux.h |
379 | +++ b/gcc/config/sparc/linux.h | 379 | +++ b/gcc/config/sparc/linux.h |
380 | @@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); | 380 | @@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); |
@@ -387,7 +387,7 @@ index 6a809e9092d..60603765ad6 100644 | |||
387 | #undef LINK_SPEC | 387 | #undef LINK_SPEC |
388 | #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ | 388 | #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ |
389 | diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h | 389 | diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h |
390 | index d08a2ef96fe..e6955da0a5b 100644 | 390 | index f1cc0a19e49..94bc2032803 100644 |
391 | --- a/gcc/config/sparc/linux64.h | 391 | --- a/gcc/config/sparc/linux64.h |
392 | +++ b/gcc/config/sparc/linux64.h | 392 | +++ b/gcc/config/sparc/linux64.h |
393 | @@ -78,8 +78,8 @@ along with GCC; see the file COPYING3. If not see | 393 | @@ -78,8 +78,8 @@ along with GCC; see the file COPYING3. If not see |
diff --git a/meta/recipes-devtools/gcc/gcc/0008-libtool.patch b/meta/recipes-devtools/gcc/gcc/0008-libtool.patch index c9bc38ccf0..72248e64b1 100644 --- a/meta/recipes-devtools/gcc/gcc/0008-libtool.patch +++ b/meta/recipes-devtools/gcc/gcc/0008-libtool.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5117519c1897a49b09fe7fff213b9c2ea15d37f5 Mon Sep 17 00:00:00 2001 | 1 | From 5ce9e36a87974ce5c1c1adb6e4390350233d8770 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 09:29:11 +0400 | 3 | Date: Fri, 29 Mar 2013 09:29:11 +0400 |
4 | Subject: [PATCH] libtool | 4 | Subject: [PATCH] libtool |
@@ -15,9 +15,8 @@ to filter the zero case. | |||
15 | 15 | ||
16 | RP 2012/8/24 | 16 | RP 2012/8/24 |
17 | 17 | ||
18 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2023-04/msg00000.html] | ||
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
19 | |||
20 | Upstream-Status: Pending | ||
21 | --- | 20 | --- |
22 | ltmain.sh | 4 ++++ | 21 | ltmain.sh | 4 ++++ |
23 | 1 file changed, 4 insertions(+) | 22 | 1 file changed, 4 insertions(+) |
diff --git a/meta/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/meta/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch index dd67b115f0..871a634d14 100644 --- a/meta/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch +++ b/meta/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 32129f9682d0d27fc67af10f077ad2768935cbe6 Mon Sep 17 00:00:00 2001 | 1 | From 37c7471aa476dfc591a7123e39e38ef8b049f5c0 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 09:30:32 +0400 | 3 | Date: Fri, 29 Mar 2013 09:30:32 +0400 |
4 | Subject: [PATCH] gcc: armv4: pass fix-v4bx to linker to support EABI. | 4 | Subject: [PATCH] gcc: armv4: pass fix-v4bx to linker to support EABI. |
@@ -11,18 +11,17 @@ for eabi defaulting toolchains. | |||
11 | 11 | ||
12 | We might want to send it upstream. | 12 | We might want to send it upstream. |
13 | 13 | ||
14 | Upstream-Status: Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2023-April/615319.html] | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
15 | |||
16 | Upstream-Status: Pending | ||
17 | --- | 16 | --- |
18 | gcc/config/arm/linux-eabi.h | 6 +++++- | 17 | gcc/config/arm/linux-eabi.h | 6 +++++- |
19 | 1 file changed, 5 insertions(+), 1 deletion(-) | 18 | 1 file changed, 5 insertions(+), 1 deletion(-) |
20 | 19 | ||
21 | diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h | 20 | diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h |
22 | index 17c18b27145..8eacb099317 100644 | 21 | index dce7f59eeea..27402c629c6 100644 |
23 | --- a/gcc/config/arm/linux-eabi.h | 22 | --- a/gcc/config/arm/linux-eabi.h |
24 | +++ b/gcc/config/arm/linux-eabi.h | 23 | +++ b/gcc/config/arm/linux-eabi.h |
25 | @@ -91,10 +91,14 @@ | 24 | @@ -88,10 +88,14 @@ |
26 | #define MUSL_DYNAMIC_LINKER \ | 25 | #define MUSL_DYNAMIC_LINKER \ |
27 | SYSTEMLIBS_DIR "ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}%{mfdpic:-fdpic}.so.1" | 26 | SYSTEMLIBS_DIR "ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}%{mfdpic:-fdpic}.so.1" |
28 | 27 | ||
diff --git a/meta/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/meta/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch index 45edc62eb5..a88abc2fad 100644 --- a/meta/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch +++ b/meta/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bf85b8bbcb4b77725d4c22c1bb25a29f6ff21038 Mon Sep 17 00:00:00 2001 | 1 | From 2be15956b4051680aa8da9df97ef032ac8616fb1 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 09:33:04 +0400 | 3 | Date: Fri, 29 Mar 2013 09:33:04 +0400 |
4 | Subject: [PATCH] Use the multilib config files from ${B} instead of using the | 4 | Subject: [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 | ||
20 | diff --git a/gcc/configure b/gcc/configure | 20 | diff --git a/gcc/configure b/gcc/configure |
21 | index 3fc0e2f5813..2f0f0e057a9 100755 | 21 | index cf773a8b854..448a1ec093e 100755 |
22 | --- a/gcc/configure | 22 | --- a/gcc/configure |
23 | +++ b/gcc/configure | 23 | +++ b/gcc/configure |
24 | @@ -13361,10 +13361,20 @@ done | 24 | @@ -13487,10 +13487,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 3fc0e2f5813..2f0f0e057a9 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 | @@ -13375,6 +13385,10 @@ tm_file_list="options.h" | 49 | @@ -13501,6 +13511,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 3fc0e2f5813..2f0f0e057a9 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" |
60 | diff --git a/gcc/configure.ac b/gcc/configure.ac | 60 | diff --git a/gcc/configure.ac b/gcc/configure.ac |
61 | index 46de496b256..6155b83a732 100644 | 61 | index 22591478b72..b6e7f5149a7 100644 |
62 | --- a/gcc/configure.ac | 62 | --- a/gcc/configure.ac |
63 | +++ b/gcc/configure.ac | 63 | +++ b/gcc/configure.ac |
64 | @@ -2312,10 +2312,20 @@ done | 64 | @@ -2337,10 +2337,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 46de496b256..6155b83a732 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 | @@ -2326,6 +2336,10 @@ tm_file_list="options.h" | 89 | @@ -2351,6 +2361,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/0011-aarch64-Fix-include-paths-when-S-B.patch b/meta/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch new file mode 100644 index 0000000000..f52e21edc2 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | From 710d1325474e708e6b34eebe09f3f130420af293 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 31 Jan 2023 22:03:38 -0800 | ||
4 | Subject: [PATCH] aarch64: Fix include paths when S != B | ||
5 | |||
6 | aarch64.h gets copied into build directory when built out of tree, in | ||
7 | this case build uses this file but does not find the includes inside it | ||
8 | since they are not found in any of include paths specified in compiler | ||
9 | cmdline. | ||
10 | |||
11 | Fixes build errors like | ||
12 | |||
13 | % g++ -c -isystem/mnt/b/yoe/master/build/tmp/work/x86_64-linux/gcc-cross-aarch64/13.0.1-r0/recipe-sysroot-native/usr/include -O2 -pipe -DIN_GCC -DCROSS_DIRECTORY_STRUCTURE -fno-exceptions -fno-rtti -fasynchronous-unwind-tables -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wmissing-format-attribute -Wconditionally-supported -Woverloaded-virtual -pedantic -Wno-long-long -Wno-variadic-macros -Wno-overlength-strings -DHAVE_CONFIG_H -DGENERATOR_FILE -I. -Ibuild -I../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc -I../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc/build -I../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc/../include -I../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc/../libcpp/include -o build/gencheck.o ../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc/gencheck.cc | ||
14 | In file included from ./tm.h:34, | ||
15 | from ../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc/gencheck.cc:23: | ||
16 | ./config/aarch64/aarch64.h:164:10: fatal error: aarch64-option-extensions.def: No such file or directory | ||
17 | 164 | #include "aarch64-option-extensions.def" | ||
18 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
19 | compilation terminated. | ||
20 | |||
21 | See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105144 | ||
22 | |||
23 | Upstream-Status: Pending | ||
24 | |||
25 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
26 | --- | ||
27 | gcc/config/aarch64/aarch64.h | 8 ++++---- | ||
28 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
29 | |||
30 | diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h | ||
31 | index 155cace6afe..07d68958908 100644 | ||
32 | --- a/gcc/config/aarch64/aarch64.h | ||
33 | +++ b/gcc/config/aarch64/aarch64.h | ||
34 | @@ -161,8 +161,8 @@ | ||
35 | enum class aarch64_feature : unsigned char { | ||
36 | #define AARCH64_OPT_EXTENSION(A, IDENT, C, D, E, F) IDENT, | ||
37 | #define AARCH64_ARCH(A, B, IDENT, D, E) IDENT, | ||
38 | -#include "aarch64-option-extensions.def" | ||
39 | -#include "aarch64-arches.def" | ||
40 | +#include "config/aarch64/aarch64-option-extensions.def" | ||
41 | +#include "config/aarch64/aarch64-arches.def" | ||
42 | }; | ||
43 | |||
44 | /* Define unique flags for each of the above. */ | ||
45 | @@ -171,8 +171,8 @@ enum class aarch64_feature : unsigned char { | ||
46 | = aarch64_feature_flags (1) << int (aarch64_feature::IDENT); | ||
47 | #define AARCH64_OPT_EXTENSION(A, IDENT, C, D, E, F) HANDLE (IDENT) | ||
48 | #define AARCH64_ARCH(A, B, IDENT, D, E) HANDLE (IDENT) | ||
49 | -#include "aarch64-option-extensions.def" | ||
50 | -#include "aarch64-arches.def" | ||
51 | +#include "config/aarch64/aarch64-option-extensions.def" | ||
52 | +#include "config/aarch64/aarch64-arches.def" | ||
53 | #undef HANDLE | ||
54 | |||
55 | #endif | ||
diff --git a/meta/recipes-devtools/gcc/gcc/0011-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/meta/recipes-devtools/gcc/gcc/0012-Avoid-using-libdir-from-.la-which-usually-points-to-.patch index 352c6eec29..b05be59c72 100644 --- a/meta/recipes-devtools/gcc/gcc/0011-Avoid-using-libdir-from-.la-which-usually-points-to-.patch +++ b/meta/recipes-devtools/gcc/gcc/0012-Avoid-using-libdir-from-.la-which-usually-points-to-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e5463727ff028cee5e452da38f5b4c44d52e412e Mon Sep 17 00:00:00 2001 | 1 | From e8e8a0ab572cfceb9758f99599c0db4c962e49c0 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 20 Feb 2015 09:39:38 +0000 | 3 | Date: Fri, 20 Feb 2015 09:39:38 +0000 |
4 | Subject: [PATCH] Avoid using libdir from .la which usually points to a host | 4 | Subject: [PATCH] Avoid using libdir from .la which usually points to a host |
diff --git a/meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch index 61e61ecc6e..b9a3f05df8 100644 --- a/meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch +++ b/meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 612801d426e75ff997cfabda380dbe52c2cbc532 Mon Sep 17 00:00:00 2001 | 1 | From 93ad7cf3ff92771451c2994cab45e34a0c8574a0 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 20 Feb 2015 10:25:11 +0000 | 3 | Date: Fri, 20 Feb 2015 10:25:11 +0000 |
4 | Subject: [PATCH] Ensure target gcc headers can be included | 4 | Subject: [PATCH] Ensure target gcc headers can be included |
@@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
25 | 4 files changed, 22 insertions(+) | 25 | 4 files changed, 22 insertions(+) |
26 | 26 | ||
27 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in | 27 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in |
28 | index a8277254696..07fa63b6640 100644 | 28 | index fe636af3f63..065ce7e9a5b 100644 |
29 | --- a/gcc/Makefile.in | 29 | --- a/gcc/Makefile.in |
30 | +++ b/gcc/Makefile.in | 30 | +++ b/gcc/Makefile.in |
31 | @@ -632,6 +632,7 @@ libexecdir = @libexecdir@ | 31 | @@ -640,6 +640,7 @@ libexecdir = @libexecdir@ |
32 | 32 | ||
33 | # Directory in which the compiler finds libraries etc. | 33 | # Directory in which the compiler finds libraries etc. |
34 | libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) | 34 | libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) |
@@ -36,7 +36,7 @@ index a8277254696..07fa63b6640 100644 | |||
36 | # Directory in which the compiler finds executables | 36 | # Directory in which the compiler finds executables |
37 | libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) | 37 | libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) |
38 | # Directory in which all plugin resources are installed | 38 | # Directory in which all plugin resources are installed |
39 | @@ -3024,6 +3025,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" | 39 | @@ -3059,6 +3060,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" |
40 | 40 | ||
41 | PREPROCESSOR_DEFINES = \ | 41 | PREPROCESSOR_DEFINES = \ |
42 | -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ | 42 | -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ |
@@ -45,10 +45,10 @@ index a8277254696..07fa63b6640 100644 | |||
45 | -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ | 45 | -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ |
46 | -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ | 46 | -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ |
47 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h | 47 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h |
48 | index 4ce173384ef..8a3cd4f2d34 100644 | 48 | index 6491c6b84f5..57496ff1f2f 100644 |
49 | --- a/gcc/config/linux.h | 49 | --- a/gcc/config/linux.h |
50 | +++ b/gcc/config/linux.h | 50 | +++ b/gcc/config/linux.h |
51 | @@ -170,6 +170,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | 51 | @@ -157,6 +157,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
52 | #define INCLUDE_DEFAULTS_MUSL_TOOL | 52 | #define INCLUDE_DEFAULTS_MUSL_TOOL |
53 | #endif | 53 | #endif |
54 | 54 | ||
@@ -62,7 +62,7 @@ index 4ce173384ef..8a3cd4f2d34 100644 | |||
62 | #ifdef NATIVE_SYSTEM_HEADER_DIR | 62 | #ifdef NATIVE_SYSTEM_HEADER_DIR |
63 | #define INCLUDE_DEFAULTS_MUSL_NATIVE \ | 63 | #define INCLUDE_DEFAULTS_MUSL_NATIVE \ |
64 | { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ | 64 | { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ |
65 | @@ -196,6 +203,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | 65 | @@ -183,6 +190,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
66 | INCLUDE_DEFAULTS_MUSL_PREFIX \ | 66 | INCLUDE_DEFAULTS_MUSL_PREFIX \ |
67 | INCLUDE_DEFAULTS_MUSL_CROSS \ | 67 | INCLUDE_DEFAULTS_MUSL_CROSS \ |
68 | INCLUDE_DEFAULTS_MUSL_TOOL \ | 68 | INCLUDE_DEFAULTS_MUSL_TOOL \ |
@@ -71,10 +71,10 @@ index 4ce173384ef..8a3cd4f2d34 100644 | |||
71 | { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ | 71 | { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ |
72 | { 0, 0, 0, 0, 0, 0 } \ | 72 | { 0, 0, 0, 0, 0, 0 } \ |
73 | diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h | 73 | diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h |
74 | index a73954d9de5..e5dd6538358 100644 | 74 | index 26db003cb3a..3a443abcf6b 100644 |
75 | --- a/gcc/config/rs6000/sysv4.h | 75 | --- a/gcc/config/rs6000/sysv4.h |
76 | +++ b/gcc/config/rs6000/sysv4.h | 76 | +++ b/gcc/config/rs6000/sysv4.h |
77 | @@ -994,6 +994,13 @@ ncrtn.o%s" | 77 | @@ -986,6 +986,13 @@ ncrtn.o%s" |
78 | #define INCLUDE_DEFAULTS_MUSL_TOOL | 78 | #define INCLUDE_DEFAULTS_MUSL_TOOL |
79 | #endif | 79 | #endif |
80 | 80 | ||
@@ -88,7 +88,7 @@ index a73954d9de5..e5dd6538358 100644 | |||
88 | #ifdef NATIVE_SYSTEM_HEADER_DIR | 88 | #ifdef NATIVE_SYSTEM_HEADER_DIR |
89 | #define INCLUDE_DEFAULTS_MUSL_NATIVE \ | 89 | #define INCLUDE_DEFAULTS_MUSL_NATIVE \ |
90 | { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ | 90 | { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ |
91 | @@ -1020,6 +1027,7 @@ ncrtn.o%s" | 91 | @@ -1012,6 +1019,7 @@ ncrtn.o%s" |
92 | INCLUDE_DEFAULTS_MUSL_PREFIX \ | 92 | INCLUDE_DEFAULTS_MUSL_PREFIX \ |
93 | INCLUDE_DEFAULTS_MUSL_CROSS \ | 93 | INCLUDE_DEFAULTS_MUSL_CROSS \ |
94 | INCLUDE_DEFAULTS_MUSL_TOOL \ | 94 | INCLUDE_DEFAULTS_MUSL_TOOL \ |
@@ -97,7 +97,7 @@ index a73954d9de5..e5dd6538358 100644 | |||
97 | { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ | 97 | { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ |
98 | { 0, 0, 0, 0, 0, 0 } \ | 98 | { 0, 0, 0, 0, 0, 0 } \ |
99 | diff --git a/gcc/cppdefault.cc b/gcc/cppdefault.cc | 99 | diff --git a/gcc/cppdefault.cc b/gcc/cppdefault.cc |
100 | index 7888300f277..52cf14e92f8 100644 | 100 | index 141bb4d25f6..734590a7059 100644 |
101 | --- a/gcc/cppdefault.cc | 101 | --- a/gcc/cppdefault.cc |
102 | +++ b/gcc/cppdefault.cc | 102 | +++ b/gcc/cppdefault.cc |
103 | @@ -64,6 +64,10 @@ const struct default_include cpp_include_defaults[] | 103 | @@ -64,6 +64,10 @@ const struct default_include cpp_include_defaults[] |
diff --git a/meta/recipes-devtools/gcc/gcc/0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/meta/recipes-devtools/gcc/gcc/0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch index 94308b2aca..5de0e3e982 100644 --- a/meta/recipes-devtools/gcc/gcc/0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch +++ b/meta/recipes-devtools/gcc/gcc/0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9ae49e7b88c208ab79ec9c2fc4a2fa8a3f1e85bb Mon Sep 17 00:00:00 2001 | 1 | From e0775b77b8d10066e27ab89d15441b39024a29fd Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 3 Mar 2015 08:21:19 +0000 | 3 | Date: Tue, 3 Mar 2015 08:21:19 +0000 |
4 | Subject: [PATCH] Don't search host directory during "relink" if $inst_prefix | 4 | Subject: [PATCH] Don't search host directory during "relink" if $inst_prefix |
diff --git a/meta/recipes-devtools/gcc/gcc/0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/meta/recipes-devtools/gcc/gcc/0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch index ce9635ce4d..f1eee4a833 100644 --- a/meta/recipes-devtools/gcc/gcc/0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch +++ b/meta/recipes-devtools/gcc/gcc/0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bf918db7117f41d3c04162095641165ca241707d Mon Sep 17 00:00:00 2001 | 1 | From 7776c630e2560bacff7d1e9b04e7916ed4c05d00 Mon Sep 17 00:00:00 2001 |
2 | From: Robert Yang <liezhi.yang@windriver.com> | 2 | From: Robert Yang <liezhi.yang@windriver.com> |
3 | Date: Sun, 5 Jul 2015 20:25:18 -0700 | 3 | Date: Sun, 5 Jul 2015 20:25:18 -0700 |
4 | Subject: [PATCH] libcc1: fix libcc1's install path and rpath | 4 | Subject: [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 | ||
22 | diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am | 22 | diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am |
23 | index 6e3a34ff7e2..3f3f6391aba 100644 | 23 | index 921a33fe236..938e6f964cd 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), \ |
diff --git a/meta/recipes-devtools/gcc/gcc/0016-handle-sysroot-support-for-nativesdk-gcc.patch b/meta/recipes-devtools/gcc/gcc/0016-handle-sysroot-support-for-nativesdk-gcc.patch index 3b54719536..e05fd4e6a2 100644 --- a/meta/recipes-devtools/gcc/gcc/0016-handle-sysroot-support-for-nativesdk-gcc.patch +++ b/meta/recipes-devtools/gcc/gcc/0016-handle-sysroot-support-for-nativesdk-gcc.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4fbbd40d7db89cdbeaf93df1e1da692b1f80a5bc Mon Sep 17 00:00:00 2001 | 1 | From 4f9c952ad5fa68260d6a40570b0fdb7359c85057 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 7 Dec 2015 23:39:54 +0000 | 3 | Date: Mon, 7 Dec 2015 23:39:54 +0000 |
4 | Subject: [PATCH] handle sysroot support for nativesdk-gcc | 4 | Subject: [PATCH] handle sysroot support for nativesdk-gcc |
@@ -38,15 +38,15 @@ Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> | |||
38 | gcc/c-family/c-opts.cc | 4 +-- | 38 | gcc/c-family/c-opts.cc | 4 +-- |
39 | gcc/config/linux.h | 24 +++++++-------- | 39 | gcc/config/linux.h | 24 +++++++-------- |
40 | gcc/config/rs6000/sysv4.h | 24 +++++++-------- | 40 | gcc/config/rs6000/sysv4.h | 24 +++++++-------- |
41 | gcc/cppdefault.cc | 63 ++++++++++++++++++++++++--------------- | 41 | gcc/cppdefault.cc | 65 ++++++++++++++++++++++++--------------- |
42 | gcc/cppdefault.h | 13 ++++---- | 42 | gcc/cppdefault.h | 13 +++----- |
43 | gcc/gcc.cc | 20 +++++++++---- | 43 | gcc/gcc.cc | 20 ++++++++---- |
44 | gcc/incpath.cc | 12 ++++---- | 44 | gcc/incpath.cc | 12 ++++---- |
45 | gcc/prefix.cc | 6 ++-- | 45 | gcc/prefix.cc | 6 ++-- |
46 | 8 files changed, 94 insertions(+), 72 deletions(-) | 46 | 8 files changed, 95 insertions(+), 73 deletions(-) |
47 | 47 | ||
48 | diff --git a/gcc/c-family/c-opts.cc b/gcc/c-family/c-opts.cc | 48 | diff --git a/gcc/c-family/c-opts.cc b/gcc/c-family/c-opts.cc |
49 | index a341a061758..83b0bef4dbb 100644 | 49 | index c68a2a27469..77e9b5eceaa 100644 |
50 | --- a/gcc/c-family/c-opts.cc | 50 | --- a/gcc/c-family/c-opts.cc |
51 | +++ b/gcc/c-family/c-opts.cc | 51 | +++ b/gcc/c-family/c-opts.cc |
52 | @@ -1458,8 +1458,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain) | 52 | @@ -1458,8 +1458,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain) |
@@ -61,10 +61,10 @@ index a341a061758..83b0bef4dbb 100644 | |||
61 | path = (char *) xmalloc (prefix_len + suffix_len + 1); | 61 | path = (char *) xmalloc (prefix_len + suffix_len + 1); |
62 | memcpy (path, prefix, prefix_len); | 62 | memcpy (path, prefix, prefix_len); |
63 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h | 63 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h |
64 | index 8a3cd4f2d34..58143dff731 100644 | 64 | index 57496ff1f2f..c921cf6ef63 100644 |
65 | --- a/gcc/config/linux.h | 65 | --- a/gcc/config/linux.h |
66 | +++ b/gcc/config/linux.h | 66 | +++ b/gcc/config/linux.h |
67 | @@ -134,53 +134,53 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | 67 | @@ -121,53 +121,53 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
68 | * Unfortunately, this is mostly duplicated from cppdefault.cc */ | 68 | * Unfortunately, this is mostly duplicated from cppdefault.cc */ |
69 | #if DEFAULT_LIBC == LIBC_MUSL | 69 | #if DEFAULT_LIBC == LIBC_MUSL |
70 | #define INCLUDE_DEFAULTS_MUSL_GPP \ | 70 | #define INCLUDE_DEFAULTS_MUSL_GPP \ |
@@ -129,7 +129,7 @@ index 8a3cd4f2d34..58143dff731 100644 | |||
129 | #else | 129 | #else |
130 | #define INCLUDE_DEFAULTS_MUSL_NATIVE | 130 | #define INCLUDE_DEFAULTS_MUSL_NATIVE |
131 | #endif | 131 | #endif |
132 | @@ -205,7 +205,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | 132 | @@ -192,7 +192,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
133 | INCLUDE_DEFAULTS_MUSL_TOOL \ | 133 | INCLUDE_DEFAULTS_MUSL_TOOL \ |
134 | INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET \ | 134 | INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET \ |
135 | INCLUDE_DEFAULTS_MUSL_NATIVE \ | 135 | INCLUDE_DEFAULTS_MUSL_NATIVE \ |
@@ -139,10 +139,10 @@ index 8a3cd4f2d34..58143dff731 100644 | |||
139 | } | 139 | } |
140 | #endif | 140 | #endif |
141 | diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h | 141 | diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h |
142 | index e5dd6538358..b496849b792 100644 | 142 | index 3a443abcf6b..ef83a5a432e 100644 |
143 | --- a/gcc/config/rs6000/sysv4.h | 143 | --- a/gcc/config/rs6000/sysv4.h |
144 | +++ b/gcc/config/rs6000/sysv4.h | 144 | +++ b/gcc/config/rs6000/sysv4.h |
145 | @@ -958,53 +958,53 @@ ncrtn.o%s" | 145 | @@ -950,53 +950,53 @@ ncrtn.o%s" |
146 | /* Include order changes for musl, same as in generic linux.h. */ | 146 | /* Include order changes for musl, same as in generic linux.h. */ |
147 | #if DEFAULT_LIBC == LIBC_MUSL | 147 | #if DEFAULT_LIBC == LIBC_MUSL |
148 | #define INCLUDE_DEFAULTS_MUSL_GPP \ | 148 | #define INCLUDE_DEFAULTS_MUSL_GPP \ |
@@ -207,7 +207,7 @@ index e5dd6538358..b496849b792 100644 | |||
207 | #else | 207 | #else |
208 | #define INCLUDE_DEFAULTS_MUSL_NATIVE | 208 | #define INCLUDE_DEFAULTS_MUSL_NATIVE |
209 | #endif | 209 | #endif |
210 | @@ -1029,7 +1029,7 @@ ncrtn.o%s" | 210 | @@ -1021,7 +1021,7 @@ ncrtn.o%s" |
211 | INCLUDE_DEFAULTS_MUSL_TOOL \ | 211 | INCLUDE_DEFAULTS_MUSL_TOOL \ |
212 | INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET \ | 212 | INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET \ |
213 | INCLUDE_DEFAULTS_MUSL_NATIVE \ | 213 | INCLUDE_DEFAULTS_MUSL_NATIVE \ |
@@ -217,7 +217,7 @@ index e5dd6538358..b496849b792 100644 | |||
217 | } | 217 | } |
218 | #endif | 218 | #endif |
219 | diff --git a/gcc/cppdefault.cc b/gcc/cppdefault.cc | 219 | diff --git a/gcc/cppdefault.cc b/gcc/cppdefault.cc |
220 | index 52cf14e92f8..d8977afc05e 100644 | 220 | index 734590a7059..b4a8fc29e4a 100644 |
221 | --- a/gcc/cppdefault.cc | 221 | --- a/gcc/cppdefault.cc |
222 | +++ b/gcc/cppdefault.cc | 222 | +++ b/gcc/cppdefault.cc |
223 | @@ -35,6 +35,30 @@ | 223 | @@ -35,6 +35,30 @@ |
@@ -272,7 +272,7 @@ index 52cf14e92f8..d8977afc05e 100644 | |||
272 | GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, | 272 | GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, |
273 | #endif | 273 | #endif |
274 | #ifdef GPLUSPLUS_LIBCXX_INCLUDE_DIR | 274 | #ifdef GPLUSPLUS_LIBCXX_INCLUDE_DIR |
275 | @@ -62,23 +86,23 @@ const struct default_include cpp_include_defaults[] | 275 | @@ -62,26 +86,26 @@ const struct default_include cpp_include_defaults[] |
276 | #endif | 276 | #endif |
277 | #ifdef GCC_INCLUDE_DIR | 277 | #ifdef GCC_INCLUDE_DIR |
278 | /* This is the dir for gcc's private headers. */ | 278 | /* This is the dir for gcc's private headers. */ |
@@ -297,12 +297,16 @@ index 52cf14e92f8..d8977afc05e 100644 | |||
297 | #endif | 297 | #endif |
298 | #ifdef FIXED_INCLUDE_DIR | 298 | #ifdef FIXED_INCLUDE_DIR |
299 | /* This is the dir for fixincludes. */ | 299 | /* This is the dir for fixincludes. */ |
300 | #ifndef SYSROOT_HEADERS_SUFFIX_SPEC | ||
301 | - { FIXED_INCLUDE_DIR, "GCC", 0, 0, 0, 2 }, | ||
302 | + { FIXED_INCLUDE_DIRVAR, "GCC", 0, 0, 0, 2 }, | ||
303 | #endif | ||
300 | - { FIXED_INCLUDE_DIR, "GCC", 0, 0, 0, | 304 | - { FIXED_INCLUDE_DIR, "GCC", 0, 0, 0, |
301 | + { FIXED_INCLUDE_DIRVAR, "GCC", 0, 0, 0, | 305 | + { FIXED_INCLUDE_DIRVAR, "GCC", 0, 0, 0, |
302 | /* A multilib suffix needs adding if different multilibs use | 306 | /* A multilib suffix needs adding if different multilibs use |
303 | different headers. */ | 307 | different headers. */ |
304 | #ifdef SYSROOT_HEADERS_SUFFIX_SPEC | 308 | #ifdef SYSROOT_HEADERS_SUFFIX_SPEC |
305 | @@ -90,33 +114,24 @@ const struct default_include cpp_include_defaults[] | 309 | @@ -93,33 +117,24 @@ const struct default_include cpp_include_defaults[] |
306 | #endif | 310 | #endif |
307 | #ifdef CROSS_INCLUDE_DIR | 311 | #ifdef CROSS_INCLUDE_DIR |
308 | /* One place the target system's headers might be. */ | 312 | /* One place the target system's headers might be. */ |
@@ -343,7 +347,7 @@ index 52cf14e92f8..d8977afc05e 100644 | |||
343 | /* This value is set by cpp_relocated at runtime */ | 347 | /* This value is set by cpp_relocated at runtime */ |
344 | const char *gcc_exec_prefix; | 348 | const char *gcc_exec_prefix; |
345 | diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h | 349 | diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h |
346 | index fb97c0b5814..6267150facc 100644 | 350 | index e26b424e99c..c9abb090dcd 100644 |
347 | --- a/gcc/cppdefault.h | 351 | --- a/gcc/cppdefault.h |
348 | +++ b/gcc/cppdefault.h | 352 | +++ b/gcc/cppdefault.h |
349 | @@ -33,7 +33,8 @@ | 353 | @@ -33,7 +33,8 @@ |
@@ -378,10 +382,10 @@ index fb97c0b5814..6267150facc 100644 | |||
378 | subdirectory of the actual installation. */ | 382 | subdirectory of the actual installation. */ |
379 | extern const char *gcc_exec_prefix; | 383 | extern const char *gcc_exec_prefix; |
380 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc | 384 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc |
381 | index aa4cf92fb78..5569a39a14a 100644 | 385 | index 8af0c814c33..605fe3b8c0d 100644 |
382 | --- a/gcc/gcc.cc | 386 | --- a/gcc/gcc.cc |
383 | +++ b/gcc/gcc.cc | 387 | +++ b/gcc/gcc.cc |
384 | @@ -252,6 +252,8 @@ FILE *report_times_to_file = NULL; | 388 | @@ -255,6 +255,8 @@ FILE *report_times_to_file = NULL; |
385 | #endif | 389 | #endif |
386 | static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT; | 390 | static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT; |
387 | 391 | ||
@@ -390,7 +394,7 @@ index aa4cf92fb78..5569a39a14a 100644 | |||
390 | /* Nonzero means pass the updated target_system_root to the compiler. */ | 394 | /* Nonzero means pass the updated target_system_root to the compiler. */ |
391 | 395 | ||
392 | static int target_system_root_changed; | 396 | static int target_system_root_changed; |
393 | @@ -575,6 +577,7 @@ or with constant text in a single argument. | 397 | @@ -578,6 +580,7 @@ or with constant text in a single argument. |
394 | %G process LIBGCC_SPEC as a spec. | 398 | %G process LIBGCC_SPEC as a spec. |
395 | %R Output the concatenation of target_system_root and | 399 | %R Output the concatenation of target_system_root and |
396 | target_sysroot_suffix. | 400 | target_sysroot_suffix. |
@@ -398,7 +402,7 @@ index aa4cf92fb78..5569a39a14a 100644 | |||
398 | %S process STARTFILE_SPEC as a spec. A capital S is actually used here. | 402 | %S process STARTFILE_SPEC as a spec. A capital S is actually used here. |
399 | %E process ENDFILE_SPEC as a spec. A capital E is actually used here. | 403 | %E process ENDFILE_SPEC as a spec. A capital E is actually used here. |
400 | %C process CPP_SPEC as a spec. | 404 | %C process CPP_SPEC as a spec. |
401 | @@ -1627,10 +1630,10 @@ static const char *gcc_libexec_prefix; | 405 | @@ -1619,10 +1622,10 @@ static const char *gcc_libexec_prefix; |
402 | gcc_exec_prefix is set because, in that case, we know where the | 406 | gcc_exec_prefix is set because, in that case, we know where the |
403 | compiler has been installed, and use paths relative to that | 407 | compiler has been installed, and use paths relative to that |
404 | location instead. */ | 408 | location instead. */ |
@@ -413,7 +417,7 @@ index aa4cf92fb78..5569a39a14a 100644 | |||
413 | 417 | ||
414 | /* For native compilers, these are well-known paths containing | 418 | /* For native compilers, these are well-known paths containing |
415 | components that may be provided by the system. For cross | 419 | components that may be provided by the system. For cross |
416 | @@ -1638,9 +1641,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; | 420 | @@ -1630,9 +1633,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; |
417 | static const char *md_exec_prefix = MD_EXEC_PREFIX; | 421 | static const char *md_exec_prefix = MD_EXEC_PREFIX; |
418 | static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; | 422 | static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; |
419 | static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1; | 423 | static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1; |
@@ -425,7 +429,7 @@ index aa4cf92fb78..5569a39a14a 100644 | |||
425 | = STANDARD_STARTFILE_PREFIX_2; | 429 | = STANDARD_STARTFILE_PREFIX_2; |
426 | 430 | ||
427 | /* A relative path to be used in finding the location of tools | 431 | /* A relative path to be used in finding the location of tools |
428 | @@ -6676,6 +6679,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) | 432 | @@ -6652,6 +6655,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) |
429 | } | 433 | } |
430 | break; | 434 | break; |
431 | 435 | ||
@@ -438,7 +442,7 @@ index aa4cf92fb78..5569a39a14a 100644 | |||
438 | value = do_spec_1 (startfile_spec, 0, NULL); | 442 | value = do_spec_1 (startfile_spec, 0, NULL); |
439 | if (value != 0) | 443 | if (value != 0) |
440 | diff --git a/gcc/incpath.cc b/gcc/incpath.cc | 444 | diff --git a/gcc/incpath.cc b/gcc/incpath.cc |
441 | index c80f100f476..5ac03c08693 100644 | 445 | index 46c0d543205..d088dae7b04 100644 |
442 | --- a/gcc/incpath.cc | 446 | --- a/gcc/incpath.cc |
443 | +++ b/gcc/incpath.cc | 447 | +++ b/gcc/incpath.cc |
444 | @@ -135,7 +135,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, | 448 | @@ -135,7 +135,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, |
@@ -485,10 +489,10 @@ index c80f100f476..5ac03c08693 100644 | |||
485 | str = update_path (ostr, p->component); | 489 | str = update_path (ostr, p->component); |
486 | free (ostr); | 490 | free (ostr); |
487 | diff --git a/gcc/prefix.cc b/gcc/prefix.cc | 491 | diff --git a/gcc/prefix.cc b/gcc/prefix.cc |
488 | index 096ed5afa3d..2526f0ecc39 100644 | 492 | index c2a37bde5ea..33944701ced 100644 |
489 | --- a/gcc/prefix.cc | 493 | --- a/gcc/prefix.cc |
490 | +++ b/gcc/prefix.cc | 494 | +++ b/gcc/prefix.cc |
491 | @@ -72,7 +72,9 @@ License along with GCC; see the file COPYING3. If not see | 495 | @@ -73,7 +73,9 @@ License along with GCC; see the file COPYING3. If not see |
492 | #include "prefix.h" | 496 | #include "prefix.h" |
493 | #include "common/common-target.h" | 497 | #include "common/common-target.h" |
494 | 498 | ||
@@ -499,7 +503,7 @@ index 096ed5afa3d..2526f0ecc39 100644 | |||
499 | 503 | ||
500 | static const char *get_key_value (char *); | 504 | static const char *get_key_value (char *); |
501 | static char *translate_name (char *); | 505 | static char *translate_name (char *); |
502 | @@ -212,7 +214,7 @@ translate_name (char *name) | 506 | @@ -213,7 +215,7 @@ translate_name (char *name) |
503 | prefix = getenv (key); | 507 | prefix = getenv (key); |
504 | 508 | ||
505 | if (prefix == 0) | 509 | if (prefix == 0) |
diff --git a/meta/recipes-devtools/gcc/gcc/0017-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/meta/recipes-devtools/gcc/gcc/0017-Search-target-sysroot-gcc-version-specific-dirs-with.patch index 9b05da64a7..d0aeeb2769 100644 --- a/meta/recipes-devtools/gcc/gcc/0017-Search-target-sysroot-gcc-version-specific-dirs-with.patch +++ b/meta/recipes-devtools/gcc/gcc/0017-Search-target-sysroot-gcc-version-specific-dirs-with.patch | |||
@@ -1,8 +1,7 @@ | |||
1 | From 33a1f07a4417247dc24819d4e583ca09f56d5a7b Mon Sep 17 00:00:00 2001 | 1 | From 0058f8a2233d9e96e39d09f4d994da3c96f9e030 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 7 Dec 2015 23:41:45 +0000 | 3 | Date: Mon, 7 Dec 2015 23:41:45 +0000 |
4 | Subject: [PATCH] Search target sysroot gcc version specific dirs with | 4 | Subject: [PATCH] Search target sysroot gcc version specific dirs with multilib. |
5 | multilib. | ||
6 | 5 | ||
7 | We install the gcc libraries (such as crtbegin.p) into | 6 | We install the gcc libraries (such as crtbegin.p) into |
8 | <sysroot><libdir>/<target-sys>/5.2.0/ | 7 | <sysroot><libdir>/<target-sys>/5.2.0/ |
@@ -42,19 +41,20 @@ binaries can be found first. With this change the search path becomes: | |||
42 | <sysroot>/lib32/ | 41 | <sysroot>/lib32/ |
43 | <sysroot>/usr/lib32/ | 42 | <sysroot>/usr/lib32/ |
44 | 43 | ||
45 | Upstream-Status: Pending | ||
46 | RP 2015/7/31 | 44 | RP 2015/7/31 |
47 | 45 | ||
46 | Upstream-Status: Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2023-April/615320.html] | ||
47 | |||
48 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 48 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
49 | --- | 49 | --- |
50 | gcc/gcc.cc | 29 ++++++++++++++++++++++++++++- | 50 | gcc/gcc.cc | 29 ++++++++++++++++++++++++++++- |
51 | 1 file changed, 28 insertions(+), 1 deletion(-) | 51 | 1 file changed, 28 insertions(+), 1 deletion(-) |
52 | 52 | ||
53 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc | 53 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc |
54 | index 5569a39a14a..4598f6cd7c9 100644 | 54 | index 605fe3b8c0d..c3a1dab38c4 100644 |
55 | --- a/gcc/gcc.cc | 55 | --- a/gcc/gcc.cc |
56 | +++ b/gcc/gcc.cc | 56 | +++ b/gcc/gcc.cc |
57 | @@ -2817,7 +2817,7 @@ for_each_path (const struct path_prefix *paths, | 57 | @@ -2809,7 +2809,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 5569a39a14a..4598f6cd7c9 100644 | |||
63 | path = XNEWVEC (char, len); | 63 | path = XNEWVEC (char, len); |
64 | } | 64 | } |
65 | 65 | ||
66 | @@ -2829,6 +2829,33 @@ for_each_path (const struct path_prefix *paths, | 66 | @@ -2821,6 +2821,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/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta/recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch index 56793e03a3..9545e76b05 100644 --- a/meta/recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch +++ b/meta/recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d7dc2861840e88a4592817a398a054a886c3f3ee Mon Sep 17 00:00:00 2001 | 1 | From 0a194b74f0f171b46527ff447c27fbf32406333d Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 27 Jun 2017 18:10:54 -0700 | 3 | Date: Tue, 27 Jun 2017 18:10:54 -0700 |
4 | Subject: [PATCH] Add ssp_nonshared to link commandline for musl targets | 4 | Subject: [PATCH] Add ssp_nonshared to link commandline for musl targets |
@@ -23,10 +23,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
23 | 3 files changed, 27 insertions(+) | 23 | 3 files changed, 27 insertions(+) |
24 | 24 | ||
25 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h | 25 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h |
26 | index 58143dff731..d2409ccac26 100644 | 26 | index c921cf6ef63..32e1bc1ae2d 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 | @@ -208,6 +208,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 |
30 | { GCC_INCLUDE_DIRVAR, "GCC", 0, 1, 0, 0 }, \ | 30 | { GCC_INCLUDE_DIRVAR, "GCC", 0, 1, 0, 0 }, \ |
31 | { 0, 0, 0, 0, 0, 0 } \ | 31 | { 0, 0, 0, 0, 0, 0 } \ |
32 | } | 32 | } |
@@ -41,7 +41,7 @@ index 58143dff731..d2409ccac26 100644 | |||
41 | 41 | ||
42 | #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ | 42 | #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ |
43 | diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h | 43 | diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h |
44 | index 8c9039ac1e5..259cd485973 100644 | 44 | index 5d21befe8e4..1248a68e4ca 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 | @@ -99,6 +99,16 @@ | 47 | @@ -99,6 +99,16 @@ |
@@ -62,7 +62,7 @@ index 8c9039ac1e5..259cd485973 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: \ |
64 | diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h | 64 | diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h |
65 | index 364c1a5b155..e33d9ae98e0 100644 | 65 | index 2ddab7c99c1..9641580fc83 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 | @@ -372,6 +372,16 @@ extern int dot_symbols; | 68 | @@ -372,6 +372,16 @@ extern int dot_symbols; |
diff --git a/meta/recipes-devtools/gcc/gcc/0019-Re-introduce-spe-commandline-options.patch b/meta/recipes-devtools/gcc/gcc/0019-Re-introduce-spe-commandline-options.patch index bb1699be25..409dff3b7e 100644 --- a/meta/recipes-devtools/gcc/gcc/0019-Re-introduce-spe-commandline-options.patch +++ b/meta/recipes-devtools/gcc/gcc/0019-Re-introduce-spe-commandline-options.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bf0d7c463e1fab62804556099b56319fe94be1eb Mon Sep 17 00:00:00 2001 | 1 | From 0b83874fd8e767248adffd616bcd07aa438b6905 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 6 Jun 2018 12:10:22 -0700 | 3 | Date: Wed, 6 Jun 2018 12:10:22 -0700 |
4 | Subject: [PATCH] Re-introduce spe commandline options | 4 | Subject: [PATCH] Re-introduce spe commandline options |
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 1 file changed, 13 insertions(+) | 14 | 1 file changed, 13 insertions(+) |
15 | 15 | ||
16 | diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt | 16 | diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt |
17 | index 4931d781c4e..3fb87b6f7d5 100644 | 17 | index bde6d3ff664..5af9640825c 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 | @@ -348,6 +348,19 @@ mdebug= | 20 | @@ -344,6 +344,19 @@ mdebug= |
21 | Target RejectNegative Joined | 21 | Target RejectNegative Joined |
22 | -mdebug= Enable debug output. | 22 | -mdebug= Enable debug output. |
23 | 23 | ||
diff --git a/meta/recipes-devtools/gcc/gcc/0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/meta/recipes-devtools/gcc/gcc/0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch index f37092089f..205fdb66c9 100644 --- a/meta/recipes-devtools/gcc/gcc/0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch +++ b/meta/recipes-devtools/gcc/gcc/0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a32c75b37209d6836eaaa943dc6b1207acba5d27 Mon Sep 17 00:00:00 2001 | 1 | From d8b6f60d1206a67c640096bac3b348828914163c Mon Sep 17 00:00:00 2001 |
2 | From: Szabolcs Nagy <nsz@port70.net> | 2 | From: Szabolcs Nagy <nsz@port70.net> |
3 | Date: Sat, 24 Oct 2015 20:09:53 +0000 | 3 | Date: Sat, 24 Oct 2015 20:09:53 +0000 |
4 | Subject: [PATCH] libgcc_s: Use alias for __cpu_indicator_init instead of | 4 | Subject: [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 | ||
41 | diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc | 41 | diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc |
42 | index 68978ef8dc2..0c71f36b572 100644 | 42 | index 0d817fc3f3b..8d34d19d3f9 100644 |
43 | --- a/gcc/config/i386/i386-expand.cc | 43 | --- a/gcc/config/i386/i386-expand.cc |
44 | +++ b/gcc/config/i386/i386-expand.cc | 44 | +++ b/gcc/config/i386/i386-expand.cc |
45 | @@ -12321,10 +12321,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, | 45 | @@ -12691,10 +12691,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,7 +56,7 @@ index 68978ef8dc2..0c71f36b572 100644 | |||
56 | return expand_expr (call_expr, target, mode, EXPAND_NORMAL); | 56 | return expand_expr (call_expr, target, mode, EXPAND_NORMAL); |
57 | } | 57 | } |
58 | diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c | 58 | diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c |
59 | index dab1d98060f..cf824b4114a 100644 | 59 | index 50b6d8248a2..724ced402a1 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 | @@ -63,7 +63,7 @@ __cpu_indicator_init (void) | 62 | @@ -63,7 +63,7 @@ __cpu_indicator_init (void) |
diff --git a/meta/recipes-devtools/gcc/gcc/0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch b/meta/recipes-devtools/gcc/gcc/0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch index f5f04ae314..43df7fcb71 100644 --- a/meta/recipes-devtools/gcc/gcc/0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch +++ b/meta/recipes-devtools/gcc/gcc/0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4efc42b99c96b026f560b0918de7e237ac3dc8d1 Mon Sep 17 00:00:00 2001 | 1 | From 18f400d6c91b800361af633b6b93a9e5881bbb0f Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Tue, 10 Mar 2020 08:26:53 -0700 | 3 | Date: Tue, 10 Mar 2020 08:26:53 -0700 |
4 | Subject: [PATCH] gentypes/genmodes: Do not use __LINE__ for maintaining | 4 | Subject: [PATCH] gentypes/genmodes: Do not use __LINE__ for maintaining |
@@ -17,10 +17,10 @@ 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 | ||
19 | diff --git a/gcc/gengtype.cc b/gcc/gengtype.cc | 19 | diff --git a/gcc/gengtype.cc b/gcc/gengtype.cc |
20 | index 386ae1b0506..9762e914296 100644 | 20 | index 7763f40e9ab..4f0c1eb1508 100644 |
21 | --- a/gcc/gengtype.cc | 21 | --- a/gcc/gengtype.cc |
22 | +++ b/gcc/gengtype.cc | 22 | +++ b/gcc/gengtype.cc |
23 | @@ -1006,7 +1006,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt, | 23 | @@ -1005,7 +1005,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt, |
24 | /* Create a fake field with the given type and name. NEXT is the next | 24 | /* Create a fake field with the given type and name. NEXT is the next |
25 | field in the chain. */ | 25 | field in the chain. */ |
26 | #define create_field(next,type,name) \ | 26 | #define create_field(next,type,name) \ |
@@ -29,7 +29,7 @@ index 386ae1b0506..9762e914296 100644 | |||
29 | 29 | ||
30 | /* Like create_field, but the field is only valid when condition COND | 30 | /* Like create_field, but the field is only valid when condition COND |
31 | is true. */ | 31 | is true. */ |
32 | @@ -1039,7 +1039,7 @@ create_optional_field_ (pair_p next, type_p type, const char *name, | 32 | @@ -1038,7 +1038,7 @@ create_optional_field_ (pair_p next, type_p type, const char *name, |
33 | } | 33 | } |
34 | 34 | ||
35 | #define create_optional_field(next,type,name,cond) \ | 35 | #define create_optional_field(next,type,name,cond) \ |
@@ -38,7 +38,7 @@ index 386ae1b0506..9762e914296 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 | @@ -5238,7 +5238,7 @@ main (int argc, char **argv) | 41 | @@ -5223,7 +5223,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 386ae1b0506..9762e914296 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)); |
50 | diff --git a/gcc/genmodes.cc b/gcc/genmodes.cc | 50 | diff --git a/gcc/genmodes.cc b/gcc/genmodes.cc |
51 | index 59850bb070a..e187f8542a1 100644 | 51 | index 715787b8f48..302adff28d5 100644 |
52 | --- a/gcc/genmodes.cc | 52 | --- a/gcc/genmodes.cc |
53 | +++ b/gcc/genmodes.cc | 53 | +++ b/gcc/genmodes.cc |
54 | @@ -440,7 +440,7 @@ complete_all_modes (void) | 54 | @@ -441,7 +441,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 59850bb070a..e187f8542a1 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 | @@ -499,7 +499,7 @@ make_complex_modes (enum mode_class cl, | 63 | @@ -500,7 +500,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 59850bb070a..e187f8542a1 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 | @@ -552,7 +552,7 @@ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, | 72 | @@ -553,7 +553,7 @@ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, |
73 | BYTESIZE bytes in total. */ | 73 | BYTESIZE bytes in total. */ |
74 | #define VECTOR_BOOL_MODE(NAME, COUNT, COMPONENT, BYTESIZE) \ | 74 | #define VECTOR_BOOL_MODE(NAME, COUNT, COMPONENT, BYTESIZE) \ |
75 | make_vector_bool_mode (#NAME, COUNT, #COMPONENT, BYTESIZE, \ | 75 | make_vector_bool_mode (#NAME, COUNT, #COMPONENT, BYTESIZE, \ |
@@ -78,7 +78,7 @@ index 59850bb070a..e187f8542a1 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 | const char *component, unsigned int bytesize, | 80 | const char *component, unsigned int bytesize, |
81 | @@ -574,7 +574,7 @@ make_vector_bool_mode (const char *name, unsigned int count, | 81 | @@ -575,7 +575,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 59850bb070a..e187f8542a1 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 | @@ -587,7 +587,7 @@ make_special_mode (enum mode_class cl, const char *name, | 90 | @@ -588,7 +588,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 59850bb070a..e187f8542a1 100644 | |||
96 | 96 | ||
97 | static void | 97 | static void |
98 | make_int_mode (const char *name, | 98 | make_int_mode (const char *name, |
99 | @@ -628,16 +628,16 @@ make_opaque_mode (const char *name, | 99 | @@ -629,16 +629,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 59850bb070a..e187f8542a1 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 | @@ -658,7 +658,7 @@ make_fixed_point_mode (enum mode_class cl, | 120 | @@ -659,7 +659,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 59850bb070a..e187f8542a1 100644 | |||
126 | 126 | ||
127 | static void | 127 | static void |
128 | make_float_mode (const char *name, | 128 | make_float_mode (const char *name, |
129 | @@ -675,7 +675,7 @@ make_float_mode (const char *name, | 129 | @@ -676,7 +676,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 59850bb070a..e187f8542a1 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 | @@ -690,7 +690,7 @@ make_decimal_float_mode (const char *name, | 138 | @@ -691,7 +691,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 59850bb070a..e187f8542a1 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 | @@ -711,7 +711,7 @@ reset_float_format (const char *name, const char *format, | 147 | @@ -712,7 +712,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 59850bb070a..e187f8542a1 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 | @@ -740,7 +740,7 @@ make_int_n (const char *m, int bitsize, | 156 | @@ -741,7 +741,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 59850bb070a..e187f8542a1 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 | @@ -767,7 +767,7 @@ make_partial_integer_mode (const char *base, const char *name, | 165 | @@ -768,7 +768,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_WITH_PREFIX(PREFIX, C, M, N, ORDER) \ | 168 | #define VECTOR_MODE_WITH_PREFIX(PREFIX, C, M, N, ORDER) \ |
@@ -171,7 +171,7 @@ index 59850bb070a..e187f8542a1 100644 | |||
171 | #define VECTOR_MODE(C, M, N) VECTOR_MODE_WITH_PREFIX(V, C, M, N, 0); | 171 | #define VECTOR_MODE(C, M, N) VECTOR_MODE_WITH_PREFIX(V, C, M, N, 0); |
172 | static void ATTRIBUTE_UNUSED | 172 | static void ATTRIBUTE_UNUSED |
173 | make_vector_mode (enum mode_class bclass, | 173 | make_vector_mode (enum mode_class bclass, |
174 | @@ -814,7 +814,7 @@ make_vector_mode (enum mode_class bclass, | 174 | @@ -815,7 +815,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/0023-libatomic-Do-not-enforce-march-on-aarch64.patch b/meta/recipes-devtools/gcc/gcc/0022-libatomic-Do-not-enforce-march-on-aarch64.patch index 2f01659847..cb8969b193 100644 --- a/meta/recipes-devtools/gcc/gcc/0023-libatomic-Do-not-enforce-march-on-aarch64.patch +++ b/meta/recipes-devtools/gcc/gcc/0022-libatomic-Do-not-enforce-march-on-aarch64.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 52931ec7a708b58d68e69ce9eb99001ae9f099dd Mon Sep 17 00:00:00 2001 | 1 | From c3870d073eb9e5d82f9d3067d0fa15038b69713a Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 13 May 2020 15:10:38 -0700 | 3 | Date: Wed, 13 May 2020 15:10:38 -0700 |
4 | Subject: [PATCH] libatomic: Do not enforce march on aarch64 | 4 | Subject: [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 | ||
19 | diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am | 19 | diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am |
20 | index d88515e4a03..e0e2f8b442a 100644 | 20 | index c6c8d81c56a..d959a5d040e 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))) |
@@ -26,16 +26,16 @@ index d88515e4a03..e0e2f8b442a 100644 | |||
26 | if ARCH_AARCH64_LINUX | 26 | if ARCH_AARCH64_LINUX |
27 | -IFUNC_OPTIONS = -march=armv8-a+lse | 27 | -IFUNC_OPTIONS = -march=armv8-a+lse |
28 | libatomic_la_LIBADD += $(foreach s,$(SIZES),$(addsuffix _$(s)_1_.lo,$(SIZEOBJS))) | 28 | libatomic_la_LIBADD += $(foreach s,$(SIZES),$(addsuffix _$(s)_1_.lo,$(SIZEOBJS))) |
29 | endif | 29 | libatomic_la_SOURCES += atomic_16.S |
30 | if ARCH_ARM_LINUX | 30 | |
31 | diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in | 31 | diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in |
32 | index 80d25653dc7..7377689ab34 100644 | 32 | index a0fa3dfc8cc..e70d389874a 100644 |
33 | --- a/libatomic/Makefile.in | 33 | --- a/libatomic/Makefile.in |
34 | +++ b/libatomic/Makefile.in | 34 | +++ b/libatomic/Makefile.in |
35 | @@ -434,7 +434,6 @@ M_SRC = $(firstword $(filter %/$(M_FILE), $(all_c_files))) | 35 | @@ -447,7 +447,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_3) \ |
38 | $(am__append_3) $(am__append_4) | 38 | $(am__append_4) $(am__append_5) |
39 | -@ARCH_AARCH64_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv8-a+lse | 39 | -@ARCH_AARCH64_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv8-a+lse |
40 | @ARCH_ARM_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv7-a+fp -DHAVE_KERNEL64 | 40 | @ARCH_ARM_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv7-a+fp -DHAVE_KERNEL64 |
41 | @ARCH_I386_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=i586 | 41 | @ARCH_I386_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=i586 |
diff --git a/meta/recipes-devtools/gcc/gcc/0024-Fix-install-path-of-linux64.h.patch b/meta/recipes-devtools/gcc/gcc/0023-Fix-install-path-of-linux64.h.patch index 555be62328..11f42c59c4 100644 --- a/meta/recipes-devtools/gcc/gcc/0024-Fix-install-path-of-linux64.h.patch +++ b/meta/recipes-devtools/gcc/gcc/0023-Fix-install-path-of-linux64.h.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3e67c9c77e46132c252911bf1e5e4222dfd3aa34 Mon Sep 17 00:00:00 2001 | 1 | From 7bd6e631e4a5273f5ecc41a5a48830a1342e5926 Mon Sep 17 00:00:00 2001 |
2 | From: Andrei Gherzan <andrei.gherzan@huawei.com> | 2 | From: Andrei Gherzan <andrei.gherzan@huawei.com> |
3 | Date: Wed, 22 Dec 2021 12:49:25 +0100 | 3 | Date: Wed, 22 Dec 2021 12:49:25 +0100 |
4 | Subject: [PATCH] Fix install path of linux64.h | 4 | Subject: [PATCH] Fix install path of linux64.h |
@@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
17 | 1 file changed, 2 insertions(+) | 17 | 1 file changed, 2 insertions(+) |
18 | 18 | ||
19 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in | 19 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in |
20 | index 07fa63b6640..0def7394454 100644 | 20 | index 065ce7e9a5b..d4c723968aa 100644 |
21 | --- a/gcc/Makefile.in | 21 | --- a/gcc/Makefile.in |
22 | +++ b/gcc/Makefile.in | 22 | +++ b/gcc/Makefile.in |
23 | @@ -3706,6 +3706,8 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype | 23 | @@ -3738,6 +3738,8 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype |
24 | "$(srcdir)"/config/* | "$(srcdir)"/common/config/* \ | 24 | "$(srcdir)"/config/* | "$(srcdir)"/common/config/* \ |
25 | | "$(srcdir)"/c-family/* | "$(srcdir)"/*.def ) \ | 25 | | "$(srcdir)"/c-family/* | "$(srcdir)"/*.def ) \ |
26 | base=`echo "$$path" | sed -e "s|$$srcdirstrip/||"`;; \ | 26 | base=`echo "$$path" | sed -e "s|$$srcdirstrip/||"`;; \ |
diff --git a/meta/recipes-devtools/gcc/gcc/0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch b/meta/recipes-devtools/gcc/gcc/0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch new file mode 100644 index 0000000000..ad8269016f --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc/0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 4623d87d779853a2862ee92a15a41fded81eddb8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Sat, 20 Aug 2022 09:04:14 -0700 | ||
4 | Subject: [PATCH] Avoid hardcoded build paths into ppc libgcc | ||
5 | |||
6 | Avoid encoding build paths into sources used for floating point on powerpc. | ||
7 | (MACHINE=qemuppc bitbake libgcc). | ||
8 | |||
9 | Upstream-Status: Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2022-August/599882.html] | ||
10 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | libgcc/config/rs6000/t-float128 | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/libgcc/config/rs6000/t-float128 b/libgcc/config/rs6000/t-float128 | ||
17 | index b09b5664af0..513e63748f1 100644 | ||
18 | --- a/libgcc/config/rs6000/t-float128 | ||
19 | +++ b/libgcc/config/rs6000/t-float128 | ||
20 | @@ -103,7 +103,7 @@ $(ibm128_dec_objs) : INTERNAL_CFLAGS += $(IBM128_CFLAGS_DECIMAL) | ||
21 | $(fp128_softfp_src) : $(srcdir)/soft-fp/$(subst -sw,,$(subst kf,tf,$@)) $(fp128_dep) | ||
22 | @src="$(srcdir)/soft-fp/$(subst -sw,,$(subst kf,tf,$@))"; \ | ||
23 | echo "Create $@"; \ | ||
24 | - (echo "/* file created from $$src */"; \ | ||
25 | + (echo "/* file created from `basename $$src` */"; \ | ||
26 | echo; \ | ||
27 | sed -f $(fp128_sed) < $$src) > $@ | ||
28 | |||
diff --git a/meta/recipes-devtools/gcc/gcc/0026-rust-recursion-limit.patch b/meta/recipes-devtools/gcc/gcc/0026-rust-recursion-limit.patch deleted file mode 100644 index bbe2f18f6f..0000000000 --- a/meta/recipes-devtools/gcc/gcc/0026-rust-recursion-limit.patch +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | From 9234cdca6ee88badfc00297e72f13dac4e540c79 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nick Clifton <nickc@redhat.com> | ||
3 | Date: Fri, 1 Jul 2022 15:58:52 +0100 | ||
4 | Subject: [PATCH] Add a recursion limit to the demangle_const function in the | ||
5 | Rust demangler. | ||
6 | |||
7 | libiberty/ | ||
8 | PR demangler/105039 | ||
9 | * rust-demangle.c (demangle_const): Add recursion limit. | ||
10 | |||
11 | Upstream-Status: Backport [https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=9234cdca6ee88badfc00297e72f13dac4e540c79] | ||
12 | --- | ||
13 | libiberty/rust-demangle.c | 29 ++++++++++++++++++++--------- | ||
14 | 1 file changed, 20 insertions(+), 9 deletions(-) | ||
15 | |||
16 | diff --git a/libiberty/rust-demangle.c b/libiberty/rust-demangle.c | ||
17 | index bb58d900e27..36afcfae278 100644 | ||
18 | --- a/libiberty/rust-demangle.c | ||
19 | +++ b/libiberty/rust-demangle.c | ||
20 | @@ -126,7 +126,7 @@ parse_integer_62 (struct rust_demangler *rdm) | ||
21 | return 0; | ||
22 | |||
23 | x = 0; | ||
24 | - while (!eat (rdm, '_')) | ||
25 | + while (!eat (rdm, '_') && !rdm->errored) | ||
26 | { | ||
27 | c = next (rdm); | ||
28 | x *= 62; | ||
29 | @@ -1148,6 +1148,15 @@ demangle_const (struct rust_demangler *rdm) | ||
30 | if (rdm->errored) | ||
31 | return; | ||
32 | |||
33 | + if (rdm->recursion != RUST_NO_RECURSION_LIMIT) | ||
34 | + { | ||
35 | + ++ rdm->recursion; | ||
36 | + if (rdm->recursion > RUST_MAX_RECURSION_COUNT) | ||
37 | + /* FIXME: There ought to be a way to report | ||
38 | + that the recursion limit has been reached. */ | ||
39 | + goto fail_return; | ||
40 | + } | ||
41 | + | ||
42 | if (eat (rdm, 'B')) | ||
43 | { | ||
44 | backref = parse_integer_62 (rdm); | ||
45 | @@ -1158,7 +1167,7 @@ demangle_const (struct rust_demangler *rdm) | ||
46 | demangle_const (rdm); | ||
47 | rdm->next = old_next; | ||
48 | } | ||
49 | - return; | ||
50 | + goto pass_return; | ||
51 | } | ||
52 | |||
53 | ty_tag = next (rdm); | ||
54 | @@ -1167,7 +1176,7 @@ demangle_const (struct rust_demangler *rdm) | ||
55 | /* Placeholder. */ | ||
56 | case 'p': | ||
57 | PRINT ("_"); | ||
58 | - return; | ||
59 | + goto pass_return; | ||
60 | |||
61 | /* Unsigned integer types. */ | ||
62 | case 'h': | ||
63 | @@ -1200,18 +1209,20 @@ demangle_const (struct rust_demangler *rdm) | ||
64 | break; | ||
65 | |||
66 | default: | ||
67 | - rdm->errored = 1; | ||
68 | - return; | ||
69 | + goto fail_return; | ||
70 | } | ||
71 | |||
72 | - if (rdm->errored) | ||
73 | - return; | ||
74 | - | ||
75 | - if (rdm->verbose) | ||
76 | + if (!rdm->errored && rdm->verbose) | ||
77 | { | ||
78 | PRINT (": "); | ||
79 | PRINT (basic_type (ty_tag)); | ||
80 | } | ||
81 | + | ||
82 | + fail_return: | ||
83 | + rdm->errored = 1; | ||
84 | + pass_return: | ||
85 | + if (rdm->recursion != RUST_NO_RECURSION_LIMIT) | ||
86 | + -- rdm->recursion; | ||
87 | } | ||
88 | |||
89 | static void | ||
90 | -- | ||
91 | 2.31.1 | ||
92 | |||
diff --git a/meta/recipes-devtools/gcc/gcc/hardcoded-paths.patch b/meta/recipes-devtools/gcc/gcc/hardcoded-paths.patch deleted file mode 100644 index f3485858f4..0000000000 --- a/meta/recipes-devtools/gcc/gcc/hardcoded-paths.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | Avoid encoding build paths into sources used for floating point on powerpc. | ||
2 | (MACHINE=qemuppc bitbake libgcc). | ||
3 | |||
4 | Upstream-Status: Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2022-August/599882.html] | ||
5 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
6 | |||
7 | Index: gcc-12.1.0/libgcc/config/rs6000/t-float128 | ||
8 | =================================================================== | ||
9 | --- gcc-12.1.0.orig/libgcc/config/rs6000/t-float128 | ||
10 | +++ gcc-12.1.0/libgcc/config/rs6000/t-float128 | ||
11 | @@ -103,7 +103,7 @@ $(ibm128_dec_objs) : INTERNAL_CFLAGS += | ||
12 | $(fp128_softfp_src) : $(srcdir)/soft-fp/$(subst -sw,,$(subst kf,tf,$@)) $(fp128_dep) | ||
13 | @src="$(srcdir)/soft-fp/$(subst -sw,,$(subst kf,tf,$@))"; \ | ||
14 | echo "Create $@"; \ | ||
15 | - (echo "/* file created from $$src */"; \ | ||
16 | + (echo "/* file created from `basename $$src` */"; \ | ||
17 | echo; \ | ||
18 | sed -f $(fp128_sed) < $$src) > $@ | ||
19 | |||
diff --git a/meta/recipes-devtools/gcc/gcc/prefix-map-realpath.patch b/meta/recipes-devtools/gcc/gcc/prefix-map-realpath.patch deleted file mode 100644 index 7f1a2deec7..0000000000 --- a/meta/recipes-devtools/gcc/gcc/prefix-map-realpath.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | Relative paths don't work with -fdebug-prefix-map and friends. This | ||
2 | can lead to paths which the user wanted to be remapped being missed. | ||
3 | Setting -fdebug-prefix-map to work with a relative path isn't practical | ||
4 | either. | ||
5 | |||
6 | Instead, call gcc's realpath function on the incomming path name before | ||
7 | comparing it with the remapping. This means other issues like symlinks | ||
8 | are also accounted for and leads to a more consistent remapping experience. | ||
9 | |||
10 | Upstream-Status: Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2022-August/599885.html] | ||
11 | [Also https://gcc.gnu.org/pipermail/gcc-patches/2022-August/599884.html] | ||
12 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
13 | |||
14 | |||
15 | Index: gcc-12.1.0/gcc/file-prefix-map.cc | ||
16 | =================================================================== | ||
17 | --- gcc-12.1.0.orig/gcc/file-prefix-map.cc | ||
18 | +++ gcc-12.1.0/gcc/file-prefix-map.cc | ||
19 | @@ -70,19 +70,28 @@ remap_filename (file_prefix_map *maps, c | ||
20 | file_prefix_map *map; | ||
21 | char *s; | ||
22 | const char *name; | ||
23 | + char *realname; | ||
24 | size_t name_len; | ||
25 | |||
26 | + if (lbasename (filename) == filename) | ||
27 | + return filename; | ||
28 | + | ||
29 | + realname = lrealpath (filename); | ||
30 | + | ||
31 | for (map = maps; map; map = map->next) | ||
32 | - if (filename_ncmp (filename, map->old_prefix, map->old_len) == 0) | ||
33 | + if (filename_ncmp (realname, map->old_prefix, map->old_len) == 0) | ||
34 | break; | ||
35 | - if (!map) | ||
36 | + if (!map) { | ||
37 | + free (realname); | ||
38 | return filename; | ||
39 | - name = filename + map->old_len; | ||
40 | + } | ||
41 | + name = realname + map->old_len; | ||
42 | name_len = strlen (name) + 1; | ||
43 | |||
44 | s = (char *) ggc_alloc_atomic (name_len + map->new_len); | ||
45 | memcpy (s, map->new_prefix, map->new_len); | ||
46 | memcpy (s + map->new_len, name, name_len); | ||
47 | + free (realname); | ||
48 | return s; | ||
49 | } | ||
50 | |||
51 | Index: gcc-12.1.0/libcpp/macro.cc | ||
52 | =================================================================== | ||
53 | --- gcc-12.1.0.orig/libcpp/macro.cc | ||
54 | +++ gcc-12.1.0/libcpp/macro.cc | ||
55 | @@ -563,7 +563,7 @@ _cpp_builtin_macro_text (cpp_reader *pfi | ||
56 | if (!name) | ||
57 | abort (); | ||
58 | } | ||
59 | - if (pfile->cb.remap_filename) | ||
60 | + if (pfile->cb.remap_filename && !pfile->state.in_directive) | ||
61 | name = pfile->cb.remap_filename (name); | ||
62 | len = strlen (name); | ||
63 | buf = _cpp_unaligned_alloc (pfile, len * 2 + 3); | ||
diff --git a/meta/recipes-devtools/gcc/gcc_12.2.bb b/meta/recipes-devtools/gcc/gcc_13.1.bb index 255fe552bd..255fe552bd 100644 --- a/meta/recipes-devtools/gcc/gcc_12.2.bb +++ b/meta/recipes-devtools/gcc/gcc_13.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/libgcc-initial_12.2.bb b/meta/recipes-devtools/gcc/libgcc-initial_13.1.bb index a259082b47..a259082b47 100644 --- a/meta/recipes-devtools/gcc/libgcc-initial_12.2.bb +++ b/meta/recipes-devtools/gcc/libgcc-initial_13.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/libgcc_12.2.bb b/meta/recipes-devtools/gcc/libgcc_13.1.bb index f88963b0a4..f88963b0a4 100644 --- a/meta/recipes-devtools/gcc/libgcc_12.2.bb +++ b/meta/recipes-devtools/gcc/libgcc_13.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/libgfortran_12.2.bb b/meta/recipes-devtools/gcc/libgfortran_13.1.bb index 71dd8b4bdc..71dd8b4bdc 100644 --- a/meta/recipes-devtools/gcc/libgfortran_12.2.bb +++ b/meta/recipes-devtools/gcc/libgfortran_13.1.bb | |||