Commit 39bfe907 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 vdso fix from Peter Anvin:
 "This is a single build fix for building with gold as opposed to GNU
  ld.  It got queued up separately and was expected to be pushed during
  the merge window, but it got left behind"

* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, vdso: Make the vdso linker script compatible with Gold
parents c089b229 378ed3cc
...@@ -9,12 +9,9 @@ SECTIONS ...@@ -9,12 +9,9 @@ SECTIONS
#ifdef BUILD_VDSO32 #ifdef BUILD_VDSO32
#include <asm/vdso32.h> #include <asm/vdso32.h>
.hpet_sect : { hpet_page = . - VDSO_OFFSET(VDSO_HPET_PAGE);
hpet_page = . - VDSO_OFFSET(VDSO_HPET_PAGE);
} :text :hpet_sect
.vvar_sect : { vvar = . - VDSO_OFFSET(VDSO_VVAR_PAGE);
vvar = . - VDSO_OFFSET(VDSO_VVAR_PAGE);
/* Place all vvars at the offsets in asm/vvar.h. */ /* Place all vvars at the offsets in asm/vvar.h. */
#define EMIT_VVAR(name, offset) vvar_ ## name = vvar + offset; #define EMIT_VVAR(name, offset) vvar_ ## name = vvar + offset;
...@@ -22,7 +19,6 @@ SECTIONS ...@@ -22,7 +19,6 @@ SECTIONS
#include <asm/vvar.h> #include <asm/vvar.h>
#undef __VVAR_KERNEL_LDS #undef __VVAR_KERNEL_LDS
#undef EMIT_VVAR #undef EMIT_VVAR
} :text :vvar_sect
#endif #endif
. = SIZEOF_HEADERS; . = SIZEOF_HEADERS;
...@@ -61,7 +57,12 @@ SECTIONS ...@@ -61,7 +57,12 @@ SECTIONS
*/ */
. = ALIGN(0x100); . = ALIGN(0x100);
.text : { *(.text*) } :text =0x90909090 .text : { *(.text*) } :text =0x90909090,
/*
* The comma above works around a bug in gold:
* https://sourceware.org/bugzilla/show_bug.cgi?id=16804
*/
/DISCARD/ : { /DISCARD/ : {
*(.discard) *(.discard)
...@@ -84,8 +85,4 @@ PHDRS ...@@ -84,8 +85,4 @@ PHDRS
dynamic PT_DYNAMIC FLAGS(4); /* PF_R */ dynamic PT_DYNAMIC FLAGS(4); /* PF_R */
note PT_NOTE FLAGS(4); /* PF_R */ note PT_NOTE FLAGS(4); /* PF_R */
eh_frame_hdr PT_GNU_EH_FRAME; eh_frame_hdr PT_GNU_EH_FRAME;
#ifdef BUILD_VDSO32
vvar_sect PT_NULL FLAGS(4); /* PF_R */
hpet_sect PT_NULL FLAGS(4); /* PF_R */
#endif
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment