2
0
Fork 0
Browse Source

genodeSources: patch linker script for programs

The genode_dyn.ld script was creating a dynamic section of invalid
size, which causes problems with patchelf.
elf-fixup
Emery Hemingway 2 years ago
parent
commit
f517d86d15
  1. 2
      packages/genodelabs/default.nix
  2. 18
      packages/genodelabs/genode_dyn.ld.patch

2
packages/genodelabs/default.nix

@ -30,7 +30,7 @@ let
version = upstreamSources.lastModifiedDate;
src = upstreamSources;
nativeBuildInputs = [ expect gnumake tcl ];
patches = [ ./LIB.patch ./binary-labels.patch ];
patches = [ ./LIB.patch ./binary-labels.patch ./genode_dyn.ld.patch ];
configurePhase = ''
patchShebangs ./tool
substituteInPlace repos/base/etc/tools.conf \

18
packages/genodelabs/genode_dyn.ld.patch

@ -0,0 +1,18 @@
diff --git a/repos/base/src/ld/genode_dyn.ld b/repos/base/src/ld/genode_dyn.ld
index 5fa6ddc29e..2635c1644b 100644
--- a/repos/base/src/ld/genode_dyn.ld
+++ b/repos/base/src/ld/genode_dyn.ld
@@ -216,13 +216,6 @@ SECTIONS
.dynamic :
{
*(.dynamic)
-
- /*
- * Make sure to have a least one entry within the dynamic section, so the
- * dynamic sgement point to something valid in case there are no dynamic
- * symbols
- */
- LONG(0x0);
} : rw : dynamic
/* merge .got.plt and .got into .got, since the ARM toolchain for OKL4
Loading…
Cancel
Save