diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/binutils-poison.patch')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/binutils-poison.patch | 247 |
1 files changed, 247 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-poison.patch b/meta/recipes-devtools/binutils/binutils/binutils-poison.patch new file mode 100644 index 0000000000..759aa88c59 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/binutils-poison.patch | |||
@@ -0,0 +1,247 @@ | |||
1 | Upstream-Status: Inappropriate [distribution: codesourcery] | ||
2 | |||
3 | Patch originally created by Mark Hatle, forward-ported to | ||
4 | binutils 2.21 by Scott Garman. | ||
5 | |||
6 | purpose: warn for uses of system directories when cross linking | ||
7 | |||
8 | Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 | ||
9 | |||
10 | 2008-07-02 Joseph Myers <joseph@codesourcery.com> | ||
11 | |||
12 | ld/ | ||
13 | * ld.h (args_type): Add error_poison_system_directories. | ||
14 | * ld.texinfo (--error-poison-system-directories): Document. | ||
15 | * ldfile.c (ldfile_add_library_path): Check | ||
16 | command_line.error_poison_system_directories. | ||
17 | * ldmain.c (main): Initialize | ||
18 | command_line.error_poison_system_directories. | ||
19 | * lexsup.c (enum option_values): Add | ||
20 | OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. | ||
21 | (ld_options): Add --error-poison-system-directories. | ||
22 | (parse_args): Handle new option. | ||
23 | |||
24 | 2007-06-13 Joseph Myers <joseph@codesourcery.com> | ||
25 | |||
26 | ld/ | ||
27 | * config.in: Regenerate. | ||
28 | * ld.h (args_type): Add poison_system_directories. | ||
29 | * ld.texinfo (--no-poison-system-directories): Document. | ||
30 | * ldfile.c (ldfile_add_library_path): Check | ||
31 | command_line.poison_system_directories. | ||
32 | * ldmain.c (main): Initialize | ||
33 | command_line.poison_system_directories. | ||
34 | * lexsup.c (enum option_values): Add | ||
35 | OPTION_NO_POISON_SYSTEM_DIRECTORIES. | ||
36 | (ld_options): Add --no-poison-system-directories. | ||
37 | (parse_args): Handle new option. | ||
38 | |||
39 | 2007-04-20 Joseph Myers <joseph@codesourcery.com> | ||
40 | |||
41 | Merge from Sourcery G++ binutils 2.17: | ||
42 | |||
43 | 2007-03-20 Joseph Myers <joseph@codesourcery.com> | ||
44 | Based on patch by Mark Hatle <mark.hatle@windriver.com>. | ||
45 | ld/ | ||
46 | * configure.in (--enable-poison-system-directories): New option. | ||
47 | * configure, config.in: Regenerate. | ||
48 | * ldfile.c (ldfile_add_library_path): If | ||
49 | ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, | ||
50 | /usr/lib, /usr/local/lib or /usr/X11R6/lib. | ||
51 | |||
52 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
53 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
54 | |||
55 | diff -urN binutils-2.21.orig//ld/config.in binutils-2.21/ld/config.in | ||
56 | --- binutils-2.21.orig//ld/config.in 2010-11-05 03:34:27.000000000 -0700 | ||
57 | +++ binutils-2.21/ld/config.in 2011-01-19 10:48:15.147301022 -0800 | ||
58 | @@ -4,6 +4,9 @@ | ||
59 | language is requested. */ | ||
60 | #undef ENABLE_NLS | ||
61 | |||
62 | +/* Define to warn for use of native system library directories */ | ||
63 | +#undef ENABLE_POISON_SYSTEM_DIRECTORIES | ||
64 | + | ||
65 | /* Additional extension a shared object might have. */ | ||
66 | #undef EXTRA_SHLIB_EXTENSION | ||
67 | |||
68 | diff -urN binutils-2.21.orig//ld/configure binutils-2.21/ld/configure | ||
69 | --- binutils-2.21.orig//ld/configure 2011-01-19 10:46:46.997571921 -0800 | ||
70 | +++ binutils-2.21/ld/configure 2011-01-19 11:03:50.577832729 -0800 | ||
71 | @@ -768,6 +768,7 @@ | ||
72 | enable_targets | ||
73 | enable_64_bit_bfd | ||
74 | with_sysroot | ||
75 | +enable_poison_system_directories | ||
76 | enable_gold | ||
77 | enable_got | ||
78 | enable_werror | ||
79 | @@ -1418,6 +1419,8 @@ | ||
80 | (and sometimes confusing) to the casual installer | ||
81 | --enable-targets alternative target configurations | ||
82 | --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) | ||
83 | + --enable-poison-system-directories | ||
84 | + warn for use of native system library directories | ||
85 | --enable-gold[=ARG] build gold [ARG={default,yes,no}] | ||
86 | --enable-got=<type> GOT handling scheme (target, single, negative, | ||
87 | multigot) | ||
88 | @@ -4203,7 +4206,18 @@ | ||
89 | fi | ||
90 | |||
91 | |||
92 | +# Check whether --enable-poison-system-directories was given. | ||
93 | +if test "${enable_poison_system_directories+set}" = set; then : | ||
94 | + enableval=$enable_poison_system_directories; | ||
95 | +else | ||
96 | + enable_poison_system_directories=no | ||
97 | +fi | ||
98 | + | ||
99 | +if test "x${enable_poison_system_directories}" = "xyes"; then | ||
100 | |||
101 | +$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h | ||
102 | + | ||
103 | +fi | ||
104 | |||
105 | # Check whether --enable-got was given. | ||
106 | if test "${enable_got+set}" = set; then : | ||
107 | diff -urN binutils-2.21.orig//ld/configure.in binutils-2.21/ld/configure.in | ||
108 | --- binutils-2.21.orig//ld/configure.in 2010-11-23 05:50:32.000000000 -0800 | ||
109 | +++ binutils-2.21/ld/configure.in 2011-01-19 10:50:57.378398946 -0800 | ||
110 | @@ -69,6 +69,16 @@ | ||
111 | AC_SUBST(TARGET_SYSTEM_ROOT) | ||
112 | AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) | ||
113 | |||
114 | +AC_ARG_ENABLE([poison-system-directories], | ||
115 | + AS_HELP_STRING([--enable-poison-system-directories], | ||
116 | + [warn for use of native system library directories]),, | ||
117 | + [enable_poison_system_directories=no]) | ||
118 | +if test "x${enable_poison_system_directories}" = "xyes"; then | ||
119 | + AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], | ||
120 | + [1], | ||
121 | + [Define to warn for use of native system library directories]) | ||
122 | +fi | ||
123 | + | ||
124 | dnl Use --enable-gold to decide if this linker should be the default. | ||
125 | dnl "install_as_default" is set to false if gold is the default linker. | ||
126 | dnl "installed_linker" is the installed BFD linker name. | ||
127 | diff -urN binutils-2.21.orig//ld/ldfile.c binutils-2.21/ld/ldfile.c | ||
128 | --- binutils-2.21.orig//ld/ldfile.c 2011-01-19 10:46:47.157553281 -0800 | ||
129 | +++ binutils-2.21/ld/ldfile.c 2011-01-19 10:58:30.035468447 -0800 | ||
130 | @@ -124,6 +124,23 @@ | ||
131 | { | ||
132 | new_dirs->name = xstrdup (name); | ||
133 | new_dirs->sysrooted = is_sysrooted_pathname (name, FALSE); | ||
134 | + | ||
135 | +#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES | ||
136 | + if (command_line.poison_system_directories | ||
137 | + && ((!strncmp (name, "/lib", 4)) | ||
138 | + || (!strncmp (name, "/usr/lib", 8)) | ||
139 | + || (!strncmp (name, "/usr/local/lib", 14)) | ||
140 | + || (!strncmp (name, "/usr/X11R6/lib", 14)))) | ||
141 | + { | ||
142 | + if (command_line.error_poison_system_directories) | ||
143 | + einfo (_("%X%P: error: library search path \"%s\" is unsafe for " | ||
144 | + "cross-compilation\n"), name); | ||
145 | + else | ||
146 | + einfo (_("%P: warning: library search path \"%s\" is unsafe for " | ||
147 | + "cross-compilation\n"), name); | ||
148 | + } | ||
149 | +#endif | ||
150 | + | ||
151 | } | ||
152 | } | ||
153 | |||
154 | diff -urN binutils-2.21.orig//ld/ld.h binutils-2.21/ld/ld.h | ||
155 | --- binutils-2.21.orig//ld/ld.h 2009-11-26 05:45:25.000000000 -0800 | ||
156 | +++ binutils-2.21/ld/ld.h 2011-01-19 10:52:54.814716478 -0800 | ||
157 | @@ -198,6 +198,14 @@ | ||
158 | input files. */ | ||
159 | bfd_boolean accept_unknown_input_arch; | ||
160 | |||
161 | + /* If TRUE (the default) warn for uses of system directories when | ||
162 | + cross linking. */ | ||
163 | + bfd_boolean poison_system_directories; | ||
164 | + | ||
165 | + /* If TRUE (default FALSE) give an error for uses of system | ||
166 | + directories when cross linking instead of a warning. */ | ||
167 | + bfd_boolean error_poison_system_directories; | ||
168 | + | ||
169 | /* Big or little endian as set on command line. */ | ||
170 | enum endian_enum endian; | ||
171 | |||
172 | diff -urN binutils-2.21.orig//ld/ldmain.c binutils-2.21/ld/ldmain.c | ||
173 | --- binutils-2.21.orig//ld/ldmain.c 2010-11-05 00:20:07.000000000 -0700 | ||
174 | +++ binutils-2.21/ld/ldmain.c 2011-01-19 10:59:18.579767697 -0800 | ||
175 | @@ -259,6 +259,8 @@ | ||
176 | command_line.warn_search_mismatch = TRUE; | ||
177 | command_line.check_section_addresses = -1; | ||
178 | command_line.disable_target_specific_optimizations = -1; | ||
179 | + command_line.poison_system_directories = TRUE; | ||
180 | + command_line.error_poison_system_directories = FALSE; | ||
181 | |||
182 | /* We initialize DEMANGLING based on the environment variable | ||
183 | COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the | ||
184 | diff -urN binutils-2.21.orig//ld/ld.texinfo binutils-2.21/ld/ld.texinfo | ||
185 | --- binutils-2.21.orig//ld/ld.texinfo 2010-10-28 04:40:26.000000000 -0700 | ||
186 | +++ binutils-2.21/ld/ld.texinfo 2011-01-19 10:56:04.452567113 -0800 | ||
187 | @@ -2133,6 +2133,18 @@ | ||
188 | |||
189 | Passing @code{none} for @var{style} disables the setting from any | ||
190 | @code{--build-id} options earlier on the command line. | ||
191 | + | ||
192 | +@kindex --no-poison-system-directories | ||
193 | +@item --no-poison-system-directories | ||
194 | +Do not warn for @option{-L} options using system directories such as | ||
195 | +@file{/usr/lib} when cross linking. This option is intended for use | ||
196 | +in chroot environments when such directories contain the correct | ||
197 | +libraries for the target system rather than the host. | ||
198 | + | ||
199 | +@kindex --error-poison-system-directories | ||
200 | +@item --error-poison-system-directories | ||
201 | +Give an error instead of a warning for @option{-L} options using | ||
202 | +system directories when cross linking. | ||
203 | @end table | ||
204 | |||
205 | @c man end | ||
206 | diff -urN binutils-2.21.orig//ld/lexsup.c binutils-2.21/ld/lexsup.c | ||
207 | --- binutils-2.21.orig//ld/lexsup.c 2010-10-27 23:45:33.000000000 -0700 | ||
208 | +++ binutils-2.21/ld/lexsup.c 2011-01-19 11:02:07.799898432 -0800 | ||
209 | @@ -175,6 +175,8 @@ | ||
210 | OPTION_PLUGIN_OPT, | ||
211 | #endif /* ENABLE_PLUGINS */ | ||
212 | OPTION_DEFAULT_SCRIPT, | ||
213 | + OPTION_NO_POISON_SYSTEM_DIRECTORIES, | ||
214 | + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES | ||
215 | }; | ||
216 | |||
217 | /* The long options. This structure is used for both the option | ||
218 | @@ -603,6 +605,14 @@ | ||
219 | TWO_DASHES }, | ||
220 | { {"wrap", required_argument, NULL, OPTION_WRAP}, | ||
221 | '\0', N_("SYMBOL"), N_("Use wrapper functions for SYMBOL"), TWO_DASHES }, | ||
222 | + { {"no-poison-system-directories", no_argument, NULL, | ||
223 | + OPTION_NO_POISON_SYSTEM_DIRECTORIES}, | ||
224 | + '\0', NULL, N_("Do not warn for -L options using system directories"), | ||
225 | + TWO_DASHES }, | ||
226 | + { {"error-poison-system-directories", no_argument, NULL, | ||
227 | + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, | ||
228 | + '\0', NULL, N_("Give an error for -L options using system directories"), | ||
229 | + TWO_DASHES }, | ||
230 | }; | ||
231 | |||
232 | #define OPTION_COUNT ARRAY_SIZE (ld_options) | ||
233 | @@ -1518,6 +1528,14 @@ | ||
234 | einfo (_("%P%X: --hash-size needs a numeric argument\n")); | ||
235 | } | ||
236 | break; | ||
237 | + | ||
238 | + case OPTION_NO_POISON_SYSTEM_DIRECTORIES: | ||
239 | + command_line.poison_system_directories = FALSE; | ||
240 | + break; | ||
241 | + | ||
242 | + case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: | ||
243 | + command_line.error_poison_system_directories = TRUE; | ||
244 | + break; | ||
245 | } | ||
246 | } | ||
247 | |||