diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-11-28 10:20:10 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-29 11:22:09 +0000 |
commit | 94cc38623667ec0e044e63e6c9b9adf7ae13df0c (patch) | |
tree | 71a22d0ab62e3dfc417c8a49ecf8d9ca3362d0dd /meta/recipes-devtools/binutils/binutils/binutils-poison.patch | |
parent | c62bb97c72b990b1c30e2f4dcef67682685a360d (diff) | |
download | poky-94cc38623667ec0e044e63e6c9b9adf7ae13df0c.tar.gz |
binutils: upgrade from 2.21.1a to 2.22
And rebase the patches to the newer source code
This patch is upstream hence deleting it from the recipe.
binutils/110-arm-eabi-conf.patch
(From OE-Core rev: 715bcfe3701e5ee3e12ee4af9c868a9bbf441525)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/binutils-poison.patch')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/binutils-poison.patch | 84 |
1 files changed, 46 insertions, 38 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/binutils-poison.patch b/meta/recipes-devtools/binutils/binutils/binutils-poison.patch index 759aa88c59..7f81838f72 100644 --- a/meta/recipes-devtools/binutils/binutils/binutils-poison.patch +++ b/meta/recipes-devtools/binutils/binutils/binutils-poison.patch | |||
@@ -52,9 +52,10 @@ Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 | |||
52 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 52 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
53 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | 53 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
54 | 54 | ||
55 | diff -urN binutils-2.21.orig//ld/config.in binutils-2.21/ld/config.in | 55 | Index: binutils-2.22/ld/config.in |
56 | --- binutils-2.21.orig//ld/config.in 2010-11-05 03:34:27.000000000 -0700 | 56 | =================================================================== |
57 | +++ binutils-2.21/ld/config.in 2011-01-19 10:48:15.147301022 -0800 | 57 | --- binutils-2.22.orig/ld/config.in |
58 | +++ binutils-2.22/ld/config.in | ||
58 | @@ -4,6 +4,9 @@ | 59 | @@ -4,6 +4,9 @@ |
59 | language is requested. */ | 60 | language is requested. */ |
60 | #undef ENABLE_NLS | 61 | #undef ENABLE_NLS |
@@ -65,10 +66,11 @@ diff -urN binutils-2.21.orig//ld/config.in binutils-2.21/ld/config.in | |||
65 | /* Additional extension a shared object might have. */ | 66 | /* Additional extension a shared object might have. */ |
66 | #undef EXTRA_SHLIB_EXTENSION | 67 | #undef EXTRA_SHLIB_EXTENSION |
67 | 68 | ||
68 | diff -urN binutils-2.21.orig//ld/configure binutils-2.21/ld/configure | 69 | Index: binutils-2.22/ld/configure |
69 | --- binutils-2.21.orig//ld/configure 2011-01-19 10:46:46.997571921 -0800 | 70 | =================================================================== |
70 | +++ binutils-2.21/ld/configure 2011-01-19 11:03:50.577832729 -0800 | 71 | --- binutils-2.22.orig/ld/configure |
71 | @@ -768,6 +768,7 @@ | 72 | +++ binutils-2.22/ld/configure |
73 | @@ -776,6 +776,7 @@ with_lib_path | ||
72 | enable_targets | 74 | enable_targets |
73 | enable_64_bit_bfd | 75 | enable_64_bit_bfd |
74 | with_sysroot | 76 | with_sysroot |
@@ -76,7 +78,7 @@ diff -urN binutils-2.21.orig//ld/configure binutils-2.21/ld/configure | |||
76 | enable_gold | 78 | enable_gold |
77 | enable_got | 79 | enable_got |
78 | enable_werror | 80 | enable_werror |
79 | @@ -1418,6 +1419,8 @@ | 81 | @@ -1431,6 +1432,8 @@ Optional Features: |
80 | (and sometimes confusing) to the casual installer | 82 | (and sometimes confusing) to the casual installer |
81 | --enable-targets alternative target configurations | 83 | --enable-targets alternative target configurations |
82 | --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) | 84 | --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) |
@@ -85,7 +87,7 @@ diff -urN binutils-2.21.orig//ld/configure binutils-2.21/ld/configure | |||
85 | --enable-gold[=ARG] build gold [ARG={default,yes,no}] | 87 | --enable-gold[=ARG] build gold [ARG={default,yes,no}] |
86 | --enable-got=<type> GOT handling scheme (target, single, negative, | 88 | --enable-got=<type> GOT handling scheme (target, single, negative, |
87 | multigot) | 89 | multigot) |
88 | @@ -4203,7 +4206,18 @@ | 90 | @@ -4342,7 +4345,18 @@ else |
89 | fi | 91 | fi |
90 | 92 | ||
91 | 93 | ||
@@ -104,10 +106,11 @@ diff -urN binutils-2.21.orig//ld/configure binutils-2.21/ld/configure | |||
104 | 106 | ||
105 | # Check whether --enable-got was given. | 107 | # Check whether --enable-got was given. |
106 | if test "${enable_got+set}" = set; then : | 108 | if test "${enable_got+set}" = set; then : |
107 | diff -urN binutils-2.21.orig//ld/configure.in binutils-2.21/ld/configure.in | 109 | Index: binutils-2.22/ld/configure.in |
108 | --- binutils-2.21.orig//ld/configure.in 2010-11-23 05:50:32.000000000 -0800 | 110 | =================================================================== |
109 | +++ binutils-2.21/ld/configure.in 2011-01-19 10:50:57.378398946 -0800 | 111 | --- binutils-2.22.orig/ld/configure.in |
110 | @@ -69,6 +69,16 @@ | 112 | +++ binutils-2.22/ld/configure.in |
113 | @@ -70,6 +70,16 @@ AC_SUBST(use_sysroot) | ||
111 | AC_SUBST(TARGET_SYSTEM_ROOT) | 114 | AC_SUBST(TARGET_SYSTEM_ROOT) |
112 | AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) | 115 | AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) |
113 | 116 | ||
@@ -124,10 +127,11 @@ diff -urN binutils-2.21.orig//ld/configure.in binutils-2.21/ld/configure.in | |||
124 | dnl Use --enable-gold to decide if this linker should be the default. | 127 | 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. | 128 | dnl "install_as_default" is set to false if gold is the default linker. |
126 | dnl "installed_linker" is the installed BFD linker name. | 129 | 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 | 130 | Index: binutils-2.22/ld/ldfile.c |
128 | --- binutils-2.21.orig//ld/ldfile.c 2011-01-19 10:46:47.157553281 -0800 | 131 | =================================================================== |
129 | +++ binutils-2.21/ld/ldfile.c 2011-01-19 10:58:30.035468447 -0800 | 132 | --- binutils-2.22.orig/ld/ldfile.c |
130 | @@ -124,6 +124,23 @@ | 133 | +++ binutils-2.22/ld/ldfile.c |
134 | @@ -125,6 +125,23 @@ ldfile_add_library_path (const char *nam | ||
131 | { | 135 | { |
132 | new_dirs->name = xstrdup (name); | 136 | new_dirs->name = xstrdup (name); |
133 | new_dirs->sysrooted = is_sysrooted_pathname (name, FALSE); | 137 | new_dirs->sysrooted = is_sysrooted_pathname (name, FALSE); |
@@ -151,12 +155,13 @@ diff -urN binutils-2.21.orig//ld/ldfile.c binutils-2.21/ld/ldfile.c | |||
151 | } | 155 | } |
152 | } | 156 | } |
153 | 157 | ||
154 | diff -urN binutils-2.21.orig//ld/ld.h binutils-2.21/ld/ld.h | 158 | Index: binutils-2.22/ld/ld.h |
155 | --- binutils-2.21.orig//ld/ld.h 2009-11-26 05:45:25.000000000 -0800 | 159 | =================================================================== |
156 | +++ binutils-2.21/ld/ld.h 2011-01-19 10:52:54.814716478 -0800 | 160 | --- binutils-2.22.orig/ld/ld.h |
157 | @@ -198,6 +198,14 @@ | 161 | +++ binutils-2.22/ld/ld.h |
158 | input files. */ | 162 | @@ -203,6 +203,14 @@ typedef struct { |
159 | bfd_boolean accept_unknown_input_arch; | 163 | /* If TRUE we'll just print the default output on stdout. */ |
164 | bfd_boolean print_output_format; | ||
160 | 165 | ||
161 | + /* If TRUE (the default) warn for uses of system directories when | 166 | + /* If TRUE (the default) warn for uses of system directories when |
162 | + cross linking. */ | 167 | + cross linking. */ |
@@ -169,10 +174,11 @@ diff -urN binutils-2.21.orig//ld/ld.h binutils-2.21/ld/ld.h | |||
169 | /* Big or little endian as set on command line. */ | 174 | /* Big or little endian as set on command line. */ |
170 | enum endian_enum endian; | 175 | enum endian_enum endian; |
171 | 176 | ||
172 | diff -urN binutils-2.21.orig//ld/ldmain.c binutils-2.21/ld/ldmain.c | 177 | Index: binutils-2.22/ld/ldmain.c |
173 | --- binutils-2.21.orig//ld/ldmain.c 2010-11-05 00:20:07.000000000 -0700 | 178 | =================================================================== |
174 | +++ binutils-2.21/ld/ldmain.c 2011-01-19 10:59:18.579767697 -0800 | 179 | --- binutils-2.22.orig/ld/ldmain.c |
175 | @@ -259,6 +259,8 @@ | 180 | +++ binutils-2.22/ld/ldmain.c |
181 | @@ -259,6 +259,8 @@ main (int argc, char **argv) | ||
176 | command_line.warn_search_mismatch = TRUE; | 182 | command_line.warn_search_mismatch = TRUE; |
177 | command_line.check_section_addresses = -1; | 183 | command_line.check_section_addresses = -1; |
178 | command_line.disable_target_specific_optimizations = -1; | 184 | command_line.disable_target_specific_optimizations = -1; |
@@ -181,10 +187,11 @@ diff -urN binutils-2.21.orig//ld/ldmain.c binutils-2.21/ld/ldmain.c | |||
181 | 187 | ||
182 | /* We initialize DEMANGLING based on the environment variable | 188 | /* We initialize DEMANGLING based on the environment variable |
183 | COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the | 189 | 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 | 190 | Index: binutils-2.22/ld/ld.texinfo |
185 | --- binutils-2.21.orig//ld/ld.texinfo 2010-10-28 04:40:26.000000000 -0700 | 191 | =================================================================== |
186 | +++ binutils-2.21/ld/ld.texinfo 2011-01-19 10:56:04.452567113 -0800 | 192 | --- binutils-2.22.orig/ld/ld.texinfo |
187 | @@ -2133,6 +2133,18 @@ | 193 | +++ binutils-2.22/ld/ld.texinfo |
194 | @@ -2147,6 +2147,18 @@ string identifying the original linked f | ||
188 | 195 | ||
189 | Passing @code{none} for @var{style} disables the setting from any | 196 | Passing @code{none} for @var{style} disables the setting from any |
190 | @code{--build-id} options earlier on the command line. | 197 | @code{--build-id} options earlier on the command line. |
@@ -203,19 +210,20 @@ diff -urN binutils-2.21.orig//ld/ld.texinfo binutils-2.21/ld/ld.texinfo | |||
203 | @end table | 210 | @end table |
204 | 211 | ||
205 | @c man end | 212 | @c man end |
206 | diff -urN binutils-2.21.orig//ld/lexsup.c binutils-2.21/ld/lexsup.c | 213 | Index: binutils-2.22/ld/lexsup.c |
207 | --- binutils-2.21.orig//ld/lexsup.c 2010-10-27 23:45:33.000000000 -0700 | 214 | =================================================================== |
208 | +++ binutils-2.21/ld/lexsup.c 2011-01-19 11:02:07.799898432 -0800 | 215 | --- binutils-2.22.orig/ld/lexsup.c |
209 | @@ -175,6 +175,8 @@ | 216 | +++ binutils-2.22/ld/lexsup.c |
210 | OPTION_PLUGIN_OPT, | 217 | @@ -176,6 +176,8 @@ enum option_values |
211 | #endif /* ENABLE_PLUGINS */ | 218 | #endif /* ENABLE_PLUGINS */ |
212 | OPTION_DEFAULT_SCRIPT, | 219 | OPTION_DEFAULT_SCRIPT, |
220 | OPTION_PRINT_OUTPUT_FORMAT, | ||
213 | + OPTION_NO_POISON_SYSTEM_DIRECTORIES, | 221 | + OPTION_NO_POISON_SYSTEM_DIRECTORIES, |
214 | + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES | 222 | + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES |
215 | }; | 223 | }; |
216 | 224 | ||
217 | /* The long options. This structure is used for both the option | 225 | /* The long options. This structure is used for both the option |
218 | @@ -603,6 +605,14 @@ | 226 | @@ -612,6 +614,14 @@ static const struct ld_option ld_options |
219 | TWO_DASHES }, | 227 | TWO_DASHES }, |
220 | { {"wrap", required_argument, NULL, OPTION_WRAP}, | 228 | { {"wrap", required_argument, NULL, OPTION_WRAP}, |
221 | '\0', N_("SYMBOL"), N_("Use wrapper functions for SYMBOL"), TWO_DASHES }, | 229 | '\0', N_("SYMBOL"), N_("Use wrapper functions for SYMBOL"), TWO_DASHES }, |
@@ -230,7 +238,7 @@ diff -urN binutils-2.21.orig//ld/lexsup.c binutils-2.21/ld/lexsup.c | |||
230 | }; | 238 | }; |
231 | 239 | ||
232 | #define OPTION_COUNT ARRAY_SIZE (ld_options) | 240 | #define OPTION_COUNT ARRAY_SIZE (ld_options) |
233 | @@ -1518,6 +1528,14 @@ | 241 | @@ -1541,6 +1551,14 @@ parse_args (unsigned argc, char **argv) |
234 | einfo (_("%P%X: --hash-size needs a numeric argument\n")); | 242 | einfo (_("%P%X: --hash-size needs a numeric argument\n")); |
235 | } | 243 | } |
236 | break; | 244 | break; |