diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2010-09-30 15:03:59 -0500 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-10-01 16:32:19 +0100 |
commit | 4a193307092267547386a6c0801c0ccd65e88c39 (patch) | |
tree | d43077b67b454cfa428a4fe1a950ec56a2699c71 | |
parent | 23f522e7a53821a8fb036e1aebddc7379d6f584e (diff) | |
download | poky-4a193307092267547386a6c0801c0ccd65e88c39.tar.gz |
binutils: Update the poison patch
[BUGID #374]
Previously the poison directories patch was present, but not enabled due
to the lack of the configure option being set, and also the fact configure
itself was not being patched.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-2.20.1/binutils-poison.patch | 128 | ||||
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-cross.inc | 3 |
2 files changed, 86 insertions, 45 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-poison.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-poison.patch index aefd3c3727..c2f19276f8 100644 --- a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-poison.patch +++ b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-poison.patch | |||
@@ -4,50 +4,50 @@ purpose: warn for uses of system directories when cross linking | |||
4 | 4 | ||
5 | Signed-Off-By: Mark Hatle <mark.hatle@windriver.com> | 5 | Signed-Off-By: Mark Hatle <mark.hatle@windriver.com> |
6 | 6 | ||
7 | Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 | 7 | Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 |
8 | 8 | ||
9 | 2008-07-02 Joseph Myers <joseph@codesourcery.com> | 9 | 2008-07-02 Joseph Myers <joseph@codesourcery.com> |
10 | 10 | ||
11 | ld/ | 11 | ld/ |
12 | * ld.h (args_type): Add error_poison_system_directories. | 12 | * ld.h (args_type): Add error_poison_system_directories. |
13 | * ld.texinfo (--error-poison-system-directories): Document. | 13 | * ld.texinfo (--error-poison-system-directories): Document. |
14 | * ldfile.c (ldfile_add_library_path): Check | 14 | * ldfile.c (ldfile_add_library_path): Check |
15 | command_line.error_poison_system_directories. | 15 | command_line.error_poison_system_directories. |
16 | * ldmain.c (main): Initialize | 16 | * ldmain.c (main): Initialize |
17 | command_line.error_poison_system_directories. | 17 | command_line.error_poison_system_directories. |
18 | * lexsup.c (enum option_values): Add | 18 | * lexsup.c (enum option_values): Add |
19 | OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. | 19 | OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. |
20 | (ld_options): Add --error-poison-system-directories. | 20 | (ld_options): Add --error-poison-system-directories. |
21 | (parse_args): Handle new option. | 21 | (parse_args): Handle new option. |
22 | 22 | ||
23 | 2007-06-13 Joseph Myers <joseph@codesourcery.com> | 23 | 2007-06-13 Joseph Myers <joseph@codesourcery.com> |
24 | 24 | ||
25 | ld/ | 25 | ld/ |
26 | * config.in: Regenerate. | 26 | * config.in: Regenerate. |
27 | * ld.h (args_type): Add poison_system_directories. | 27 | * ld.h (args_type): Add poison_system_directories. |
28 | * ld.texinfo (--no-poison-system-directories): Document. | 28 | * ld.texinfo (--no-poison-system-directories): Document. |
29 | * ldfile.c (ldfile_add_library_path): Check | 29 | * ldfile.c (ldfile_add_library_path): Check |
30 | command_line.poison_system_directories. | 30 | command_line.poison_system_directories. |
31 | * ldmain.c (main): Initialize | 31 | * ldmain.c (main): Initialize |
32 | command_line.poison_system_directories. | 32 | command_line.poison_system_directories. |
33 | * lexsup.c (enum option_values): Add | 33 | * lexsup.c (enum option_values): Add |
34 | OPTION_NO_POISON_SYSTEM_DIRECTORIES. | 34 | OPTION_NO_POISON_SYSTEM_DIRECTORIES. |
35 | (ld_options): Add --no-poison-system-directories. | 35 | (ld_options): Add --no-poison-system-directories. |
36 | (parse_args): Handle new option. | 36 | (parse_args): Handle new option. |
37 | 37 | ||
38 | 2007-04-20 Joseph Myers <joseph@codesourcery.com> | 38 | 2007-04-20 Joseph Myers <joseph@codesourcery.com> |
39 | 39 | ||
40 | Merge from Sourcery G++ binutils 2.17: | 40 | Merge from Sourcery G++ binutils 2.17: |
41 | 41 | ||
42 | 2007-03-20 Joseph Myers <joseph@codesourcery.com> | 42 | 2007-03-20 Joseph Myers <joseph@codesourcery.com> |
43 | Based on patch by Mark Hatle <mark.hatle@windriver.com>. | 43 | Based on patch by Mark Hatle <mark.hatle@windriver.com>. |
44 | ld/ | 44 | ld/ |
45 | * configure.in (--enable-poison-system-directories): New option. | 45 | * configure.in (--enable-poison-system-directories): New option. |
46 | * configure, config.in: Regenerate. | 46 | * configure, config.in: Regenerate. |
47 | * ldfile.c (ldfile_add_library_path): If | 47 | * ldfile.c (ldfile_add_library_path): If |
48 | ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, | 48 | ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, |
49 | /usr/lib, /usr/local/lib or /usr/X11R6/lib. | 49 | /usr/lib, /usr/local/lib or /usr/X11R6/lib. |
50 | 50 | ||
51 | Index: binutils-2.20.1/ld/config.in | 51 | Index: binutils-2.20.1/ld/config.in |
52 | =================================================================== | 52 | =================================================================== |
53 | --- binutils-2.20.1.orig/ld/config.in | 53 | --- binutils-2.20.1.orig/ld/config.in |
@@ -211,3 +211,43 @@ Index: binutils-2.20.1/ld/lexsup.c | |||
211 | } | 211 | } |
212 | } | 212 | } |
213 | 213 | ||
214 | diff -ur binutils-2.20.1.orig/ld/configure binutils-2.20.1/ld/configure | ||
215 | --- binutils-2.20.1.orig/ld/configure 2010-03-03 08:06:22.000000000 -0600 | ||
216 | +++ binutils-2.20.1/ld/configure 2010-09-30 11:19:35.776990594 -0500 | ||
217 | @@ -901,6 +904,7 @@ | ||
218 | enable_targets | ||
219 | enable_64_bit_bfd | ||
220 | with_sysroot | ||
221 | +enable_poison_system_directories | ||
222 | enable_got | ||
223 | enable_werror | ||
224 | enable_build_warnings | ||
225 | @@ -1548,6 +1552,8 @@ | ||
226 | (and sometimes confusing) to the casual installer | ||
227 | --enable-targets alternative target configurations | ||
228 | --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) | ||
229 | + --enable-poison-system-directories | ||
230 | + warn for use of native system library directories | ||
231 | --enable-got=<type> GOT handling scheme (target, single, negative, | ||
232 | multigot) | ||
233 | --enable-werror treat compile warnings as errors | ||
234 | @@ -4302,6 +4334,19 @@ | ||
235 | |||
236 | |||
237 | |||
238 | +# Check whether --enable-poison-system-directories was given. | ||
239 | +if test "${enable_poison_system_directories+set}" = set; then : | ||
240 | + enableval=$enable_poison_system_directories; | ||
241 | +else | ||
242 | + enable_poison_system_directories=no | ||
243 | +fi | ||
244 | + | ||
245 | +if test "x${enable_poison_system_directories}" = "xyes"; then | ||
246 | + | ||
247 | +$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h | ||
248 | + | ||
249 | +fi | ||
250 | + | ||
251 | # Check whether --enable-got was given. | ||
252 | if test "${enable_got+set}" = set; then : | ||
253 | enableval=$enable_got; case "${enableval}" in | ||
diff --git a/meta/recipes-devtools/binutils/binutils-cross.inc b/meta/recipes-devtools/binutils/binutils-cross.inc index 4eeb6584c9..8c75e4ffe7 100644 --- a/meta/recipes-devtools/binutils/binutils-cross.inc +++ b/meta/recipes-devtools/binutils/binutils-cross.inc | |||
@@ -4,7 +4,8 @@ PROVIDES = "virtual/${TARGET_PREFIX}binutils" | |||
4 | EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \ | 4 | EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \ |
5 | --program-prefix=${TARGET_PREFIX} \ | 5 | --program-prefix=${TARGET_PREFIX} \ |
6 | --disable-install-libbfd \ | 6 | --disable-install-libbfd \ |
7 | --disable-werror" | 7 | --disable-werror \ |
8 | --enable-poison-system-directories" | ||
8 | 9 | ||
9 | do_install () { | 10 | do_install () { |
10 | oe_runmake 'DESTDIR=${D}' install | 11 | oe_runmake 'DESTDIR=${D}' install |