From 2be79f0b1d0d53b8750d28013543b7ee853c1b42 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 8 Jan 2015 00:11:40 -0800 Subject: binutils: upgrade to 2.25 * Remove the following patches since they are already in the new code: binutils/fix-pr15815.patch binutils/fix-pr16428.patch binutils/fix-pr16476.patch binutils/fix-pr2404.patch binutils/replace_macros_with_static_inline.patch binutils/binutils_CVE-2014-8484.patch binutils/binutils_CVE-2014-8485.patch binutils/binutils_CVE-2014-8501.patch binutils/binutils_CVE-2014-8502.patch binutils/binutils_CVE-2014-8502_1.patch binutils/binutils_CVE-2014-8503.patch binutils/binutils_CVE-2014-8504.patch binutils/binutils_CVE-2014-8737.patch * The file src-release is gone. * Updated patches for the new code. (From OE-Core rev: a8446ea78daa5875de43eb5bcccd8f536ea07e1c) Signed-off-by: Robert Yang Signed-off-by: Khem Raj Conflicts: meta/conf/distro/include/tcmode-default.inc Signed-off-by: Richard Purdie --- .../binutils/binutils/binutils-poison.patch | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'meta/recipes-devtools/binutils/binutils/binutils-poison.patch') diff --git a/meta/recipes-devtools/binutils/binutils/binutils-poison.patch b/meta/recipes-devtools/binutils/binutils/binutils-poison.patch index 996c023810..eb540766dc 100644 --- a/meta/recipes-devtools/binutils/binutils/binutils-poison.patch +++ b/meta/recipes-devtools/binutils/binutils/binutils-poison.patch @@ -106,10 +106,10 @@ Index: binutils-2.24/ld/configure # Check whether --enable-got was given. if test "${enable_got+set}" = set; then : -Index: binutils-2.24/ld/configure.in +Index: binutils-2.24/ld/configure.ac =================================================================== ---- binutils-2.24.orig/ld/configure.in 2013-12-15 11:46:17.000000000 -0800 -+++ binutils-2.24/ld/configure.in 2013-12-15 11:46:59.810435651 -0800 +--- binutils-2.24.orig/ld/configure.ac 2013-12-15 11:46:17.000000000 -0800 ++++ binutils-2.24/ld/configure.ac 2013-12-15 11:46:59.810435651 -0800 @@ -87,6 +87,16 @@ AC_SUBST(TARGET_SYSTEM_ROOT) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) @@ -214,10 +214,10 @@ Index: binutils-2.24/ld/lexsup.c =================================================================== --- binutils-2.24.orig/ld/lexsup.c 2013-12-15 11:46:17.000000000 -0800 +++ binutils-2.24/ld/lexsup.c 2013-12-15 11:49:28.950434490 -0800 -@@ -507,6 +507,14 @@ - OPTION_IGNORE_UNRESOLVED_SYMBOL}, - '\0', N_("SYMBOL"), - N_("Unresolved SYMBOL will not cause an error or warning"), TWO_DASHES }, +@@ -513,6 +513,14 @@ static const struct ld_option ld_options[] = + { {"pop-state", no_argument, NULL, OPTION_POP_STATE}, + '\0', NULL, N_("Pop state of flags governing input file handling"), + TWO_DASHES }, + { {"no-poison-system-directories", no_argument, NULL, + OPTION_NO_POISON_SYSTEM_DIRECTORIES}, + '\0', NULL, N_("Do not warn for -L options using system directories"), @@ -229,18 +229,18 @@ Index: binutils-2.24/ld/lexsup.c }; #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -1442,6 +1450,14 @@ - einfo (_("%P%X: --hash-size needs a numeric argument\n")); - } - break; +@@ -1474,6 +1482,14 @@ parse_args (unsigned argc, char **argv) + free (oldp); + } + break; + -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = FALSE; ++ break; + -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = TRUE; ++ break; } } @@ -248,10 +248,10 @@ Index: binutils-2.24/ld/ldlex.h =================================================================== --- binutils-2.24.orig/ld/ldlex.h 2013-12-15 11:46:17.000000000 -0800 +++ binutils-2.24/ld/ldlex.h 2013-12-15 11:47:43.230435299 -0800 -@@ -138,6 +138,8 @@ - OPTION_DEFAULT_SCRIPT, - OPTION_PRINT_OUTPUT_FORMAT, +@@ -140,6 +140,8 @@ enum option_values OPTION_IGNORE_UNRESOLVED_SYMBOL, + OPTION_PUSH_STATE, + OPTION_POP_STATE, + OPTION_NO_POISON_SYSTEM_DIRECTORIES, + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, }; -- cgit v1.2.3-54-g00ecf