Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa5fb4db authored by Roland McGrath's avatar Roland McGrath Committed by Linus Torvalds
Browse files

uml: fix CONFIG_STATIC_LINK=y build failure with newer glibc 



With glibc 2.11 or later that was built with --enable-multi-arch, the UML
link fails with undefined references to __rel_iplt_start and similar
symbols.  In recent binutils, the default linker script defines these
symbols (see ld --verbose).  Fix the UML linker scripts to match the new
defaults for these sections.

Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d911202e

arch/um/kernel/dyn.lds.S

+12 −2
Original line number Diff line number Diff line
@@ -50,8 +50,18 @@ SECTIONS 
  .rela.got       : { *(.rela.got) }

  .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }

  .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }

  .rel.plt        : { *(.rel.plt) }

  .rela.plt       : { *(.rela.plt) }

  .rel.plt : {

	*(.rel.plt)

	PROVIDE_HIDDEN(__rel_iplt_start = .);

	*(.rel.iplt)

	PROVIDE_HIDDEN(__rel_iplt_end = .);

  }

  .rela.plt : {

	*(.rela.plt)

	PROVIDE_HIDDEN(__rela_iplt_start = .);

	*(.rela.iplt)

	PROVIDE_HIDDEN(__rela_iplt_end = .);

  }

  .init           : {

    KEEP (*(.init))

  } =0x90909090

arch/um/kernel/uml.lds.S

+17 −0
Original line number Diff line number Diff line
@@ -43,6 +43,23 @@ SECTIONS 
	__syscall_stub_end = .;

  }



  /*

   * These are needed even in a static link, even if they wind up being empty.

   * Newer glibc needs these __rel{,a}_iplt_{start,end} symbols.

   */

  .rel.plt : {

	*(.rel.plt)

	PROVIDE_HIDDEN(__rel_iplt_start = .);

	*(.rel.iplt)

	PROVIDE_HIDDEN(__rel_iplt_end = .);

  }

  .rela.plt : {

	*(.rela.plt)

	PROVIDE_HIDDEN(__rela_iplt_start = .);

	*(.rela.iplt)

	PROVIDE_HIDDEN(__rela_iplt_end = .);

  }



  #include "asm/common.lds.S"



  init.data : { INIT_DATA }