summary refs log tree commit diff
path: root/pkgs/development/tools/misc/binutils
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2019-01-22 06:11:11 -0600
committerWill Dietz <w@wdtz.org>2019-01-22 06:36:15 -0600
commitaee77e66bb17673d97727c03ea4f5a14fab3d106 (patch)
tree23c9ea88dec1718c51d5451256cfc83b70b59acb /pkgs/development/tools/misc/binutils
parentbf0a0d424bb8089c7335bd410080dc6ada02c26a (diff)
downloadnixpkgs-aee77e66bb17673d97727c03ea4f5a14fab3d106.tar
nixpkgs-aee77e66bb17673d97727c03ea4f5a14fab3d106.tar.gz
nixpkgs-aee77e66bb17673d97727c03ea4f5a14fab3d106.tar.bz2
nixpkgs-aee77e66bb17673d97727c03ea4f5a14fab3d106.tar.lz
nixpkgs-aee77e66bb17673d97727c03ea4f5a14fab3d106.tar.xz
nixpkgs-aee77e66bb17673d97727c03ea4f5a14fab3d106.tar.zst
nixpkgs-aee77e66bb17673d97727c03ea4f5a14fab3d106.zip
binutils: drop changelog portions of patches, so they apply
Diffstat (limited to 'pkgs/development/tools/misc/binutils')
-rw-r--r--pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch50
-rw-r--r--pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch32
-rw-r--r--pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch61
3 files changed, 0 insertions, 143 deletions
diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch b/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
index 2245d6696b2..5a047b0f070 100644
--- a/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
+++ b/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
@@ -52,9 +52,7 @@ ld/
 
 (cherry picked from commit 241e64e3b42cd9eba514b8e0ad2ef39a337f10a5)
 ---
- bfd/ChangeLog                                |  8 +++
  bfd/elfxx-x86.c                              | 60 ++++++++++++++-----
- ld/ChangeLog                                 | 24 ++++++++
  ld/testsuite/ld-elf/linux-x86.S              | 63 ++++++++++++++++++++
  ld/testsuite/ld-elf/linux-x86.exp            | 46 ++++++++++++++
  ld/testsuite/ld-elf/pr23428.c                | 43 +++++++++++++
@@ -77,22 +75,6 @@ ld/
  create mode 100644 ld/testsuite/ld-elf/linux-x86.exp
  create mode 100644 ld/testsuite/ld-elf/pr23428.c
 
-diff --git a/bfd/ChangeLog b/bfd/ChangeLog
-index 1c1174aef8..d3831b7a65 100644
---- a/bfd/ChangeLog
-+++ b/bfd/ChangeLog
-@@ -1,3 +1,11 @@
-+2018-07-23  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR ld/23428
-+	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the
-+	separate code program header is needed, make sure that the first
-+	read-only PT_LOAD segment has no code by adding a
-+	GNU_PROPERTY_X86_ISA_1_USED note.
-+
- 2018-07-18  Nick Clifton  <nickc@redhat.com>
- 
- 	* development.sh: Set to true.
 diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
 index a2497aab86..2e4ff88f1f 100644
 --- a/bfd/elfxx-x86.c
@@ -187,38 +169,6 @@ index a2497aab86..2e4ff88f1f 100644
    htab->r_info = init_table->r_info;
    htab->r_sym = init_table->r_sym;
  
