diff options
| author | Florian Klink <flokli@flokli.de> | 2020-04-29 15:48:26 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-04-29 15:48:26 +0200 |
| commit | 607c4d8bb8909f17e3083bb1504430eb7332a974 (patch) | |
| tree | 9600e477f0bb357ef42b248dc340beb0be76425e /pkgs | |
| parent | e30f1e3c80dad49893b7921c393583f3a149bceb (diff) | |
| download | nixpkgs-607c4d8bb8909f17e3083bb1504430eb7332a974.tar nixpkgs-607c4d8bb8909f17e3083bb1504430eb7332a974.tar.gz nixpkgs-607c4d8bb8909f17e3083bb1504430eb7332a974.tar.bz2 nixpkgs-607c4d8bb8909f17e3083bb1504430eb7332a974.tar.lz nixpkgs-607c4d8bb8909f17e3083bb1504430eb7332a974.tar.xz nixpkgs-607c4d8bb8909f17e3083bb1504430eb7332a974.tar.zst nixpkgs-607c4d8bb8909f17e3083bb1504430eb7332a974.zip | |
Revert "binutils: 2.31.1 -> 2.33.1"
This reverts commit efdb29597a76c526dc0d9a55f8adf2ec5c33b0ee.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/binutils/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/binutils/no-plugins.patch | 26 |
2 files changed, 20 insertions, 16 deletions
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index e1ff92d00f4..cd05ea354ca 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -16,7 +16,7 @@ let # Remove gold-symbol-visibility patch when updating, the proper fix # is now upstream. # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 - version = "2.33.1"; + version = "2.31.1"; basename = "binutils"; # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. @@ -31,7 +31,7 @@ let # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl { url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2"; - sha256 = "1cmd0riv37bqy9mwbg6n3523qgr8b3bbm5kwj19sjrasl4yq9d0c"; + sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; }); in @@ -68,6 +68,12 @@ stdenv.mkDerivation { [ # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 ./gold-symbol-visibility.patch + + # https://sourceware.org/bugzilla/show_bug.cgi?id=23428 + # un-break features so linking against musl doesn't produce crash-only binaries + ./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch + ./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch + ./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch; outputs = [ "out" "info" "man" ]; diff --git a/pkgs/development/tools/misc/binutils/no-plugins.patch b/pkgs/development/tools/misc/binutils/no-plugins.patch index 68cf51b7dd3..9624b7976b7 100644 --- a/pkgs/development/tools/misc/binutils/no-plugins.patch +++ b/pkgs/development/tools/misc/binutils/no-plugins.patch @@ -1,21 +1,19 @@ -diff --git a/bfd/plugin.c b/bfd/plugin.c -index 537ab60311..bfe7957f96 100644 ---- a/bfd/plugin.c -+++ b/bfd/plugin.c -@@ -386,6 +386,7 @@ load_plugin (bfd *abfd) +diff -ru binutils-2.27-orig/bfd/plugin.c binutils-2.27/bfd/plugin.c +--- binutils-2.27-orig/bfd/plugin.c 2016-10-14 17:46:30.791315555 +0200 ++++ binutils-2.27/bfd/plugin.c 2016-10-14 17:46:38.583298765 +0200 +@@ -333,6 +333,7 @@ if (plugin_program_name == NULL) return found; +#if 0 - /* Try not to search the same dir twice, by looking at st_dev and - st_ino for the dir. If we are on a file system that always sets - st_ino to zero or the actual st_ino is zero we might waste some -@@ -437,7 +438,7 @@ load_plugin (bfd *abfd) - if (found) - break; - } -- + plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL); + p = make_relative_prefix (plugin_program_name, + BINDIR, +@@ -364,6 +365,7 @@ + free (p); + if (d) + closedir (d); +#endif + return found; } - |