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

Commit 5d120458 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86/ld-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 linker bug workarounds from Peter Anvin.

GNU ld-2.22.52.0.[12] (*) has an unfortunate bug where it incorrectly
turns certain relocation entries absolute.  Section-relative symbols
that are part of otherwise empty sections are silently changed them to
absolute.  We rely on section-relative symbols staying section-relative,
and actually have several sections in the linker script solely for this
purpose.

See for example

   http://sourceware.org/bugzilla/show_bug.cgi?id=14052

We could just black-list the buggy linker, but it appears that it got
shipped in at least F17, and possibly other distros too, so it's sadly
not some rare unusual case.

This backports the workaround from the x86/trampoline branch, and as
Peter says: "This is not a minimal fix, not at all, but it is a tested
code base."

* 'x86/ld-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, relocs: When printing an error, say relative or absolute
  x86, relocs: Workaround for binutils 2.22.52.0.1 section bug
  x86, realmode: 16-bit real-mode code support for relocs tool

(*) That's a manly release numbering system. Stupid, sure. But manly.
parents 14e931a2 24ab82bd

Makefile

+6 −3
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ asm-generic: 


no-dot-config-targets := clean mrproper distclean \

			 cscope gtags TAGS tags help %docs check% coccicheck \

			 include/linux/version.h headers_% archheaders \

			 include/linux/version.h headers_% archheaders archscripts \

			 kernelversion %src-pkg



config-targets := 0
@@ -979,7 +979,7 @@ prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \ 
                   include/config/auto.conf

	$(cmd_crmodverdir)



archprepare: archheaders prepare1 scripts_basic

archprepare: archheaders archscripts prepare1 scripts_basic



prepare0: archprepare FORCE

	$(Q)$(MAKE) $(build)=.
@@ -1049,8 +1049,11 @@ hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) 
PHONY += archheaders

archheaders:



PHONY += archscripts

archscripts:



PHONY += __headers

__headers: include/linux/version.h scripts_basic asm-generic archheaders FORCE

__headers: include/linux/version.h scripts_basic asm-generic archheaders archscripts FORCE

	$(Q)$(MAKE) $(build)=scripts build_unifdef



PHONY += headers_install_all

arch/x86/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -134,6 +134,9 @@ KBUILD_CFLAGS += $(call cc-option,-mno-avx,) 
KBUILD_CFLAGS += $(mflags-y)

KBUILD_AFLAGS += $(mflags-y)



archscripts:

	$(Q)$(MAKE) $(build)=arch/x86/tools relocs



###

# Syscall table generation

arch/x86/boot/compressed/Makefile

+4 −5
Original line number Diff line number Diff line
@@ -40,13 +40,12 @@ OBJCOPYFLAGS_vmlinux.bin := -R .comment -S 
$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



targets += vmlinux.bin.all vmlinux.relocs



targets += vmlinux.bin.all vmlinux.relocs relocs

hostprogs-$(CONFIG_X86_NEED_RELOCS) += relocs



CMD_RELOCS = arch/x86/tools/relocs

quiet_cmd_relocs = RELOCS  $@

      cmd_relocs = $(obj)/relocs $< > $@;$(obj)/relocs --abs-relocs $<

$(obj)/vmlinux.relocs: vmlinux $(obj)/relocs FORCE

      cmd_relocs = $(CMD_RELOCS) $< > $@;$(CMD_RELOCS) --abs-relocs $<

$(obj)/vmlinux.relocs: vmlinux FORCE

	$(call if_changed,relocs)



vmlinux.bin.all-y := $(obj)/vmlinux.bin

arch/x86/tools/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
relocs

arch/x86/tools/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -36,3 +36,7 @@ HOSTCFLAGS_insn_sanity.o := -Wall -I$(objtree)/arch/x86/lib/ -I$(srctree)/arch/x 
$(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/inat.c $(srctree)/arch/x86/include/asm/inat_types.h $(srctree)/arch/x86/include/asm/inat.h $(srctree)/arch/x86/include/asm/insn.h $(objtree)/arch/x86/lib/inat-tables.c



$(obj)/insn_sanity.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/inat.c $(srctree)/arch/x86/include/asm/inat_types.h $(srctree)/arch/x86/include/asm/inat.h $(srctree)/arch/x86/include/asm/insn.h $(objtree)/arch/x86/lib/inat-tables.c



HOST_EXTRACFLAGS += -I$(srctree)/tools/include

hostprogs-y	+= relocs

relocs: $(obj)/relocs