diff --git a/pkgs/development/tools/misc/binutils/2.30.nix b/pkgs/development/tools/misc/binutils/2.30.nix deleted file mode 100644 index 830c07330524..000000000000 --- a/pkgs/development/tools/misc/binutils/2.30.nix +++ /dev/null @@ -1,131 +0,0 @@ -{ stdenv, buildPackages -, fetchurl, zlib -, buildPlatform, hostPlatform, targetPlatform -, noSysDirs, gold ? true, bison ? null -}: - -let - version = "2.30"; - basename = "binutils-${version}"; - inherit (stdenv.lib) optional optionals optionalString; - # The targetPrefix prepended to binary names to allow multiple binuntils on the - # PATH to both be usable. - targetPrefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; -in - -stdenv.mkDerivation rec { - name = targetPrefix + basename; - - src = fetchurl { - url = "mirror://gnu/binutils/${basename}.tar.bz2"; - sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; - }; - - patches = [ - # 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. - ./new-dtags.patch - - # Since binutils 2.22, DT_NEEDED flags aren't copied for dynamic outputs. - # That requires upstream changes for things to work. So we can patch it to - # get the old behaviour by now. - ./dtneeded.patch - - # Make binutils output deterministic by default. - ./deterministic.patch - - # Always add PaX flags section to ELF files. - # This is needed, for instance, so that running "ldd" on a binary that is - # PaX-marked to disable mprotect doesn't fail with permission denied. - ./pt-pax-flags.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. - ./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 - ./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. - ./always-search-rpath.patch - ]; - - outputs = [ "out" "info" "man" ]; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison ]; - buildInputs = [ zlib ]; - - 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 hostPlatform.isDarwin - then "-Wno-string-plus-int -Wno-deprecated-declarations" - else "-static-libgcc"; - - # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. - configurePlatforms = - # TODO(@Ericson2314): Figure out what's going wrong with Arm - if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm - then [] - else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; - - configureFlags = [ - "--enable-targets=all" "--enable-64-bit-bfd" - "--disable-install-libbfd" - "--disable-shared" "--enable-static" - "--with-system-zlib" - - "--enable-deterministic-archives" - "--disable-werror" - "--enable-fix-loongson2f-nop" - ] ++ optionals gold [ "--enable-gold" "--enable-plugins" ]; - - enableParallelBuilding = true; - - passthru = { - inherit targetPrefix version; - }; - - meta = with stdenv.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 = http://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; - }; -} diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 05d0d21a179b..830c07330524 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -5,10 +5,7 @@ }: let - # Note to whoever is upgrading this: 2.29 is broken. - # ('nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test' segfaults on aarch64) - # Also glibc might need patching, see commit 733e20fee4a6700510f71fbe1a58ac23ea202f6a. - version = "2.28.1"; + version = "2.30"; basename = "binutils-${version}"; inherit (stdenv.lib) optional optionals optionalString; # The targetPrefix prepended to binary names to allow multiple binuntils on the @@ -21,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/binutils/${basename}.tar.bz2"; - sha256 = "1sj234nd05cdgga1r36zalvvdkvpfbr12g5mir2n8i1dwsdrj939"; + sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; }; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31800d78bb09..f97d6051a3f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7422,8 +7422,6 @@ with pkgs; binutils = if targetPlatform.isDarwin then darwin.binutils - else if targetPlatform.isRiscV - then binutils_2_30 else binutils-raw; binutils-unwrapped = callPackage ../development/tools/misc/binutils { @@ -7434,15 +7432,6 @@ with pkgs; libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; bintools = binutils-unwrapped; }; - binutils-unwrapped_2_30 = callPackage ../development/tools/misc/binutils/2.30.nix { - # FHS sys dirs presumably only have stuff for the build platform - noSysDirs = (targetPlatform != buildPlatform) || noSysDirs; - }; - binutils-raw_2_30 = wrapBintoolsWith { - libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc; - bintools = binutils-unwrapped_2_30; - }; - binutils_2_30 = binutils-raw_2_30; binutils_nogold = lowPrio (binutils-raw.override { bintools = binutils-raw.bintools.override {