Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/toolchain/binutils-patches:master commit in: 9999/
Date: Tue, 06 Jul 2021 07:04:59
Message-Id: 1625554963.da0c7a071390e6bda1d5fb8c31ce3ff37671db7e.slyfox@gentoo
1 commit: da0c7a071390e6bda1d5fb8c31ce3ff37671db7e
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 6 07:00:56 2021 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 6 07:02:43 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/toolchain/binutils-patches.git/commit/?id=da0c7a07
7
8 9999: refresh 0003-...-poisoned-system-direc-...patch
9
10 Closes: https://bugs.gentoo.org/800254
11 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
12
13 ...-ld-add-support-for-poisoned-system-direc.patch | 28 +++++++++++-----------
14 1 file changed, 14 insertions(+), 14 deletions(-)
15
16 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
17 index 1446352..964946c 100644
18 --- a/9999/0003-Gentoo-gold-ld-add-support-for-poisoned-system-direc.patch
19 +++ b/9999/0003-Gentoo-gold-ld-add-support-for-poisoned-system-direc.patch
20 @@ -180,14 +180,14 @@ index 71fd781267..a6ea2ae69e 100644
21 +++ b/ld/ld.h
22 @@ -166,6 +166,13 @@ typedef struct
23 in the linker script. */
24 - bfd_boolean force_group_allocation;
25 + bool force_group_allocation;
26
27 -+ /* If TRUE warn for uses of system directories when cross linking. */
28 -+ bfd_boolean warn_poison_system_directories;
29 ++ /* If true warn for uses of system directories when cross linking. */
30 ++ bool warn_poison_system_directories;
31 +
32 -+ /* If TRUE (default FALSE) give an error for uses of system
33 ++ /* If true (default false) give an error for uses of system
34 + directories when cross linking instead of a warning. */
35 -+ bfd_boolean error_poison_system_directories;
36 ++ bool error_poison_system_directories;
37 +
38 /* Big or little endian as set on command line. */
39 enum endian_enum endian;
40 @@ -225,7 +225,7 @@ diff --git a/ld/ldfile.c b/ld/ldfile.c
41 index 53112c8694..eb357e66a9 100644
42 --- a/ld/ldfile.c
43 +++ b/ld/ldfile.c
44 -@@ -117,6 +117,26 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
45 +@@ -117,6 +117,26 @@ ldfile_add_library_path (const char *name, bool cmdline)
46 new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL);
47 else
48 new_dirs->name = xstrdup (name);
49 @@ -271,16 +271,16 @@ index c3f473f661..c45012dbbd 100644
50 --- a/ld/ldmain.c
51 +++ b/ld/ldmain.c
52 @@ -273,6 +273,13 @@ main (int argc, char **argv)
53 - command_line.warn_mismatch = TRUE;
54 - command_line.warn_search_mismatch = TRUE;
55 + command_line.warn_mismatch = true;
56 + command_line.warn_search_mismatch = true;
57 command_line.check_section_addresses = -1;
58 + command_line.warn_poison_system_directories =
59 +#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
60 -+ TRUE;
61 ++ true;
62 +#else
63 -+ FALSE;
64 ++ false;
65 +#endif
66 -+ command_line.error_poison_system_directories = FALSE;
67 ++ command_line.error_poison_system_directories = false;
68
69 /* We initialize DEMANGLING based on the environment variable
70 COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
71 @@ -312,15 +312,15 @@ index c5edc25793..c20c0bb0d8 100644
72 break;
73
74 + case OPTION_WARN_POISON_SYSTEM_DIRECTORIES:
75 -+ command_line.warn_poison_system_directories = TRUE;
76 ++ command_line.warn_poison_system_directories = true;
77 + break;
78 +
79 + case OPTION_NO_WARN_POISON_SYSTEM_DIRECTORIES:
80 -+ command_line.warn_poison_system_directories = FALSE;
81 ++ command_line.warn_poison_system_directories = false;
82 + break;
83 +
84 + case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
85 -+ command_line.error_poison_system_directories = TRUE;
86 ++ command_line.error_poison_system_directories = true;
87 + break;
88 +
89 case OPTION_PUSH_STATE: