b3640e024f
This bug was preventing one compiling Haskell programs from `pkgsMusl` for armv7. `nix-build --argstr crossSystem "armv7l-linux" -A pkgsMusl.haskellPackages.hello` succeeds with this patch. The patch is Nick Clifton's one, rebased by @ericson2314 here https://sourceware.org/bugzilla/show_bug.cgi?id=16177#c6 Although there was some talk about the efficacy of the binutils patch (https://sourceware.org/bugzilla/show_bug.cgi?id=16177#c9) the resulting binary seems to run without issue on the target platform. Jessica's patch there caused ld to fail linking some programs. Nick's proposed patch has worked well in my testing so far (a Haskell project of some small complexity cross compiled with musl to armv7).
206 lines
7.9 KiB
Nix
206 lines
7.9 KiB
Nix
{ stdenv, lib, buildPackages
|
|
, fetchFromGitHub, fetchurl, zlib, autoreconfHook, gettext
|
|
# Enabling all targets increases output size to a multiple.
|
|
, withAllTargets ? false, libbfd, libopcodes
|
|
, enableShared ? true
|
|
, noSysDirs
|
|
, gold ? !stdenv.buildPlatform.isDarwin || stdenv.hostPlatform == stdenv.targetPlatform
|
|
, bison ? null
|
|
, flex
|
|
, texinfo
|
|
, perl
|
|
}:
|
|
|
|
# Note: this package is used for bootstrapping fetchurl, and thus
|
|
# cannot use fetchpatch! All mutable patches (generated by GitHub or
|
|
# cgit) that are needed here should be included directly in Nixpkgs as
|
|
# files.
|
|
|
|
let
|
|
reuseLibs = enableShared && withAllTargets;
|
|
|
|
# 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";
|
|
|
|
basename = "binutils";
|
|
# The targetPrefix prepended to binary names to allow multiple binuntils on the
|
|
# PATH to both be usable.
|
|
targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
|
|
"${stdenv.targetPlatform.config}-";
|
|
vc4-binutils-src = fetchFromGitHub {
|
|
owner = "itszor";
|
|
repo = "binutils-vc4";
|
|
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}";
|
|
in
|
|
|
|
stdenv.mkDerivation {
|
|
pname = targetPrefix + basename;
|
|
inherit src version;
|
|
|
|
patches = [
|
|
# Make binutils output deterministic by default.
|
|
"${patchesDir}/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"
|
|
|
|
# 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"
|
|
|
|
# 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
|
|
# consequence that the linker will fail to find transitive dependencies of
|
|
# 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") [
|
|
# https://sourceware.org/bugzilla/show_bug.cgi?id=22868
|
|
./patches/2.31/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
|
|
;
|
|
|
|
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 ];
|
|
buildInputs = [ zlib gettext ];
|
|
|
|
inherit noSysDirs;
|
|
|
|
preConfigure = ''
|
|
# Clear the default library search path.
|
|
if test "$noSysDirs" = "1"; then
|
|
echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt
|
|
fi
|
|
|
|
# Use symlinks instead of hard links to save space ("strip" in the
|
|
# fixup phase strips each hard link separately).
|
|
for i in binutils/Makefile.in gas/Makefile.in ld/Makefile.in gold/Makefile.in; do
|
|
sed -i "$i" -e 's|ln |ln -s |'
|
|
done
|
|
'';
|
|
|
|
# As binutils takes part in the stdenv building, we don't want references
|
|
# to the bootstrap-tools libgcc (as uses to happen on arm/mips)
|
|
NIX_CFLAGS_COMPILE = if stdenv.hostPlatform.isDarwin
|
|
then "-Wno-string-plus-int -Wno-deprecated-declarations"
|
|
else "-static-libgcc";
|
|
|
|
hardeningDisable = [ "format" "pie" ];
|
|
|
|
# TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
|
|
configurePlatforms = [ "build" "host" ] ++ lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
|
|
|
|
configureFlags =
|
|
(if enableShared then [ "--enable-shared" "--disable-static" ]
|
|
else [ "--disable-shared" "--enable-static" ])
|
|
++ lib.optional withAllTargets "--enable-targets=all"
|
|
++ [
|
|
"--enable-64-bit-bfd"
|
|
"--with-system-zlib"
|
|
|
|
"--enable-deterministic-archives"
|
|
"--disable-werror"
|
|
"--enable-fix-loongson2f-nop"
|
|
|
|
# Turn on --enable-new-dtags by default to make the linker set
|
|
# RUNPATH instead of RPATH on binaries. This is important because
|
|
# RUNPATH can be overriden using LD_LIBRARY_PATH at runtime.
|
|
"--enable-new-dtags"
|
|
] ++ lib.optionals gold [ "--enable-gold" "--enable-plugins" ];
|
|
|
|
doCheck = false; # fails
|
|
|
|
postFixup = lib.optionalString reuseLibs ''
|
|
rm "$out"/lib/lib{bfd,opcodes}-${version}.so
|
|
ln -s '${lib.getLib libbfd}/lib/libbfd-${version}.so' "$out/lib/"
|
|
ln -s '${lib.getLib libopcodes}/lib/libopcodes-${version}.so' "$out/lib/"
|
|
'';
|
|
|
|
# else fails with "./sanity.sh: line 36: $out/bin/size: not found"
|
|
doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform && stdenv.hostPlatform == stdenv.targetPlatform;
|
|
|
|
enableParallelBuilding = true;
|
|
|
|
passthru = {
|
|
inherit targetPrefix patchesDir;
|
|
};
|
|
|
|
meta = with lib; {
|
|
description = "Tools for manipulating binaries (linker, assembler, etc.)";
|
|
longDescription = ''
|
|
The GNU Binutils are a collection of binary tools. The main
|
|
ones are `ld' (the GNU linker) and `as' (the GNU assembler).
|
|
They also include the BFD (Binary File Descriptor) library,
|
|
`gprof', `nm', `strip', etc.
|
|
'';
|
|
homepage = "https://www.gnu.org/software/binutils/";
|
|
license = licenses.gpl3Plus;
|
|
maintainers = with maintainers; [ ericson2314 ];
|
|
platforms = platforms.unix;
|
|
|
|
/* Give binutils a lower priority than gcc-wrapper to prevent a
|
|
collision due to the ld/as wrappers/symlinks in the latter. */
|
|
priority = 10;
|
|
};
|
|
}
|