Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from buildroot:master #311

Merged
merged 10 commits into from
Feb 4, 2025
6 changes: 6 additions & 0 deletions Config.in.legacy
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,12 @@ endif

comment "Legacy options removed in 2025.02"

config BR2_BINUTILS_VERSION_2_41_X
bool "binutils 2.41 has been removed"
select BR2_LEGACY
help
binutils 2.41 has been removed, use a newer version.

config BR2_TARGET_ROOTFS_EXT2_2r0
bool "ext2 rev0 support been removed"
select BR2_LEGACY
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 87551ade276aa0db86c4567b3ac219c4f979b538 Mon Sep 17 00:00:00 2001
From d5f66b0da8d1e0ed091bff65f8a4db10a82a5420 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Fri, 25 Dec 2015 11:38:13 +0100
Subject: [PATCH] sh-conf
Expand All @@ -20,10 +20,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 417fc5a970c..fa8ba331796 100755
index bbfb5979546..bcd95684ae1 100755
--- a/configure
+++ b/configure
@@ -4067,7 +4067,7 @@ case "${target}" in
@@ -4056,7 +4056,7 @@ case "${target}" in
nvptx*-*-*)
noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
;;
Expand All @@ -33,10 +33,10 @@ index 417fc5a970c..fa8ba331796 100755
sh*-*-elf)
;;
diff --git a/configure.ac b/configure.ac
index 3a1eb0357e5..d700c14ddf5 100644
index f9694cdf901..d6a3623ba50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1300,7 +1300,7 @@ case "${target}" in
@@ -1278,7 +1278,7 @@ case "${target}" in
nvptx*-*-*)
noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
;;
Expand All @@ -46,5 +46,5 @@ index 3a1eb0357e5..d700c14ddf5 100644
sh*-*-elf)
;;
--
2.40.1
2.48.1

Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
From a6d90a842e349545ceb27f022317618dd99378ce Mon Sep 17 00:00:00 2001
From 947a56b4ba73ec3fbf9c1fcff46d65754ba12e27 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Fri, 25 Dec 2015 11:45:38 +0100
Subject: [PATCH] poison-system-directories

Patch adapted to binutils 2.23.2 and extended to use
BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.

[Waldemar: rebase on top of 2.43]
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
[Waldemar: rebase on top of 2.39]
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
[Romain: rebase on top of 2.33.1]
Expand Down Expand Up @@ -74,17 +76,17 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
ld/configure.ac | 10 ++++++++++
ld/ld.h | 8 ++++++++
ld/ld.texi | 12 ++++++++++++
ld/ldfile.c | 17 +++++++++++++++++
ld/ldfile.c | 16 ++++++++++++++++
ld/ldlex.h | 2 ++
ld/ldmain.c | 2 ++
ld/lexsup.c | 21 +++++++++++++++++++++
9 files changed, 89 insertions(+)
9 files changed, 88 insertions(+)

diff --git a/ld/config.in b/ld/config.in
index ad0dc6a106c..d21edaddce7 100644
index 2d7b6406d2b..37cd12d20fa 100644
--- a/ld/config.in
+++ b/ld/config.in
@@ -58,6 +58,9 @@
@@ -78,6 +78,9 @@
language is requested. */
#undef ENABLE_NLS

Expand All @@ -95,18 +97,18 @@ index ad0dc6a106c..d21edaddce7 100644
#undef EXTRA_SHLIB_EXTENSION

diff --git a/ld/configure b/ld/configure
index 43b44be1dc6..28f054ea3f8 100755
index d3995b73c06..2317f06682e 100755
--- a/ld/configure
+++ b/ld/configure
@@ -839,6 +839,7 @@ with_lib_path
@@ -844,6 +844,7 @@ with_lib_path
enable_targets
enable_64_bit_bfd
with_sysroot
+enable_poison_system_directories
enable_gold
enable_got
enable_compressed_debug_sections
@@ -1521,6 +1522,8 @@ Optional Features:
@@ -1537,6 +1538,8 @@ Optional Features:
--enable-checking enable run-time checks
--enable-targets alternative target configurations
--enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)
Expand All @@ -115,7 +117,7 @@ index 43b44be1dc6..28f054ea3f8 100755
--enable-gold[=ARG] build gold [ARG={default,yes,no}]
--enable-got=<type> GOT handling scheme (target, single, negative,
multigot)
@@ -15504,7 +15507,18 @@ else
@@ -15592,7 +15595,18 @@ else
fi


Expand All @@ -135,10 +137,10 @@ index 43b44be1dc6..28f054ea3f8 100755
# Check whether --enable-got was given.
if test "${enable_got+set}" = set; then :
diff --git a/ld/configure.ac b/ld/configure.ac
index 77edac3258c..a74dac63038 100644
index 228f2ee4089..50a4b0f4db1 100644
--- a/ld/configure.ac
+++ b/ld/configure.ac
@@ -103,6 +103,16 @@ AC_SUBST(use_sysroot)
@@ -102,6 +102,16 @@ AC_SUBST(use_sysroot)
AC_SUBST(TARGET_SYSTEM_ROOT)
AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)

