Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+8
-11
+8
-11
arch/x86/vdso/vdso-layout.lds.S
+8
-11
arch/x86/vdso/vdso-layout.lds.S
···
9
9
#ifdef BUILD_VDSO32
10
10
#include <asm/vdso32.h>
11
11
12
-
.hpet_sect : {
13
-
hpet_page = . - VDSO_OFFSET(VDSO_HPET_PAGE);
14
-
} :text :hpet_sect
12
+
hpet_page = . - VDSO_OFFSET(VDSO_HPET_PAGE);
15
13
16
-
.vvar_sect : {
17
-
vvar = . - VDSO_OFFSET(VDSO_VVAR_PAGE);
14
+
vvar = . - VDSO_OFFSET(VDSO_VVAR_PAGE);
18
15
19
16
/* Place all vvars at the offsets in asm/vvar.h. */
20
17
#define EMIT_VVAR(name, offset) vvar_ ## name = vvar + offset;
···
19
22
#include <asm/vvar.h>
20
23
#undef __VVAR_KERNEL_LDS
21
24
#undef EMIT_VVAR
22
-
} :text :vvar_sect
23
25
#endif
24
26
. = SIZEOF_HEADERS;
25
27
···
57
61
*/
58
62
. = ALIGN(0x100);
59
63
60
-
.text : { *(.text*) } :text =0x90909090
64
+
.text : { *(.text*) } :text =0x90909090,
65
+
66
+
/*
67
+
* The comma above works around a bug in gold:
68
+
* https://sourceware.org/bugzilla/show_bug.cgi?id=16804
69
+
*/
61
70
62
71
/DISCARD/ : {
63
72
*(.discard)
···
85
84
dynamic PT_DYNAMIC FLAGS(4); /* PF_R */
86
85
note PT_NOTE FLAGS(4); /* PF_R */
87
86
eh_frame_hdr PT_GNU_EH_FRAME;
88
-
#ifdef BUILD_VDSO32
89
-
vvar_sect PT_NULL FLAGS(4); /* PF_R */
90
-
hpet_sect PT_NULL FLAGS(4); /* PF_R */
91
-
#endif
92
87
}