summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2021-07-06 08:00:56 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2021-07-06 08:02:43 +0100
commitda0c7a071390e6bda1d5fb8c31ce3ff37671db7e (patch)
tree52f9835e755f00d5b50305cd7a66790340cc2e1e
parent9999: refresh 0009-...-Pass-hash-style-sysv-...patch (diff)
downloadbinutils-patches-da0c7a071390e6bda1d5fb8c31ce3ff37671db7e.tar.gz
binutils-patches-da0c7a071390e6bda1d5fb8c31ce3ff37671db7e.tar.bz2
binutils-patches-da0c7a071390e6bda1d5fb8c31ce3ff37671db7e.zip
9999: refresh 0003-...-poisoned-system-direc-...patch
Closes: https://bugs.gentoo.org/800254 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-rw-r--r--9999/0003-Gentoo-gold-ld-add-support-for-poisoned-system-direc.patch28
1 files changed, 14 insertions, 14 deletions
diff --git a/9999/0003-Gentoo-gold-ld-add-support-for-poisoned-system-direc.patch b/9999/0003-Gentoo-gold-ld-add-support-for-poisoned-system-direc.patch
index 1446352..964946c 100644
--- a/9999/0003-Gentoo-gold-ld-add-support-for-poisoned-system-direc.patch
+++ b/9999/0003-Gentoo-gold-ld-add-support-for-poisoned-system-direc.patch
@@ -180,14 +180,14 @@ index 71fd781267..a6ea2ae69e 100644
+++ b/ld/ld.h
@@ -166,6 +166,13 @@ typedef struct
in the linker script. */
- bfd_boolean force_group_allocation;
+ bool force_group_allocation;
-+ /* If TRUE warn for uses of system directories when cross linking. */
-+ bfd_boolean warn_poison_system_directories;
++ /* If true warn for uses of system directories when cross linking. */
++ bool warn_poison_system_directories;
+
-+ /* If TRUE (default FALSE) give an error for uses of system
++ /* If true (default false) give an error for uses of system
+ directories when cross linking instead of a warning. */
-+ bfd_boolean error_poison_system_directories;
++ bool error_poison_system_directories;
+
/* Big or little endian as set on command line. */
enum endian_enum endian;
@@ -225,7 +225,7 @@ diff --git a/ld/ldfile.c b/ld/ldfile.c
index 53112c8694..eb357e66a9 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
-@@ -117,6 +117,26 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
+@@ -117,6 +117,26 @@ 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);
@@ -271,16 +271,16 @@ index c3f473f661..c45012dbbd 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -273,6 +273,13 @@ main (int argc, char **argv)
- command_line.warn_mismatch = TRUE;
- command_line.warn_search_mismatch = TRUE;
+ command_line.warn_mismatch = true;
+ command_line.warn_search_mismatch = true;
command_line.check_section_addresses = -1;
+ command_line.warn_poison_system_directories =
+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+ TRUE;
++ true;
+#else
-+ FALSE;
++ false;
+#endif
-+ command_line.error_poison_system_directories = FALSE;
++ command_line.error_poison_system_directories = false;
/* We initialize DEMANGLING based on the environment variable
COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
@@ -312,15 +312,15 @@ index c5edc25793..c20c0bb0d8 100644
break;
+ case OPTION_WARN_POISON_SYSTEM_DIRECTORIES:
-+ command_line.warn_poison_system_directories = TRUE;
++ command_line.warn_poison_system_directories = true;
+ break;
+
+ case OPTION_NO_WARN_POISON_SYSTEM_DIRECTORIES:
-+ command_line.warn_poison_system_directories = FALSE;
++ command_line.warn_poison_system_directories = false;
+ break;
+
+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
-+ command_line.error_poison_system_directories = TRUE;
++ command_line.error_poison_system_directories = true;
+ break;
+
case OPTION_PUSH_STATE: