public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 484a90f677729b39cd3e299b6dfe58456abea758
Date: Mon, 02 Oct 2017 15:25:38 +0100	[thread overview]
Message-ID: <20171002142539.548EB1081BA6@git01.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 21204 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  484a90f677729b39cd3e299b6dfe58456abea758 (commit)
      from  202187a3ccbbb52ceef15fc1cd1030ac12db3db5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 484a90f677729b39cd3e299b6dfe58456abea758
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 2 15:24:59 2017 +0100

    binutils: Update to 2.29.1
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 binutils/binutils.nm                               |   2 +-
 .../binutils-2.23.52.0.1-addr2line-dynsymtab.patch |  38 --
 binutils/patches/binutils-2.26-lto.patch           | 425 +++++++--------------
 .../binutils-2.27-arm-aarch64-default-relro.patch  |  20 -
 4 files changed, 145 insertions(+), 340 deletions(-)
 delete mode 100644 binutils/patches/binutils-2.23.52.0.1-addr2line-dynsymtab.patch
 delete mode 100644 binutils/patches/binutils-2.27-arm-aarch64-default-relro.patch

Difference in files:
diff --git a/binutils/binutils.nm b/binutils/binutils.nm
index ea99bce..2d860b4 100644
--- a/binutils/binutils.nm
+++ b/binutils/binutils.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = binutils
-version    = 2.27
+version    = 2.29.1
 release    = 1
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
diff --git a/binutils/patches/binutils-2.23.52.0.1-addr2line-dynsymtab.patch b/binutils/patches/binutils-2.23.52.0.1-addr2line-dynsymtab.patch
deleted file mode 100644
index 944f4fd..0000000
--- a/binutils/patches/binutils-2.23.52.0.1-addr2line-dynsymtab.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/bfd/opncls.c	2013-03-14 11:25:30.338306122 +0000
-+++ b/bfd/opncls.c	2013-03-14 12:20:21.686397360 +0000
-@@ -1297,6 +1297,8 @@
-       bfd_malloc (strlen (debug_file_directory) + 1
-                   + (canon_dirlen > dirlen ? canon_dirlen : dirlen)
-                   + strlen (".debug/")
-+#define FEDORA_LIB_DEBUG_DIR "/usr/lib/debug/"
-+		  + strlen (FEDORA_LIB_DEBUG_DIR) + strlen ("usr/")
-                   + strlen (base)
-                   + 1);
-   if (debugfile == NULL)
-@@ -1332,6 +1334,26 @@
-   if (check_func (debugfile, crc32))
-     goto found;
- 
-+  /* Then try in the global debug dir for Fedora libraries.  */
-+  sprintf (debugfile, "%s%s%s", FEDORA_LIB_DEBUG_DIR, dir, base);
-+  if (separate_debug_file_exists (debugfile, crc32))
-+    {
-+      free (base);
-+      free (dir);
-+      free (canon_dir);
-+      return debugfile;
-+    }
-+
-+  /* Then try in the usr subdirectory of the global debug dir for Fedora libraries.  */
-+  sprintf (debugfile, "%s/usr%s%s", FEDORA_LIB_DEBUG_DIR, dir, base);
-+  if (separate_debug_file_exists (debugfile, crc32))
-+    {
-+      free (base);
-+      free (dir);
-+      free (canon_dir);
-+      return debugfile;
-+    }
-+  
-   /* Then try in the global debugfile directory.  */
-   strcpy (debugfile, debug_file_directory);
-   dirlen = strlen (debug_file_directory) - 1;
diff --git a/binutils/patches/binutils-2.26-lto.patch b/binutils/patches/binutils-2.26-lto.patch
index 567f909..abe74e8 100644
--- a/binutils/patches/binutils-2.26-lto.patch
+++ b/binutils/patches/binutils-2.26-lto.patch
@@ -76,16 +76,6 @@ diff -rup binutils-2.26.orig/bfd/bfd.c binutils-2.26/bfd/bfd.c
 diff -rup binutils-2.26.orig/bfd/bfd-in2.h binutils-2.26/bfd/bfd-in2.h
 --- binutils-2.26.orig/bfd/bfd-in2.h	2016-02-19 09:35:36.280000903 +0000
 +++ binutils-2.26/bfd/bfd-in2.h	2016-02-19 09:35:54.900106492 +0000
-@@ -1089,6 +1089,9 @@ struct bfd_section *bfd_create_gnu_debug
- bfd_boolean bfd_fill_in_gnu_debuglink_section
-    (bfd *abfd, struct bfd_section *sect, const char *filename);
- 
-+const char *bfd_extract_object_only_section
-+   (bfd *abfd);
-+
- /* Extracted from libbfd.c.  */
- 
- /* Byte swapping macros for user section data.  */
 @@ -1654,6 +1657,9 @@ extern asection _bfd_std_section[4];
  #define BFD_COM_SECTION_NAME "*COM*"
  #define BFD_IND_SECTION_NAME "*IND*"
@@ -233,79 +223,6 @@ diff -rup binutils-2.26.orig/bfd/format.c binutils-2.26/bfd/format.c
        /* File position has moved, BTW.  */
        return TRUE;
      }
-diff -rup binutils-2.26.orig/bfd/opncls.c binutils-2.26/bfd/opncls.c
---- binutils-2.26.orig/bfd/opncls.c	2016-02-19 09:35:36.281000909 +0000
-+++ binutils-2.26/bfd/opncls.c	2016-02-19 09:35:54.905106520 +0000
-@@ -1717,3 +1717,69 @@ bfd_fill_in_gnu_debuglink_section (bfd *
- 
-   return TRUE;
- }
-+
-+/*
-+FUNCTION
-+	bfd_extract_object_only_section
-+
-+SYNOPSIS
-+	const char *bfd_extract_object_only_section
-+	  (bfd *abfd);
-+
-+DESCRIPTION
-+
-+	Takes a @var{ABFD} and extract the .gnu_object_only section into
-+	a temporary file.
-+
-+RETURNS
-+	The name of the temporary file is returned if all is ok.
-+	Otherwise <<NULL>> is returned and bfd_error is set.
-+*/
-+
-+const char *
-+bfd_extract_object_only_section (bfd *abfd)
-+{
-+  asection *sec = abfd->object_only_section;
-+  const char *name;
-+  FILE *file;
-+  bfd_byte *memhunk = NULL;
-+  size_t off, size;
-+  bfd_error_type err;
-+
-+  /* Get a temporary object-only file.  */
-+  name = make_temp_file (".obj-only.o");
-+
-+  /* Open the object-only file.  */
-+  file = real_fopen (name, FOPEN_WB);
-+  if (!bfd_get_full_section_contents (abfd, sec, &memhunk))
-+    {
-+      err = bfd_get_error ();
-+
-+loser:
-+      free (memhunk);
-+      fclose (file);
-+      unlink (name);
-+      bfd_set_error (err);
-+      return NULL;
-+    }
-+
-+  off = 0;
-+  size = sec->size;
-+  while (off != size)
-+    {
-+      size_t written, nwrite = size - off;
-+
-+      written = fwrite (memhunk + off, 1, nwrite, file);
-+      if (written < nwrite && ferror (file))
-+	{
-+	  err = bfd_error_system_call;
-+	  goto loser;
-+	}
-+
-+      off += written;
-+    }
-+
-+  free (memhunk);
-+  fclose (file);
-+  return name;
-+}
 diff -rup binutils-2.26.orig/bfd/plugin.c binutils-2.26/bfd/plugin.c
 --- binutils-2.26.orig/bfd/plugin.c	2016-02-19 09:35:36.271000852 +0000
 +++ binutils-2.26/bfd/plugin.c	2016-02-19 09:35:54.905106520 +0000
@@ -651,40 +568,12 @@ diff -rup binutils-2.26.orig/ld/emultempl/alphaelf.em binutils-2.26/ld/emultempl
  }
  EOF
  
-diff -rup binutils-2.26.orig/ld/emultempl/armelf.em binutils-2.26/ld/emultempl/armelf.em
---- binutils-2.26.orig/ld/emultempl/armelf.em	2016-02-19 09:35:36.698003274 +0000
-+++ binutils-2.26/ld/emultempl/armelf.em	2016-02-19 09:35:54.914106571 +0000
-@@ -377,7 +377,7 @@ gld${EMULATION_NAME}_after_allocation (v
- }
- 
- static void
--gld${EMULATION_NAME}_finish (void)
-+arm_finish (void)
- {
-   struct bfd_link_hash_entry * h;
- 
-@@ -404,7 +404,7 @@ gld${EMULATION_NAME}_finish (void)
- 	}
-     }
- 
--  finish_default ();
-+  gld${EMULATION_NAME}_finish ();
- 
-   if (thumb_entry_symbol)
-     {
-@@ -730,5 +730,5 @@ LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=
- LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME}"_before_parse
- LDEMUL_SET_SYMBOLS=gld"${EMULATION_NAME}"_set_symbols
- 
- # Call the extra arm-elf function
--LDEMUL_FINISH=gld${EMULATION_NAME}_finish
-+LDEMUL_FINISH=arm_finish
 diff -rup binutils-2.26.orig/ld/emultempl/avrelf.em binutils-2.26/ld/emultempl/avrelf.em
 --- binutils-2.26.orig/ld/emultempl/avrelf.em	2016-02-19 09:35:36.698003274 +0000
 +++ binutils-2.26/ld/emultempl/avrelf.em	2016-02-19 09:35:54.915106577 +0000
 @@ -209,7 +209,7 @@ avr_finish (void)
-   else
-     elf_elfheader (abfd)->e_flags &= ~EF_AVR_LINKRELAX_PREPARED;
+ 	elf_elfheader (abfd)->e_flags &= ~EF_AVR_LINKRELAX_PREPARED;
+     }
  
 -  finish_default ();
 +  gld${EMULATION_NAME}_finish ();
@@ -703,7 +592,7 @@ diff -rup binutils-2.26.orig/ld/emultempl/elf32.em binutils-2.26/ld/emultempl/el
  
  if [ "x${USE_LIBPATH}" = xyes ] ; then
 @@ -1795,6 +1796,8 @@ output_rel_find (asection *sec, int isdy
-   return last;
+ 					  in->owner, in);
  }
  
 +static int orphan_init_done = 0;
@@ -809,33 +698,6 @@ diff -rup binutils-2.26.orig/ld/emultempl/ppc32elf.em binutils-2.26/ld/emultempl
  }
  
  EOF
-diff -rup binutils-2.26.orig/ld/emultempl/ppc64elf.em binutils-2.26/ld/emultempl/ppc64elf.em
---- binutils-2.26.orig/ld/emultempl/ppc64elf.em	2016-02-19 09:35:36.699003279 +0000
-+++ binutils-2.26/ld/emultempl/ppc64elf.em	2016-02-19 09:35:54.916106583 +0000
-@@ -562,7 +562,7 @@ gld${EMULATION_NAME}_after_allocation (v
- /* Final emulation specific call.  */
- 
- static void
--gld${EMULATION_NAME}_finish (void)
-+ppc_finish (void)
- {
-   char *msg = NULL;
-   char *line, *endline;
-@@ -594,7 +594,7 @@ gld${EMULATION_NAME}_finish (void)
-     free (msg);
- 
-   ppc64_elf_restore_symbols (&link_info);
--  finish_default ();
-+  gld${EMULATION_NAME}_finish ();
- }
- 
- 
-@@ -928,4 +928,4 @@ LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=
- LDEMUL_AFTER_OPEN=ppc_after_open
- LDEMUL_BEFORE_ALLOCATION=ppc_before_allocation
- LDEMUL_AFTER_ALLOCATION=gld${EMULATION_NAME}_after_allocation
--LDEMUL_FINISH=gld${EMULATION_NAME}_finish
-+LDEMUL_FINISH=ppc_finish
 diff -rup binutils-2.26.orig/ld/emultempl/spuelf.em binutils-2.26/ld/emultempl/spuelf.em
 --- binutils-2.26.orig/ld/emultempl/spuelf.em	2016-02-19 09:35:36.699003279 +0000
 +++ binutils-2.26/ld/emultempl/spuelf.em	2016-02-19 09:35:54.916106583 +0000
@@ -2403,154 +2265,155 @@ diff -rup binutils-2.26.orig/ld/scripttempl/pe.sc binutils-2.26/ld/scripttempl/p
    }
  
    .idata ${RELOCATING+BLOCK(__section_alignment__)} :
-diff -rup binutils-2.26.orig/ld/testsuite/ld-plugin/lto.exp binutils-2.26/ld/testsuite/ld-plugin/lto.exp
---- binutils-2.26.orig/ld/testsuite/ld-plugin/lto.exp	2016-02-19 09:35:36.807003892 +0000
-+++ binutils-2.26/ld/testsuite/ld-plugin/lto.exp	2016-02-19 09:36:15.450223025 +0000
-@@ -79,6 +79,15 @@ set lto_link_tests [list \
-   [list "Build liblto-3.a" \
-    "" "-flto $lto_fat" \
-    {lto-3b.c} {} "liblto-3.a"] \
-+  [list "Compile 4a" \
-+   "" "-flto $lto_fat" \
-+   {lto-4a.c} {} ""] \
-+  [list "Compile 4b" \
-+   "" "-O2" \
-+   {lto-4b.c} {} ""] \
-+  [list "Compile 4c" \
-+   "" "-O2" \
-+   {lto-4c.c} {} ""] \
-   [list "Compile 5a" \
-    "" "-flto $lto_fat" \
-    {lto-5a.c} {} ""] \
-@@ -94,6 +103,12 @@ set lto_link_tests [list \
-   [list "Compile 9" \
-    "" "-O2 -finline -flto" \
-    {lto-9.cc} {} "" "c++"] \
-+  [list "Compile 10a" \
-+   "" "-O2" \
-+   {lto-10a.c} {} ""] \
-+  [list "Compile 10b" \
-+   "" "-O2 -flto $lto_fat" \
-+   {lto-10b.c} {} ""] \
-   [list "Compile 11a" \
-    "" "-O -flto" \
-    {lto-11a.c} {} ""] \
-@@ -291,9 +306,21 @@ set lto_run_tests [list \
-   [list "LTO 3c" \
-    "-O2 -flto -fuse-linker-plugin tmpdir/lto-3a.o tmpdir/lto-3c.o -Wl,--whole-archive tmpdir/liblto-3.a -Wl,--no-whole-archive tmpdir/liblto-3.a" "" \
-    {dummy.c} "lto-3d.exe" "lto-3.out" "" "c"] \
-+  [list "LTO 4a" \
-+   "-O2 -flto -fuse-linker-plugin tmpdir/lto-4r-a.o" "" \
-+   {dummy.c} "lto-4a.exe" "lto-4.out" "" "c"] \
-+  [list "LTO 4c" \
-+   "-O2 -flto -fuse-linker-plugin tmpdir/lto-4r-c.o" "" \
-+   {dummy.c} "lto-4c.exe" "lto-4.out" "" "c"] \
-+  [list "LTO 4d" \
-+   "-O2 -flto -fuse-linker-plugin tmpdir/lto-4r-d.o" "" \
-+   {dummy.c} "lto-4d.exe" "lto-4.out" "" "c"] \
-   [list "LTO 5" \
-    "-O2 -flto -fuse-linker-plugin tmpdir/lto-5.o" "" \
-    {dummy.c} "lto-5.exe" "lto-5.out" "" "c"] \
-+  [list "LTO 10" \
-+   "-O2 -flto -fuse-linker-plugin tmpdir/lto-10.o" "" \
-+   {dummy.c} "lto-10.exe" "lto-10.out" "" "c"] \
-   [list "LTO 11" \
-    "-O -flto -fuse-linker-plugin tmpdir/liblto-11.a" "" \
-    {dummy.c} "lto-11.exe" "lto-11.out" "" "c"] \
-@@ -378,6 +405,15 @@ if { [is_elf_format] && [check_lto_share
-     }
- }
+--- binutils.orig/bfd/bfd-in2.h	2017-03-02 11:14:48.572979573 +0000
++++ binutils-2.28/bfd/bfd-in2.h	2017-03-02 11:21:39.828458555 +0000
+@@ -1118,6 +1118,9 @@ bfd_boolean bfd_fill_in_gnu_debuglink_se
  
-+set testname "Build liblto-4.a"
-+remote_file host delete "tmpdir/liblto-4.a"
-+set catch_output [run_host_cmd "$ar" "rc tmpdir/liblto-4.a tmpdir/lto-4a.o tmpdir/lto-4b.o tmpdir/lto-4c.o"]
-+if {![string match "" $catch_output]} {
-+    unresolved $testname
-+    restore_notify
-+    return
-+}
-+
- set testname "Build liblto-11.a"
- remote_file host delete "tmpdir/liblto-11.a"
- set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
-@@ -424,8 +460,30 @@ return
- # Run "ld -r" to generate inputs for complex LTO tests.
- run_dump_test "lto-3r"
- remote_exec host "mv" "tmpdir/dump tmpdir/lto-3.o"
-+run_dump_test "lto-4r-a"
-+remote_exec host "mv" "tmpdir/dump tmpdir/lto-4r-a.o"
-+run_dump_test "lto-4r-b"
-+remote_exec host "mv" "tmpdir/dump tmpdir/lto-4r-b.o"
-+run_dump_test "lto-4r-c"
-+remote_exec host "mv" "tmpdir/dump tmpdir/lto-4r-c.o"
-+run_dump_test "lto-4r-d"
-+remote_exec host "mv" "tmpdir/dump tmpdir/lto-4r-d.o"
- run_dump_test "lto-5r"
- remote_exec host "mv" "tmpdir/dump tmpdir/lto-5.o"
-+run_dump_test "lto-10r"
-+remote_exec host "mv" "tmpdir/dump tmpdir/lto-10.o"
-+set testname "nm mixed object"
-+set lto_plugin [run_host_cmd "$CC" "-print-prog-name=liblto_plugin.so tmpdir/lto-10.o"]
-+if { [ regexp "liblto_plugin.so" $lto_plugin ] } {
-+    set exec_output [run_host_cmd "$NM" "--plugin $lto_plugin tmpdir/lto-10.o"]
-+    if { [ regexp "T main" $exec_output ] } {
-+	pass $testname
-+    } {
-+	fail $testname
-+    }
-+} {
-+    fail $testname
-+ }
+ char *bfd_follow_build_id_debuglink (bfd *abfd, const char *dir);
  
- run_cc_link_tests $lto_link_symbol_tests
++const char *bfd_extract_object_only_section
++   (bfd *abfd);
++
+ /* Extracted from libbfd.c.  */
  
---- /dev/null	2016-08-19 08:03:37.292222041 +0100
-+++ binutils-2.27/ld/testsuite/ld-plugin/lto-4a.c	2016-08-19 12:14:15.685818046 +0100
-@@ -0,0 +1,7 @@
-+extern void foo(void);
+ /* Byte swapping macros for user section data.  */
+--- binutils.orig/bfd/opncls.c	2017-03-02 11:14:48.586979385 +0000
++++ binutils-2.28/bfd/opncls.c	2017-03-02 11:23:23.546065945 +0000
+@@ -1990,3 +1990,69 @@ bfd_follow_build_id_debuglink (bfd *abfd
+ 				   get_build_id_name,
+ 				   check_build_id_file, &build_id);
+ }
 +
-+int main(void)
-+{
-+  foo();
-+  return 0;
-+}
---- /dev/null	2016-08-19 08:03:37.292222041 +0100
-+++ binutils-2.27/ld/testsuite/ld-plugin/lto-4b.c	2016-08-19 12:14:19.603842115 +0100
-@@ -0,0 +1,9 @@
-+#include <stdio.h>
++/*
++FUNCTION
++	bfd_extract_object_only_section
 +
-+extern void bar (void);
++SYNOPSIS
++	const char *bfd_extract_object_only_section
++	  (bfd *abfd);
 +
-+void foo(void)
-+{
-+  bar ();
-+  printf ("hello foo\n");
-+}
---- /dev/null	2016-08-19 08:03:37.292222041 +0100
-+++ binutils-2.27/ld/testsuite/ld-plugin/lto-4c.c	2016-08-19 12:14:21.987856760 +0100
-@@ -0,0 +1,6 @@
-+#include <stdio.h>
++DESCRIPTION
 +
-+void bar (void)
-+{
-+  printf ("hello bar\n");
-+}
---- /dev/null	2016-08-19 08:03:37.292222041 +0100
-+++ binutils-2.27/ld/testsuite/ld-plugin/lto-10a.c	2016-08-19 12:14:27.670891671 +0100
-@@ -0,0 +1,6 @@
-+extern int foo(void);
++	Takes a @var{ABFD} and extract the .gnu_object_only section into
++	a temporary file.
 +
-+int main(void)
-+{
-+  return foo();
-+}
---- /dev/null	2016-08-19 08:03:37.292222041 +0100
-+++ binutils-2.27/ld/testsuite/ld-plugin/lto-10b.c	2016-08-19 12:14:33.380926748 +0100
-@@ -0,0 +1,7 @@
-+#include <stdio.h>
++RETURNS
++	The name of the temporary file is returned if all is ok.
++	Otherwise <<NULL>> is returned and bfd_error is set.
++*/
 +
-+int foo(void)
++const char *
++bfd_extract_object_only_section (bfd *abfd)
 +{
-+  printf ("hello\n");
-+  return 0;
++  asection *sec = abfd->object_only_section;
++  const char *name;
++  FILE *file;
++  bfd_byte *memhunk = NULL;
++  size_t off, size;
++  bfd_error_type err;
++
++  /* Get a temporary object-only file.  */
++  name = make_temp_file (".obj-only.o");
++
++  /* Open the object-only file.  */
++  file = _bfd_real_fopen (name, FOPEN_WB);
++  if (!bfd_get_full_section_contents (abfd, sec, &memhunk))
++    {
++      err = bfd_get_error ();
++
++loser:
++      free (memhunk);
++      fclose (file);
++      unlink (name);
++      bfd_set_error (err);
++      return NULL;
++    }
++
++  off = 0;
++  size = sec->size;
++  while (off != size)
++    {
++      size_t written, nwrite = size - off;
++
++      written = fwrite (memhunk + off, 1, nwrite, file);
++      if (written < nwrite && ferror (file))
++	{
++	  err = bfd_error_system_call;
++	  goto loser;
++	}
++
++      off += written;
++    }
++
++  free (memhunk);
++  fclose (file);
++  return name;
 +}
+--- binutils.orig/bfd/plugin.c	2017-03-02 11:37:31.572677260 +0000
++++ binutils-2.28/bfd/plugin.c	2017-03-02 11:40:35.246209573 +0000
+@@ -132,10 +132,10 @@ register_claim_file (ld_plugin_claim_fil
+ }
+ 
+ static asection bfd_plugin_fake_text_section
+-  = BFD_FAKE_SECTION (bfd_plugin_fake_text_section, 0, 0, ".text", 0);
++= BFD_FAKE_SECTION (bfd_plugin_fake_text_section, 0, ".text", 0, 0);
+ static asection bfd_plugin_fake_common_section
+-  = BFD_FAKE_SECTION (bfd_plugin_fake_common_section, SEC_IS_COMMON, 0,
+-		      NULL, 0);
++  = BFD_FAKE_SECTION (bfd_plugin_fake_common_section, 0,
++		      NULL, 0, SEC_IS_COMMON);
+ 
+ /* Get symbols from object only section.  */
+ 
+--- binutils.orig/ld/emultempl/armelf.em	2017-03-02 11:58:14.632981042 +0000
++++ binutils-2.28/ld/emultempl/armelf.em	2017-03-02 12:00:55.663819055 +0000
+@@ -414,7 +414,7 @@ gld${EMULATION_NAME}_after_allocation (v
+ }
+ 
+ static void
+-gld${EMULATION_NAME}_finish (void)
++arm_finish (void)
+ {
+   struct bfd_link_hash_entry * h;
+ 
+@@ -441,7 +441,7 @@ gld${EMULATION_NAME}_finish (void)
+ 	}
+     }
+ 
+-  finish_default ();
++  gld${EMULATION_NAME}_finish ();
+ 
+   if (params.thumb_entry_symbol)
+     {
+@@ -790,4 +790,4 @@ LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME
+ LDEMUL_SET_SYMBOLS=gld"${EMULATION_NAME}"_set_symbols
+ 
+ # Call the extra arm-elf function
+-LDEMUL_FINISH=gld${EMULATION_NAME}_finish
++LDEMUL_FINISH=arm_finish
+--- binutils.orig/ld/emultempl/ppc64elf.em	2017-03-02 11:58:14.632981042 +0000
++++ binutils-2.28/ld/emultempl/ppc64elf.em	2017-03-02 12:01:40.961210895 +0000
+@@ -561,7 +561,7 @@ gld${EMULATION_NAME}_after_allocation (v
+ /* Final emulation specific call.  */
+ 
+ static void
+-gld${EMULATION_NAME}_finish (void)
++ppc_finish (void)
+ {
+   char *msg = NULL;
+   char *line, *endline;
+@@ -592,7 +592,7 @@ gld${EMULATION_NAME}_finish (void)
+   if (msg != NULL)
+     free (msg);
+ 
+-  finish_default ();
++  gld${EMULATION_NAME}_finish ();
+ }
+ 
+ 
+@@ -926,4 +926,4 @@ LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=
+ LDEMUL_AFTER_OPEN=ppc_after_open
+ LDEMUL_BEFORE_ALLOCATION=ppc_before_allocation
+ LDEMUL_AFTER_ALLOCATION=gld${EMULATION_NAME}_after_allocation
+-LDEMUL_FINISH=gld${EMULATION_NAME}_finish
++LDEMUL_FINISH=ppc_finish
diff --git a/binutils/patches/binutils-2.27-arm-aarch64-default-relro.patch b/binutils/patches/binutils-2.27-arm-aarch64-default-relro.patch
deleted file mode 100644
index 296800e..0000000
--- a/binutils/patches/binutils-2.27-arm-aarch64-default-relro.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- binutils-2.27.orig/ld/emultempl/aarch64elf.em	2016-08-19 11:53:37.647284625 +0100
-+++ binutils-2.27/ld/emultempl/aarch64elf.em	2016-08-19 11:54:41.916673347 +0100
-@@ -43,6 +43,7 @@ gld${EMULATION_NAME}_before_parse (void)
-   input_flags.dynamic = ${DYNAMIC_LINK-TRUE};
-   config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
-   config.separate_code = `if test "x${SEPARATE_CODE}" = xyes ; then echo TRUE ; else echo FALSE ; fi`;
-+  link_info.relro = DEFAULT_LD_Z_RELRO;
- }
- 
- static void
---- binutils-2.27.orig/ld/emultempl/armelf.em	2016-08-19 11:53:37.647284625 +0100
-+++ binutils-2.27/ld/emultempl/armelf.em	2016-08-19 11:54:51.035728502 +0100
-@@ -52,6 +52,7 @@ gld${EMULATION_NAME}_before_parse (void)
-   input_flags.dynamic = ${DYNAMIC_LINK-TRUE};
-   config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
-   config.separate_code = `if test "x${SEPARATE_CODE}" = xyes ; then echo TRUE ; else echo FALSE ; fi`;
-+  link_info.relro = DEFAULT_LD_Z_RELRO;
- }
- 
- static void


hooks/post-receive
--
IPFire 3.x development tree

                 reply	other threads:[~2017-10-02 14:25 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171002142539.548EB1081BA6@git01.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox