diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-05-26 21:31:40 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2023-05-27 08:10:58 +0200 |
commit | 23eabb052ed2dd059de9c593513bdf3d0116ae11 (patch) | |
tree | b2470ff900110dffbf834588024731a3e2160c73 | |
parent | 03928c0294183535905ea769fa43a5b7b42ba524 (diff) | |
download | openembedded-core-contrib-23eabb052ed2dd059de9c593513bdf3d0116ae11.tar.gz |
gcc: upgrade to newer 13.1 snapshot
* needed for newer gcc on host which might already use GLIBCXX_3.4.32
ABI introduced in:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108969
backported to gcc-13 in:
https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=9c9061e0418ded473672069aac43b25f6fd491b8
included e.g. in gentoo 13.1.1_p20230520 causing e.g. ninja-native build failure:
| /OE/build/poky/build/tmp/work/x86_64-linux/ninja-native/1.11.1-r0/git/./configure.py:26: DeprecationWarning: 'pipes' is deprecated and slated for removal in Python 3.13
| import pipes
| re2c: /OE/build/poky/build/tmp/sysroots-uninative/x86_64-linux/usr/lib/libstdc++.so.6: version `GLIBCXX_3.4.32' not found (required by re2c)
| bootstrapping ninja...
| Traceback (most recent call last):
| File "/OE/build/poky/build/tmp/work/x86_64-linux/ninja-native/1.11.1-r0/git/./configure.py", line 480, in <module>
| if has_re2c():
| ^^^^^^^^^^
| File "/OE/build/poky/build/tmp/work/x86_64-linux/ninja-native/1.11.1-r0/git/./configure.py", line 477, in has_re2c
| return int(proc.communicate()[0], 10) >= 1103
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ValueError: invalid literal for int() with base 10: b''
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-13.1.inc | 18 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-13.1.inc b/meta/recipes-devtools/gcc/gcc-13.1.inc index d361b680f4..d50c8e1582 100644 --- a/meta/recipes-devtools/gcc/gcc-13.1.inc +++ b/meta/recipes-devtools/gcc/gcc-13.1.inc @@ -2,11 +2,11 @@ require gcc-common.inc # Third digit in PV should be incremented after a minor release -PV = "13.1.0" +PV = "13.1.1" # BINV should be incremented to a revision after a minor gcc release -BINV = "13.1.0" +BINV = "13.1.1" FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:" @@ -23,9 +23,9 @@ LIC_FILES_CHKSUM = "\ file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 \ " # snapshot from git -#RELEASE ?= "9b6bf076c11cba0f9ccdace63e8b4044b1a858ea" -#BASEURI ?= "https://git.linaro.org/toolchain/gcc.git/snapshot/gcc-${RELEASE}.tar.gz" -#SOURCEDIR = "gcc-${RELEASE}" +RELEASE ?= "845135fd7b3e023e6a264141e8befaeafcccdcbc" +BASEURI ?= "https://git.linaro.org/toolchain/gcc.git/snapshot/gcc-${RELEASE}.tar.gz" +SOURCEDIR = "gcc-${RELEASE}" #BASEURI ?= "https://repo.or.cz/official-gcc.git/snapshot/${RELEASE}.tar.gz;downloadfilename=gcc-${PV}-${RELEASE}.tar.gz" #SOURCEDIR ?= "official-gcc-${@'${RELEASE}'[0:7]}" @@ -35,9 +35,9 @@ LIC_FILES_CHKSUM = "\ #BASEURI ?= "https://gcc.gnu.org/pub/gcc/snapshots/${RELEASE}/gcc-${RELEASE}.tar.xz" # official release -RELEASE ?= "${PV}" -BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz" -SOURCEDIR ?= "gcc-${PV}" +#RELEASE ?= "${PV}" +#BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz" +#SOURCEDIR ?= "gcc-${PV}" SRC_URI = "${BASEURI} \ file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \ @@ -65,7 +65,7 @@ SRC_URI = "${BASEURI} \ file://0023-Fix-install-path-of-linux64.h.patch \ file://0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch \ " -SRC_URI[sha256sum] = "61d684f0aa5e76ac6585ad8898a2427aade8979ed5e7f85492286c4dfc13ee86" +SRC_URI[sha256sum] = "d4b5e1f416b53ad75bf22ab6435f7bce42cb94522659bfc0cd4051bd9320a064" S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}" B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" 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 a42a044142..b7bba9ffad 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 @@ -From ba2e308f7993099708ef3d8cbf2db5f134f08941 Mon Sep 17 00:00:00 2001 +From 607d3d8dd7ce69010c5143fafb3604de05767177 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 29 Mar 2013 09:24:50 +0400 Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER @@ -262,7 +262,7 @@ index 2ce097ebbce..1d45d7b4962 100644 #undef LINK_SPEC #define LINK_SPEC LINK_SPEC_ENDIAN \ diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h -index b9557a75dc7..e10ca1f97e7 100644 +index 2fdfd930cf2..213a2fec9db 100644 --- a/gcc/config/riscv/linux.h +++ b/gcc/config/riscv/linux.h @@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see @@ -281,8 +281,8 @@ index b9557a75dc7..e10ca1f97e7 100644 -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-riscv" XLEN_SPEC MUSL_ABI_SUFFIX ".so.1" +#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-riscv" XLEN_SPEC MUSL_ABI_SUFFIX ".so.1" - /* Because RISC-V only has word-sized atomics, it requries libatomic where - others do not. So link libatomic by default, as needed. */ + #define ICACHE_FLUSH_FUNC "__riscv_flush_icache" + diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h index 9e457033d11..2ddab7c99c1 100644 --- a/gcc/config/rs6000/linux64.h |