Expand All @@ -156,10 +158,10 @@ index 77edac3258c..a74dac63038 100644
dnl "install_as_default" is set to false if gold is the default linker.
dnl "installed_linker" is the installed BFD linker name.
diff --git a/ld/ld.h b/ld/ld.h
index 05649ff61b8..1818c227473 100644
index 254f0a097bb..daf777c65c8 100644
--- a/ld/ld.h
+++ b/ld/ld.h
@@ -163,6 +163,14 @@ typedef struct
@@ -166,6 +166,14 @@ typedef struct
in the linker script. */
bool force_group_allocation;

Expand All @@ -175,10 +177,10 @@ index 05649ff61b8..1818c227473 100644
enum endian_enum endian;

diff --git a/ld/ld.texi b/ld/ld.texi
index db3a9f09b45..9dacc934f80 100644
index f6384ad82dd..9d972ec9725 100644
--- a/ld/ld.texi
+++ b/ld/ld.texi
@@ -2949,6 +2949,18 @@ string identifying the original linked file does not change.
@@ -3263,6 +3263,18 @@ bit string identifying the original linked file does not change.
Passing @code{none} for @var{style} disables the setting from any
@code{--build-id} options earlier on the command line.

Expand All @@ -198,10 +200,10 @@ index db3a9f09b45..9dacc934f80 100644
@item --package-metadata=@var{JSON}
Request the creation of a @code{.note.package} ELF note section. The
diff --git a/ld/ldfile.c b/ld/ldfile.c
index b8fd4e5d8e0..1f1d8e23bc9 100644
index 12551504ae6..c6bfb98e522 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bool cmdline)
@@ -328,6 +328,22 @@ ldfile_add_library_path (const char *name, bool cmdline)
new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL);
else
new_dirs->name = xstrdup (name);
Expand All @@ -221,28 +223,27 @@ index b8fd4e5d8e0..1f1d8e23bc9 100644
+ "cross-compilation\n"), name);
+ }
+#endif
+
}

/* Try to open a BFD for a lang_input_statement. */
static void
diff --git a/ld/ldlex.h b/ld/ldlex.h
index 0538f0a06a1..d1de3aec23d 100644
index b8b7d6b6829..c4b91482452 100644
--- a/ld/ldlex.h
+++ b/ld/ldlex.h
@@ -166,6 +166,8 @@ enum option_values
@@ -171,6 +171,8 @@ enum option_values
OPTION_CTF_VARIABLES,
OPTION_NO_CTF_VARIABLES,
OPTION_CTF_SHARE_TYPES,
+ OPTION_NO_POISON_SYSTEM_DIRECTORIES,
+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
OPTION_WARN_EXECSTACK,
OPTION_NO_WARN_EXECSTACK,
OPTION_WARN_RWX_SEGMENTS,
OPTION_ERROR_EXECSTACK,
OPTION_NO_ERROR_EXECSTACK,
OPTION_WARN_EXECSTACK_OBJECTS,
diff --git a/ld/ldmain.c b/ld/ldmain.c
index 9290a189b0d..e2e3074e872 100644
index f1c5f7035c5..69dd2d89357 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -321,6 +321,8 @@ main (int argc, char **argv)
@@ -351,6 +351,8 @@ main (int argc, char **argv)
command_line.warn_mismatch = true;
command_line.warn_search_mismatch = true;
command_line.check_section_addresses = -1;
Expand All @@ -252,10 +253,10 @@ index 9290a189b0d..e2e3074e872 100644
/* We initialize DEMANGLING based on the environment variable
COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
diff --git a/ld/lexsup.c b/ld/lexsup.c
index c5960385572..da0a7829914 100644
index 5399aa45b72..a04346bee58 100644
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -613,6 +613,14 @@ static const struct ld_option ld_options[] =
@@ -650,6 +650,14 @@ static const struct ld_option ld_options[] =
" <method> is: share-unconflicted (default),\n"
" share-duplicated"),
TWO_DASHES },
Expand All @@ -270,15 +271,15 @@ index c5960385572..da0a7829914 100644
};

#define OPTION_COUNT ARRAY_SIZE (ld_options)
@@ -625,6 +633,7 @@ parse_args (unsigned argc, char **argv)
@@ -662,6 +670,7 @@ parse_args (unsigned argc, char **argv)
int ingroup = 0;
char *default_dirlist = NULL;
char *shortopts;
+ char *BR_paranoid_env;
struct option *longopts;
struct option *really_longopts;
int last_optind;
@@ -1692,6 +1701,14 @@ parse_args (unsigned argc, char **argv)
@@ -1789,6 +1798,14 @@ parse_args (unsigned argc, char **argv)
}
break;

Expand All @@ -293,7 +294,7 @@ index c5960385572..da0a7829914 100644
case OPTION_PUSH_STATE:
input_flags.pushed = xmemdup (&input_flags,
sizeof (input_flags),
@@ -1837,6 +1854,10 @@ parse_args (unsigned argc, char **argv)
@@ -1933,6 +1950,10 @@ parse_args (unsigned argc, char **argv)
command_line.soname = NULL;
}

Expand All @@ -305,5 +306,5 @@ index c5960385572..da0a7829914 100644
{
einfo (_("%P: missing --end-group; added as last command line option\n"));
--
2.40.1
2.48.1

Loading