summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/maintainers.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-12.2.inc (renamed from meta/recipes-devtools/gcc/gcc-12.1.inc)7
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian_12.2.bb (renamed from meta/recipes-devtools/gcc/gcc-cross-canadian_12.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross_12.2.bb (renamed from meta/recipes-devtools/gcc/gcc-cross_12.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk_12.2.bb (renamed from meta/recipes-devtools/gcc/gcc-crosssdk_12.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime_12.2.bb (renamed from meta/recipes-devtools/gcc/gcc-runtime_12.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-sanitizers_12.2.bb (renamed from meta/recipes-devtools/gcc/gcc-sanitizers_12.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc-source_12.2.bb (renamed from meta/recipes-devtools/gcc/gcc-source_12.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/gcc/0001-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch45
-rw-r--r--meta/recipes-devtools/gcc/gcc_12.2.bb (renamed from meta/recipes-devtools/gcc/gcc_12.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgcc-initial_12.2.bb (renamed from meta/recipes-devtools/gcc/libgcc-initial_12.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgcc_12.2.bb (renamed from meta/recipes-devtools/gcc/libgcc_12.1.bb)0
-rw-r--r--meta/recipes-devtools/gcc/libgfortran_12.2.bb (renamed from meta/recipes-devtools/gcc/libgfortran_12.1.bb)0
13 files changed, 4 insertions, 50 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index c0c38dfc16..47b3e8148e 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -188,7 +188,7 @@ RECIPE_MAINTAINER:pn-gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj <r
188RECIPE_MAINTAINER:pn-gcc-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>" 188RECIPE_MAINTAINER:pn-gcc-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>"
189RECIPE_MAINTAINER:pn-gcc-runtime = "Khem Raj <raj.khem@gmail.com>" 189RECIPE_MAINTAINER:pn-gcc-runtime = "Khem Raj <raj.khem@gmail.com>"
190RECIPE_MAINTAINER:pn-gcc-sanitizers = "Khem Raj <raj.khem@gmail.com>" 190RECIPE_MAINTAINER:pn-gcc-sanitizers = "Khem Raj <raj.khem@gmail.com>"
191RECIPE_MAINTAINER:pn-gcc-source-12.1.0 = "Khem Raj <raj.khem@gmail.com>" 191RECIPE_MAINTAINER:pn-gcc-source-12.2.0 = "Khem Raj <raj.khem@gmail.com>"
192RECIPE_MAINTAINER:pn-gconf = "Ross Burton <ross.burton@arm.com>" 192RECIPE_MAINTAINER:pn-gconf = "Ross Burton <ross.burton@arm.com>"
193RECIPE_MAINTAINER:pn-gcr = "Alexander Kanavin <alex.kanavin@gmail.com>" 193RECIPE_MAINTAINER:pn-gcr = "Alexander Kanavin <alex.kanavin@gmail.com>"
194RECIPE_MAINTAINER:pn-gdb = "Khem Raj <raj.khem@gmail.com>" 194RECIPE_MAINTAINER:pn-gdb = "Khem Raj <raj.khem@gmail.com>"
diff --git a/meta/recipes-devtools/gcc/gcc-12.1.inc b/meta/recipes-devtools/gcc/gcc-12.2.inc
index 488e0c95b1..572fd8b669 100644
--- a/meta/recipes-devtools/gcc/gcc-12.1.inc
+++ b/meta/recipes-devtools/gcc/gcc-12.2.inc
@@ -2,11 +2,11 @@ require gcc-common.inc
2 2
3# Third digit in PV should be incremented after a minor release 3# Third digit in PV should be incremented after a minor release
4 4
5PV = "12.1.0" 5PV = "12.2.0"
6 6
7# BINV should be incremented to a revision after a minor gcc release 7# BINV should be incremented to a revision after a minor gcc release
8 8
9BINV = "12.1.0" 9BINV = "12.2.0"
10 10
11FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:" 11FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:"
12 12
@@ -64,11 +64,10 @@ SRC_URI = "${BASEURI} \
64 file://0024-Fix-install-path-of-linux64.h.patch \ 64 file://0024-Fix-install-path-of-linux64.h.patch \
65 file://0025-Move-sched.h-include-ahead-of-user-headers.patch \ 65 file://0025-Move-sched.h-include-ahead-of-user-headers.patch \
66 file://0026-rust-recursion-limit.patch \ 66 file://0026-rust-recursion-limit.patch \
67 file://0001-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch \
68 file://prefix-map-realpath.patch \ 67 file://prefix-map-realpath.patch \
69 file://hardcoded-paths.patch \ 68 file://hardcoded-paths.patch \
70" 69"
71SRC_URI[sha256sum] = "62fd634889f31c02b64af2c468f064b47ad1ca78411c45abe6ac4b5f8dd19c7b" 70SRC_URI[sha256sum] = "e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff"
72 71
73S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}" 72S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}"
74B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" 73B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_12.1.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_12.2.bb
index bf53c5cd78..bf53c5cd78 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_12.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_12.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross_12.1.bb b/meta/recipes-devtools/gcc/gcc-cross_12.2.bb
index b43cca0c52..b43cca0c52 100644
--- a/meta/recipes-devtools/gcc/gcc-cross_12.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross_12.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_12.1.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_12.2.bb
index 40a6c4feff..40a6c4feff 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk_12.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk_12.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_12.1.bb b/meta/recipes-devtools/gcc/gcc-runtime_12.2.bb
index dd430b57eb..dd430b57eb 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime_12.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-runtime_12.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_12.1.bb b/meta/recipes-devtools/gcc/gcc-sanitizers_12.2.bb
index 8bda2ccad6..8bda2ccad6 100644
--- a/meta/recipes-devtools/gcc/gcc-sanitizers_12.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-sanitizers_12.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-source_12.1.bb b/meta/recipes-devtools/gcc/gcc-source_12.2.bb
index b890fa33ea..b890fa33ea 100644
--- a/meta/recipes-devtools/gcc/gcc-source_12.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-source_12.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc/0001-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch b/meta/recipes-devtools/gcc/gcc/0001-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch
deleted file mode 100644
index 6bbc95aa00..0000000000
--- a/meta/recipes-devtools/gcc/gcc/0001-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 2701442d0cf6292f6624443c15813d6d1a3562fe Mon Sep 17 00:00:00 2001
2From: Martin Liska <mliska@suse.cz>
3Date: Mon, 11 Jul 2022 22:03:14 +0200
4Subject: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream
5
69cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
7
8Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=2701442d0cf6292f6624443c15813d6d1a3562fe]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 .../sanitizer_platform_limits_posix.cpp | 10 ++++++----
12 1 file changed, 6 insertions(+), 4 deletions(-)
13
14diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
15index 8ed3e92d270..97fd07acf9d 100644
16--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
17+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
18@@ -73,7 +73,9 @@
19 #include <sys/vt.h>
20 #include <linux/cdrom.h>
21 #include <linux/fd.h>
22+#if SANITIZER_ANDROID
23 #include <linux/fs.h>
24+#endif
25 #include <linux/hdreg.h>
26 #include <linux/input.h>
27 #include <linux/ioctl.h>
28@@ -869,10 +871,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
29 unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
30 unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
31 #endif
32- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
33- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
34- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
35- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
36+ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
37+ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
38+ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
39+ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
40 unsigned IOCTL_GIO_CMAP = GIO_CMAP;
41 unsigned IOCTL_GIO_FONT = GIO_FONT;
42 unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
43--
442.37.1
45
diff --git a/meta/recipes-devtools/gcc/gcc_12.1.bb b/meta/recipes-devtools/gcc/gcc_12.2.bb
index 255fe552bd..255fe552bd 100644
--- a/meta/recipes-devtools/gcc/gcc_12.1.bb
+++ b/meta/recipes-devtools/gcc/gcc_12.2.bb
diff --git a/meta/recipes-devtools/gcc/libgcc-initial_12.1.bb b/meta/recipes-devtools/gcc/libgcc-initial_12.2.bb
index a259082b47..a259082b47 100644
--- a/meta/recipes-devtools/gcc/libgcc-initial_12.1.bb
+++ b/meta/recipes-devtools/gcc/libgcc-initial_12.2.bb
diff --git a/meta/recipes-devtools/gcc/libgcc_12.1.bb b/meta/recipes-devtools/gcc/libgcc_12.2.bb
index f88963b0a4..f88963b0a4 100644
--- a/meta/recipes-devtools/gcc/libgcc_12.1.bb
+++ b/meta/recipes-devtools/gcc/libgcc_12.2.bb
diff --git a/meta/recipes-devtools/gcc/libgfortran_12.1.bb b/meta/recipes-devtools/gcc/libgfortran_12.2.bb
index 71dd8b4bdc..71dd8b4bdc 100644
--- a/meta/recipes-devtools/gcc/libgfortran_12.1.bb
+++ b/meta/recipes-devtools/gcc/libgfortran_12.2.bb