Commit e1ef521c authored by Sergei Trofimovich's avatar Sergei Trofimovich
Browse files

binutils: 2.39 -> 2.40 

A few potentially disruptive changes:

- binutils does not embed ${binutils-unwrapped}/lib as a default library
  search path anymore. This will cause link failures for -lbfd -lopcodes
  users that did not declare their dependency on those libraries. They
  will need to add `libbfd` and `libopcodes` attributes to build inputs.

- `libbfd` and `libopcodes` attributes now just reference
  `binutils-unwrapped.{dev,lib}` pair of attributes without patching
  `binutils` build system.

We don't patch build system anymore and use multiple outputs out of
existing `binutils` build. That makes the result more maintainable: no
need to handle ever growing list of dependencied of `libbfd`. This time
new addition was `libsframe`.

To accomodate `out` / `lib` output split I had to remove `lib` -> `bin`
backreference by removing legacy lookup path for plugins.

I also did not enable `zstd` just yet as `nixpkgs` version of `zstd`
package pulls in `cmake` into bootstrap sequence.

Changes: https://lists.gnu.org/archive/html/info-gnu/2023-01/msg00003.html
parent d72176e6

pkgs/development/tools/misc/binutils/build-components-separately.patch

deleted100644 → 0
+0 −155
Original line number Diff line number Diff line 
diff --git a/bfd/configure.ac b/bfd/configure.ac

index fec067b2135..377e1f5443f 100644

--- a/bfd/configure.ac

+++ b/bfd/configure.ac

@@ -292,30 +292,16 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed,

 

 LT_LIB_M

 

-# When building a shared libbfd, link against the pic version of libiberty

-# so that apps that use libbfd won't need libiberty just to satisfy any

-# libbfd references.

-# We can't do that if a pic libiberty is unavailable since including non-pic

-# code would insert text relocations into libbfd.

 SHARED_LIBADD=

-SHARED_LDFLAGS=

+SHARED_LDFLAGS=-liberty

 if test "$enable_shared" = "yes"; then

-changequote(,)dnl