-diff --git a/ld/ChangeLog b/ld/ChangeLog
-index c07e442c84..cfadbd43a1 100644
---- a/ld/ChangeLog
-+++ b/ld/ChangeLog
-@@ -1,3 +1,27 @@
-+2018-07-23  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR ld/23428
-+	* testsuite/ld-elf/linux-x86.S: New file.
-+	* testsuite/ld-elf/linux-x86.exp: Likewise.
-+	* testsuite/ld-elf/pr23428.c: Likewise.
-+	* testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld
-+	for Linux/x86 targets.
-+	* testsuite/ld-i386/abs-iamcu.d: Likewise.
-+	* testsuite/ld-i386/abs.d: Likewise.
-+	* testsuite/ld-i386/pr12718.d: Likewise.
-+	* testsuite/ld-i386/pr12921.d: Likewise.
-+	* testsuite/ld-x86-64/abs-k1om.d: Likewise.
-+	* testsuite/ld-x86-64/abs-l1om.d: Likewise.
-+	* testsuite/ld-x86-64/abs.d: Likewise.
-+	* testsuite/ld-x86-64/pr12718.d: Likewise.
-+	* testsuite/ld-x86-64/pr12921.d: Likewise.
-+	* testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property
-+	section.
-+	* testsuite/ld-scripts/print-memory-usage.t: Likewise.
-+	* testsuite/ld-scripts/size-2.t: Likewise.
-+	* testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld to
-+	create executable if language is "asm".
-+
- 2018-07-18  Nick Clifton  <nickc@redhat.com>
- 
- 	2.31.1 Release point.
 diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S
 new file mode 100644
 index 0000000000..bdf40c6e01
diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch b/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
index 4aac2141fe2..ca50d9a57cd 100644
--- a/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
+++ b/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
@@ -23,30 +23,13 @@ ld/
 
 (cherry picked from commit ab9e342807d132182892de1be1a92d6e91a5c1da)
 ---
- bfd/ChangeLog                     |  7 +++++++
  bfd/elfxx-x86.c                   | 28 ++++++++++++++++++++++------
- ld/ChangeLog                      |  7 +++++++
  ld/testsuite/ld-elf/dummy.s       |  1 +
  ld/testsuite/ld-elf/linux-x86.S   | 28 ++++++++++++++++++++++++++++
  ld/testsuite/ld-elf/linux-x86.exp |  2 +-
  6 files changed, 66 insertions(+), 7 deletions(-)
  create mode 100644 ld/testsuite/ld-elf/dummy.s
 
-diff --git a/bfd/ChangeLog b/bfd/ChangeLog
-index e184eb322a..7364bed2b5 100644
---- a/bfd/ChangeLog
-+++ b/bfd/ChangeLog
-@@ -1,3 +1,10 @@
-+2018-08-12  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR ld/23428
-+	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Don't
-+	add X86_ISA_1_NEEDED property only if existing properties won't
-+	be removed.
-+
- 2018-08-10  H.J. Lu  <hongjiu.lu@intel.com>
- 
- 	PR ld/23486
 diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
 index 7ccfd25815..2d8f7b640b 100644
 --- a/bfd/elfxx-x86.c
@@ -93,21 +76,6 @@ index 7ccfd25815..2d8f7b640b 100644
  	}
  
        /* Create the GNU property note section if needed.  */
-diff --git a/ld/ChangeLog b/ld/ChangeLog
-index f62106b731..b814d6730d 100644
---- a/ld/ChangeLog
-+++ b/ld/ChangeLog
-@@ -1,3 +1,10 @@
-+2018-08-12  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR ld/23428
-+	* testsuite/ld-elf/dummy.s: New file.
-+	* testsuite/ld-elf/linux-x86.S: Add X86_FEATURE_1_AND property.
-+	* testsuite/ld-elf/linux-x86.exp: Add dummy.s to pr23428.
-+
- 2018-08-10  H.J. Lu  <hongjiu.lu@intel.com>
- 
- 	PR ld/23486
 diff --git a/ld/testsuite/ld-elf/dummy.s b/ld/testsuite/ld-elf/dummy.s
 new file mode 100644
 index 0000000000..403f98000d
diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch b/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
index d6304a00f17..866d6db8ce2 100644
--- a/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
+++ b/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
@@ -61,9 +61,7 @@ ld/
 
 (cherry picked from commit f7309df20c4e787041cedc4a6aced89c15259e54)
 ---
- bfd/ChangeLog                                 |  9 ++++++
  bfd/elfxx-x86.c                               | 25 ++++++++++++---
