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 -Date: Mon, 11 Jul 2022 22:03:14 +0200 -Subject: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream - -9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include to resolve fsconfig_command/mount_attr conflict with glibc 2.36 - -Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=2701442d0cf6292f6624443c15813d6d1a3562fe] -Signed-off-by: Khem Raj ---- - .../sanitizer_platform_limits_posix.cpp | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -index 8ed3e92d270..97fd07acf9d 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -73,7 +73,9 @@ - #include - #include - #include -+#if SANITIZER_ANDROID - #include -+#endif - #include - #include - #include -@@ -869,10 +871,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT; - unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT; - #endif -- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS; -- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION; -- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS; -- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION; -+ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long); -+ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long); -+ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long); -+ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long); - unsigned IOCTL_GIO_CMAP = GIO_CMAP; - unsigned IOCTL_GIO_FONT = GIO_FONT; - unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP; --- -2.37.1 - diff --git a/meta/recipes-devtools/gcc/gcc_12.1.bb b/meta/recipes-devtools/gcc/gcc_12.2.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc_12.1.bb rename to 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 similarity index 100% rename from meta/recipes-devtools/gcc/libgcc-initial_12.1.bb rename to 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 similarity index 100% rename from meta/recipes-devtools/gcc/libgcc_12.1.bb rename to 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 similarity index 100% rename from meta/recipes-devtools/gcc/libgfortran_12.1.bb rename to meta/recipes-devtools/gcc/libgfortran_12.2.bb