-  x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | sed -n '$p'`

-changequote([,])dnl

-  if test -n "$x"; then

-    SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"

-  fi

-fi

-

 SHARED_LIBADD="$SHARED_LIBADD $LIBINTL"

 

-if test "$enable_shared" = "yes"; then

   case "${host}" in

   # More hacks to build DLLs on Windows.

   *-*-cygwin*)

     SHARED_LDFLAGS="-no-undefined"

-    SHARED_LIBADD="-L`pwd`/../libiberty -liberty $SHARED_LIBADD -lcygwin -lkernel32"

+    SHARED_LIBADD="-liberty $SHARED_LIBADD -lcygwin -lkernel32"

   ;;

   esac

 

diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am

index 0e04b4c05c4..848a02662e7 100644

--- a/opcodes/Makefile.am

+++ b/opcodes/Makefile.am

@@ -51,7 +51,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir)

 endif

 

 # This is where bfd.h lives.

-BFD_H = ../bfd/bfd.h

+BFD_H = $(BFDDIR)/bfd.h

 

 BUILD_LIBS = @BUILD_LIBS@

 BUILD_LIB_DEPS = @BUILD_LIB_DEPS@

@@ -303,7 +303,7 @@ OFILES = @BFD_MACHINES@

 # development.sh is used to determine -Werror default.

 CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh

 

-AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@

+AM_CPPFLAGS = -I. -I$(srcdir) -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@

 

 disassemble.lo: disassemble.c

 if am__fastdepCC

@@ -327,9 +327,18 @@ libopcodes_la_SOURCES =  dis-buf.c disassemble.c dis-init.c

-libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@

+libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ libtool-soversion

 libopcodes_la_LIBADD = $(OFILES) @SHARED_LIBADD@

-libopcodes_la_LDFLAGS += -release `cat ../bfd/libtool-soversion` @SHARED_LDFLAGS@

+libopcodes_la_LDFLAGS += -release `cat libtool-soversion` @SHARED_LDFLAGS@

 # Allow dependency tracking to work on all the source files.

 EXTRA_libopcodes_la_SOURCES = $(LIBOPCODES_CFILES)

 

+libtool-soversion:

+	@echo "creating $@"

+	bfd_soversion="$(VERSION)" ;\

+	. $(BFDDIR)/development.sh ;\

+	if test "$$development" = true ; then \

+	  bfd_soversion="$(VERSION).$${bfd_version_date}" ;\

+	fi ;\

+	echo "$${bfd_soversion}" > $@

+

 # libtool will build .libs/libopcodes.a.  We create libopcodes.a in

 # the build directory so that we don't have to convert all the

 # programs that use libopcodes.a simultaneously.  This is a hack which

diff --git a/opcodes/configure.ac b/opcodes/configure.ac

index e564f067334..5da62a3d58b 100644

--- a/opcodes/configure.ac

+++ b/opcodes/configure.ac

@@ -98,6 +98,8 @@ BFD_64_BIT

 AC_SUBST(HDEFINES)

 AC_PROG_INSTALL

 

+GCC_HEADER_STDINT(bfd_stdint.h)

+

 AC_CHECK_DECLS([basename, stpcpy])

 

 # Check if sigsetjmp is available.  Using AC_CHECK_FUNCS won't do

@@ -148,44 +150,21 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed,

 

 LT_LIB_M

 

-#Libs for generator progs

-if test "x$cross_compiling" = "xno"; then

-  BUILD_LIBS=../libiberty/libiberty.a

-  BUILD_LIB_DEPS=$BUILD_LIBS

-else

-  # if cross-compiling, assume that the system provides -liberty

-  # and that the version is compatible with new headers.

-  BUILD_LIBS=-liberty

-  BUILD_LIB_DEPS=

-fi

-BUILD_LIBS="$BUILD_LIBS $LIBINTL"

-BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP"

+BUILD_LIBS="-liberty $LIBINTL"

+BUILD_LIB_DEPS="$LIBINTL_DEP"

 

 AC_SUBST(BUILD_LIBS)

 AC_SUBST(BUILD_LIB_DEPS)

 

 # Horrible hacks to build DLLs on Windows and a shared library elsewhere.

 SHARED_LDFLAGS=

-SHARED_LIBADD=

+SHARED_LIBADD=-liberty

 SHARED_DEPENDENCIES=

-if test "$enable_shared" = "yes"; then

-# When building a shared libopcodes, link against the pic version of libiberty

-# so that apps that use libopcodes won't need libiberty just to satisfy any

-# libopcodes references.

-# We can't do that if a pic libiberty is unavailable since including non-pic

-# code would insert text relocations into libopcodes.

 # Note that linking against libbfd as we do here, which is itself linked

 # against libiberty, may not satisfy all the libopcodes libiberty references

 # since libbfd may not pull in the entirety of libiberty.

 # Also, jam libintl into the right place in all of this: after libiberty,

 # which uses it, but before -lcygwin, which it uses.

-changequote(,)dnl

-  x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | sed -n '$p'`

-changequote([,])dnl

-  if test -n "$x"; then

-    SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"

-  fi

-fi

 

 SHARED_LIBADD="$SHARED_LIBADD $LIBINTL"

 

@@ -193,11 +172,10 @@ if test "$enable_shared" = "yes"; then

   case "${host}" in

     *-*-cygwin*)

       SHARED_LDFLAGS="-no-undefined"

-      SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty $SHARED_LIBADD"

+      SHARED_LIBADD="-lbfd -liberty $SHARED_LIBADD"

       ;;

     *)

-      SHARED_LIBADD="../bfd/libbfd.la ${SHARED_LIBADD}"

-      SHARED_DEPENDENCIES="../bfd/libbfd.la"

+      SHARED_LIBADD="-lbfd ${SHARED_LIBADD}"

       ;;

   esac

pkgs/development/tools/misc/binutils/default.nix

+20 −10
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ assert enableGold -> withGold stdenv.targetPlatform; 
let

  inherit (stdenv) buildPlatform hostPlatform targetPlatform;



  version = "2.39";

  version = "2.40";



  srcs = {

    normal = fetchurl {

      url = "mirror://gnu/binutils/binutils-${version}.tar.bz2";

      sha256 = "sha256-2iSoT+8iAQLdJAQt8G/eqFHCYUpTd/hu/6KPM7exYUg=";

      hash = "sha256-+CmOsVOks30RLpRapcsoUAQLzyaj6mW1pxXIOv4F5Io=";

    };

    vc4-none = fetchFromGitHub {

      owner = "itszor";
@@ -85,12 +85,10 @@ stdenv.mkDerivation { 
    # cross-compiling.

    ./always-search-rpath.patch



    # Upstream backport of https://sourceware.org/PR29451:

    # Don't emit 0-sized debug entries for objects without size.

    # Without the change elfutils on i686-linux fail dwarf validity test:

    #    https://sourceware.org/PR29450

    # Remove once 2.40 releases.

    ./gas-dwarf-zero-PR29451.patch

    # Avoid `lib -> out -> lib` reference. Normally `bfd-plugins` does

    # not need to know binutils' BINDIR at all. It's an absolute path

    # where libraries are stored.

    ./plugins-no-BINDIR.patch

  ]

  ++ lib.optional targetPlatform.isiOS ./support-ios.patch

  # Adds AVR-specific options to "size" for compatibility with Atmel's downstream distribution
@@ -106,7 +104,15 @@ stdenv.mkDerivation { 
      else ./mips64-default-n64.patch)

  ;



  outputs = [ "out" "info" "man" ];

  outputs = [ "out" "info" "man" "dev" ]

  # Ideally we would like to always install 'lib' into a separate

  # target. Unfortunately cross-compiled binutils installs libraries

  # across both `$lib/lib/` and `$out/$target/lib` with a reference

  # from $out to $lib. Probably a binutils bug: all libraries should go

  # to $lib as binutils does not build target libraries. Let's make our

  # life slightly simpler by installing everything into $out for

  # cross-binutils.

  ++ lib.optionals (targetPlatform == hostPlatform) [ "lib" ];



  strictDeps = true;

  depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -181,8 +187,12 @@ stdenv.mkDerivation { 


    # Unconditionally disable:

    # - musl target needs porting: https://sourceware.org/PR29477

    # - all targets rely on javac: https://sourceware.org/PR29479

    "--disable-gprofng"



    # By default binutils searches $libdir for libraries. This brings in

    # libbfd and libopcodes into a default visibility. Drop default lib

    # path to force users to declare their use of these libraries.

    "--with-lib-path=:"

  ]

  ++ lib.optionals withAllTargets [ "--enable-targets=all" ]

  ++ lib.optionals enableGold [ "--enable-gold" "--enable-plugins" ]

pkgs/development/tools/misc/binutils/gas-dwarf-zero-PR29451.patch

deleted100644 → 0
+0 −71
Original line number Diff line number Diff line 
https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=d7abcbcea5ddd40a3bf28758b62f35933c59f996



Don't emit 0-sized debug entries for objects without size.

Without the change elfutils on i686-linux fail dwarf validity test:

    https://sourceware.org/PR29450

--- a/gas/dwarf2dbg.c

+++ b/gas/dwarf2dbg.c

@@ -2882,6 +2882,7 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg,

 	{

 	  const char *name;

 	  size_t len;

+	  expressionS size = { .X_op = O_constant };

 

 	  /* Skip warning constructs (see above).  */

 	  if (symbol_get_bfdsym (symp)->flags & BSF_WARNING)

@@ -2895,6 +2896,18 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg,

 	  if (!S_IS_DEFINED (symp) || !S_IS_FUNCTION (symp))

 	    continue;

 

+#if defined (OBJ_ELF) /* || defined (OBJ_MAYBE_ELF) */

+	  size.X_add_number = S_GET_SIZE (symp);

+	  if (size.X_add_number == 0 && IS_ELF

+	      && symbol_get_obj (symp)->size != NULL)

+	    {

+	      size.X_op = O_add;

+	      size.X_op_symbol = make_expr_symbol (symbol_get_obj (symp)->size);

+	    }

+#endif

+	  if (size.X_op == O_constant && size.X_add_number == 0)

+	    continue;

+

 	  subseg_set (str_seg, 0);

 	  name_sym = symbol_temp_new_now_octets ();

 	  name = S_GET_NAME (symp);

@@ -2920,29 +2933,17 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg,

 	  emit_expr (&exp, sizeof_address);

 

 	  /* DW_AT_high_pc */

-	  exp.X_op = O_constant;

-#if defined (OBJ_ELF) /* || defined (OBJ_MAYBE_ELF) */

-	  exp.X_add_number = S_GET_SIZE (symp);

-	  if (exp.X_add_number == 0 && IS_ELF

-	      && symbol_get_obj (symp)->size != NULL)

-	    {

-	      exp.X_op = O_add;

-	      exp.X_op_symbol = make_expr_symbol (symbol_get_obj (symp)->size);

-	    }

-#else

-	  exp.X_add_number = 0;

-#endif

 	  if (DWARF2_VERSION < 4)

 	    {

-	      if (exp.X_op == O_constant)

-		exp.X_op = O_symbol;

-	      exp.X_add_symbol = symp;

-	      emit_expr (&exp, sizeof_address);

+	      if (size.X_op == O_constant)

+		size.X_op = O_symbol;

+	      size.X_add_symbol = symp;

+	      emit_expr (&size, sizeof_address);

 	    }

-	  else if (exp.X_op == O_constant)

-	    out_uleb128 (exp.X_add_number);

+	  else if (size.X_op == O_constant)

+	    out_uleb128 (size.X_add_number);

 	  else

-	    emit_leb128_expr (symbol_get_value_expression (exp.X_op_symbol), 0);

+	    emit_leb128_expr (symbol_get_value_expression (size.X_op_symbol), 0);

 	}

 

       /* End of children.  */

pkgs/development/tools/misc/binutils/libbfd.nix

+12 −35
Original line number Diff line number Diff line 
{ lib, stdenv

, buildPackages

, gnu-config, autoreconfHook, bison, binutils-unwrapped, texinfo

, libiberty, libintl, zlib

, binutils-unwrapped-all-targets

}:



stdenv.mkDerivation {

  pname = "libbfd";

  inherit (binutils-unwrapped) version src;



  outputs = [ "out" "dev" ];



  patches = binutils-unwrapped.patches ++ [

    ./build-components-separately.patch

  inherit (binutils-unwrapped-all-targets) version;



  dontUnpack = true;

  dontBuild = true;

  dontInstall = true;

  propagatedBuildInputs = [

    binutils-unwrapped-all-targets.dev

    binutils-unwrapped-all-targets.lib

  ];



  # We just want to build libbfd

  postPatch = ''

    cd bfd

  '';



  postAutoreconf = ''

    echo "Updating config.guess and config.sub from ${gnu-config}"

    cp -f ${gnu-config}/config.{guess,sub} ../

  '';



  # We update these ourselves

  dontUpdateAutotoolsGnuConfigScripts = true;



  strictDeps = true;

  nativeBuildInputs = [ autoreconfHook bison texinfo ];

  buildInputs = [ libiberty zlib ] ++ lib.optionals stdenv.isDarwin [ libintl ];

  depsBuildBuild = [ buildPackages.stdenv.cc ];



  configurePlatforms = [ "build" "host" ];

  configureFlags = [

    "--enable-targets=all" "--enable-64-bit-bfd"

    "--enable-install-libbfd"

    "--with-system-zlib"

  ] ++ lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared";



  enableParallelBuilding = true;

  passthru = {

    dev = binutils-unwrapped-all-targets.dev;

  };



  meta = with lib; {

    description = "A library for manipulating containers of machine code";

pkgs/development/tools/misc/binutils/libopcodes.nix

+13 −29
Original line number Diff line number Diff line 
{ lib, stdenv, buildPackages

, autoreconfHook, bison, binutils-unwrapped

, libiberty, libbfd

{ lib, stdenv

, binutils-unwrapped-all-targets

}:



stdenv.mkDerivation {

  pname = "libopcodes";

  inherit (binutils-unwrapped) version src;



  outputs = [ "out" "dev" ];



  patches = binutils-unwrapped.patches ++ [

    ./build-components-separately.patch

  inherit (binutils-unwrapped-all-targets) version;



  dontUnpack = true;

  dontBuild = true;

  dontInstall = true;

  propagatedBuildInputs = [

    binutils-unwrapped-all-targets.dev

    binutils-unwrapped-all-targets.lib

  ];



  # We just want to build libopcodes

  postPatch = ''

    cd opcodes

    find . ../include/opcode -type f -exec sed {} -i -e 's/"bfd.h"/<bfd.h>/' \;

  '';



  depsBuildBuild = [ buildPackages.stdenv.cc ];

  nativeBuildInputs = [ autoreconfHook bison ];

  buildInputs = [ libiberty ];

  # dis-asm.h includes bfd.h

  propagatedBuildInputs = [ libbfd ];



  configurePlatforms = [ "build" "host" ];

  configureFlags = [

    "--enable-targets=all" "--enable-64-bit-bfd"

    "--enable-install-libbfd"

    "--enable-shared"

  ];



  enableParallelBuilding = true;

  passthru = {

    dev = binutils-unwrapped-all-targets.dev;

  };



  meta = with lib; {

    description = "A library from binutils for manipulating machine code";