- ld/ChangeLog                                  | 32 +++++++++++++++++++
  ld/testsuite/ld-i386/i386.exp                 |  2 ++
  ld/testsuite/ld-i386/pr23486a.d               | 10 ++++++
  ld/testsuite/ld-i386/pr23486b.d               | 10 ++++++
@@ -102,25 +100,6 @@ ld/
  create mode 100644 ld/testsuite/ld-x86-64/pr23486b.d
  create mode 100644 ld/testsuite/ld-x86-64/pr23486b.s
 
-diff --git a/bfd/ChangeLog b/bfd/ChangeLog
-index 8d25c6992b..e184eb322a 100644
---- a/bfd/ChangeLog
-+++ b/bfd/ChangeLog
-@@ -1,3 +1,12 @@
-+2018-08-10  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR ld/23486
-+	* elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove
-+	GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it.
-+	(_bfd_x86_elf_link_setup_gnu_properties): Adding the
-+	GNU_PROPERTY_X86_ISA_1_NEEDED, instead of
-+	GNU_PROPERTY_X86_ISA_1_USED, property.
-+
- 2018-08-07  Alan Modra  <amodra@gmail.com>
- 
- 	* elf64-ppc.c (ppc64_elf_relocate_section): Don't skip first
-diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
-index 2e4ff88f1f..7ccfd25815 100644
 --- a/bfd/elfxx-x86.c
 +++ b/bfd/elfxx-x86.c
 @@ -2407,12 +2407,27 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
@@ -181,46 +160,6 @@ index 2e4ff88f1f..7ccfd25815 100644
  					4);
  	  prop->u.number = GNU_PROPERTY_X86_ISA_1_486;
  	  prop->pr_kind = property_number;
-diff --git a/ld/ChangeLog b/ld/ChangeLog
-index ef694e8980..f62106b731 100644
---- a/ld/ChangeLog
-+++ b/ld/ChangeLog
-@@ -1,3 +1,35 @@
-+2018-08-10  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR ld/23486
-+	* testsuite/ld-i386/i386.exp: Run PR ld/23486 tests.
-+	* testsuite/ld-x86-64/x86-64.exp: Likewise.
-+	* testsuite/ld-i386/pr23486a.d: New file.
-+	* testsuite/ld-i386/pr23486b.d: Likewise.
-+	* testsuite/ld-x86-64/pr23486a-x32.d: Likewise.
-+	* testsuite/ld-x86-64/pr23486a.d: Likewise.
-+	* testsuite/ld-x86-64/pr23486a.s: Likewise.
-+	* testsuite/ld-x86-64/pr23486b-x32.d: Likewise.
-+	* testsuite/ld-x86-64/pr23486b.d: Likewise.
-+	* testsuite/ld-x86-64/pr23486b.s: Likewise.
-+	* testsuite/ld-i386/property-3.r: Remove "x86 ISA used".
-+	* testsuite/ld-i386/property-4.r: Likewise.
-+	* testsuite/ld-i386/property-5.r: Likewise.
-+	* testsuite/ld-i386/property-x86-ibt3a.d: Likewise.
-+	* testsuite/ld-i386/property-x86-ibt3b.d: Likewise.
-+	* testsuite/ld-i386/property-x86-shstk3a.d: Likewise.
-+	* testsuite/ld-i386/property-x86-shstk3b.d: Likewise.
-+	* testsuite/ld-x86-64/property-3.r: Likewise.
-+	* testsuite/ld-x86-64/property-4.r: Likewise.
-+	* testsuite/ld-x86-64/property-5.r: Likewise.
-+	* testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise.
-+	* testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise.
-+	* testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise.
-+	* testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise.
-+	* testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise.
-+	* testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise.
-+	* testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise.
-+	* testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise.
-+
- 2018-08-10  H.J. Lu  <hongjiu.lu@intel.com>
- 
- 	* testsuite/ld-x86-64/property-x86-3.s: Use ".p2align 2" to
 diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
 index 6d794fe653..78dad02579 100644
 --- a/ld/testsuite/ld-i386/i386.exp