diff --git a/meta/recipes-devtools/binutils/binutils-2.43.1.inc b/meta/recipes-devtools/binutils/binutils-2.43.1.inc index 94e7d7f7e6..4a8666b433 100644 --- a/meta/recipes-devtools/binutils/binutils-2.43.1.inc +++ b/meta/recipes-devtools/binutils/binutils-2.43.1.inc @@ -20,7 +20,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)" CVE_STATUS[CVE-2023-25584] = "cpe-incorrect: Applies only for version 2.40 and earlier" -SRCREV ?= "beb2cdbcda911764b2bed5e57921fe90493260bd" +SRCREV ?= "b82e2250574ef00faf7fcb1e95e14f22b1fa85af" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https" SRC_URI = "\ ${BINUTILS_GIT_URI} \ diff --git a/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch b/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch index b267e516b3..0c429d7f2c 100644 --- a/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch +++ b/meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch @@ -184,11 +184,11 @@ diff --git a/ld/ldfile.c b/ld/ldfile.c index 87be885d31a..86c8a5b267d 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c -@@ -344,6 +344,22 @@ ldfile_add_library_path (const char *name, enum search_dir_source source) - search_tail_ptr = &new_dirs->next; - } - -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES +@@ -319,6 +319,22 @@ + *search_tail_ptr = new_dirs; + search_tail_ptr = &new_dirs->next; + ++ #ifdef ENABLE_POISON_SYSTEM_DIRECTORIES + if (command_line.poison_system_directories + && ((!strncmp (name, "/lib", 4)) + || (!strncmp (name, "/usr/lib", 8)) @@ -204,9 +204,9 @@ index 87be885d31a..86c8a5b267d 100644 + } +#endif + - return new_dirs; - } - + /* If a directory is marked as honoring sysroot, prepend the sysroot path + now. */ + if (name[0] == '=') diff --git a/ld/ldlex.h b/ld/ldlex.h index defe3fcbbb9..aea75a25dc8 100644 --- a/ld/ldlex.h