diff options
| -rw-r--r-- | meta/recipes-devtools/binutils/binutils-2.43.1.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/binutils/binutils/0006-warn-for-uses-of-system-directories-when-cross-linki.patch | 16 |
2 files changed, 9 insertions, 9 deletions
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<pver>\d+_(\d_?)*)" | |||
| 20 | 20 | ||
| 21 | CVE_STATUS[CVE-2023-25584] = "cpe-incorrect: Applies only for version 2.40 and earlier" | 21 | CVE_STATUS[CVE-2023-25584] = "cpe-incorrect: Applies only for version 2.40 and earlier" |
| 22 | 22 | ||
| 23 | SRCREV ?= "beb2cdbcda911764b2bed5e57921fe90493260bd" | 23 | SRCREV ?= "b82e2250574ef00faf7fcb1e95e14f22b1fa85af" |
| 24 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https" | 24 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https" |
| 25 | SRC_URI = "\ | 25 | SRC_URI = "\ |
| 26 | ${BINUTILS_GIT_URI} \ | 26 | ${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 | |||
| 184 | index 87be885d31a..86c8a5b267d 100644 | 184 | index 87be885d31a..86c8a5b267d 100644 |
| 185 | --- a/ld/ldfile.c | 185 | --- a/ld/ldfile.c |
| 186 | +++ b/ld/ldfile.c | 186 | +++ b/ld/ldfile.c |
| 187 | @@ -344,6 +344,22 @@ ldfile_add_library_path (const char *name, enum search_dir_source source) | 187 | @@ -319,6 +319,22 @@ |
| 188 | search_tail_ptr = &new_dirs->next; | 188 | *search_tail_ptr = new_dirs; |
| 189 | } | 189 | search_tail_ptr = &new_dirs->next; |
| 190 | 190 | ||
| 191 | +#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES | 191 | + #ifdef ENABLE_POISON_SYSTEM_DIRECTORIES |
| 192 | + if (command_line.poison_system_directories | 192 | + if (command_line.poison_system_directories |
| 193 | + && ((!strncmp (name, "/lib", 4)) | 193 | + && ((!strncmp (name, "/lib", 4)) |
| 194 | + || (!strncmp (name, "/usr/lib", 8)) | 194 | + || (!strncmp (name, "/usr/lib", 8)) |
| @@ -204,9 +204,9 @@ index 87be885d31a..86c8a5b267d 100644 | |||
| 204 | + } | 204 | + } |
| 205 | +#endif | 205 | +#endif |
| 206 | + | 206 | + |
| 207 | return new_dirs; | 207 | /* If a directory is marked as honoring sysroot, prepend the sysroot path |
| 208 | } | 208 | now. */ |
| 209 | 209 | if (name[0] == '=') | |
| 210 | diff --git a/ld/ldlex.h b/ld/ldlex.h | 210 | diff --git a/ld/ldlex.h b/ld/ldlex.h |
| 211 | index defe3fcbbb9..aea75a25dc8 100644 | 211 | index defe3fcbbb9..aea75a25dc8 100644 |
| 212 | --- a/ld/ldlex.h | 212 | --- a/ld/ldlex.h |
