public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert commits on binutils for OpenRISC 1000

Browse Source 
This reverts commits
    ebd89f6de1
    c6f6db77ac
    257fb62387
    dbe556af9c
This commit is contained in:
luc65r
2020-12-28 08:43:31 +01:00
committed by Frederik Rietdijk
parent 5a25e3e7e9
commit 3205b32bf6
17 changed files with 31 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/misc/binutils/default.nix
+29 -54
View File
@@ -8,7 +8,6 @@
, bison ? null
, flex
, texinfo
, perl
}:
# Note: this package is used for bootstrapping fetchurl, and thus
@@ -22,10 +21,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 = "${minorVersion}${patchVersion}";
minorVersion = if stdenv.targetPlatform.isOr1k then "2.34" else "2.31";
patchVersion = if stdenv.targetPlatform.isOr1k then "" else ".1";
version = "2.31.1";
basename = "binutils";
# The targetPrefix prepended to binary names to allow multiple binuntils on the
# PATH to both be usable.
@@ -37,49 +33,33 @@ let
rev = "708acc851880dbeda1dd18aca4fd0a95b2573b36";
sha256 = "1kdrz6fki55lm15rwwamn74fnqpy0zlafsida2zymk76n3656c63";
};
# binutils sources not part of the bootstrap.
non-boot-src = (fetchurl {
url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2";
sha256 = {
"2.31.1" = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z";
"2.34" = "1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49";
}.${version};
});
# HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM
normal-src = stdenv.__bootPackages.binutils-unwrapped.src or non-boot-src;
# Platforms where we directly use the final source.
# Generally for cross-compiled platforms, where the boot source won't compile.
skipBootSrc = stdenv.targetPlatform.isOr1k;
# Select the specific source according to the platform in use.
src = if stdenv.targetPlatform.isVc4 then vc4-binutils-src
else if skipBootSrc then non-boot-src
else normal-src;
patchesDir = ./patches + "/${minorVersion}";
normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl {
url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2";
sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z";
});
in
stdenv.mkDerivation {
pname = targetPrefix + basename;
inherit src version;
inherit version;
src = if stdenv.targetPlatform.isVc4 then vc4-binutils-src else normal-src;
patches = [
# Make binutils output deterministic by default.
"${patchesDir}/deterministic.patch"
./deterministic.patch
# Bfd looks in BINDIR/../lib for some plugins that don't
# exist. This is pointless (since users can't install plugins
# there) and causes a cycle between the lib and bin outputs, so
# get rid of it.
"${patchesDir}/no-plugins.patch"
./no-plugins.patch
# Help bfd choose between elf32-littlearm, elf32-littlearm-symbian, and
# elf32-littlearm-vxworks in favor of the first.
# https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766
"${patchesDir}/disambiguate-arm-targets.patch"
./disambiguate-arm-targets.patch
# For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's
# not clear why this behavior was decided upon but it has the unfortunate
@@ -87,38 +67,33 @@ stdenv.mkDerivation {
# shared objects when cross-compiling. Consequently, we are forced to
# override this behavior, forcing ld to search DT_RPATH even when
# cross-compiling.
"${patchesDir}/always-search-rpath.patch"
]
# For version 2.31 exclusively
++ lib.optionals (!stdenv.targetPlatform.isVc4 && minorVersion == "2.31") [
./always-search-rpath.patch
] ++ lib.optionals (!stdenv.targetPlatform.isVc4)
[
# https://sourceware.org/bugzilla/show_bug.cgi?id=22868
./patches/2.31/gold-symbol-visibility.patch
./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
./patches/2.31/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
./patches/2.31/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
./patches/2.31/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
]
++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch
++ # This patch was suggested by Nick Clifton to fix
# https://sourceware.org/bugzilla/show_bug.cgi?id=16177
# It can be removed when that 7-year-old bug is closed.
# This binutils bug causes GHC to emit broken binaries on armv7, and
# indeed GHC will refuse to compile with a binutils suffering from it. See
# this comment for more information:
# https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333
lib.optional stdenv.targetPlatform.isAarch32 ./R_ARM_COPY.patch
;
./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
++ # This patch was suggested by Nick Clifton to fix
# https://sourceware.org/bugzilla/show_bug.cgi?id=16177
# It can be removed when that 7-year-old bug is closed.
# This binutils bug causes GHC to emit broken binaries on armv7, and
# indeed GHC will refuse to compile with a binutils suffering from it. See
# this comment for more information:
# https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333
lib.optional stdenv.targetPlatform.isAarch32 ./R_ARM_COPY.patch;
outputs = [ "out" "info" "man" ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [
bison
] ++ lib.optionals (lib.versionAtLeast version "2.34") [
perl
texinfo
] ++ (lib.optionals stdenv.targetPlatform.isiOS [
autoreconfHook
]) ++ lib.optionals stdenv.targetPlatform.isVc4 [ texinfo flex ];
@@ -182,7 +157,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
passthru = {
inherit targetPrefix patchesDir;
inherit targetPrefix;
};
meta = with lib; {