diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-11-11 05:15:21 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-11 06:25:39 -0500 |
commit | a7f290dad32ee34d931561b7943c858fe2aae503 (patch) | |
tree | 850f04ed9ffba8aef6e151fa9c9e8a0c667bb795 /arch/ppc64/kernel/vdso64/vdso64.lds.S | |
parent | 6761c4a07378e19e3710bb69cea65795774529b1 (diff) |
[PATCH] powerpc: Merge vdso's and add vdso support to 32 bits kernel
This patch moves the vdso's to arch/powerpc, adds support for the 32
bits vdso to the 32 bits kernel, rename systemcfg (finally !), and adds
some new (still untested) routines to both vdso's: clock_gettime() with
support for CLOCK_REALTIME and CLOCK_MONOTONIC, clock_getres() (same
clocks) and get_tbfreq() for glibc to retreive the timebase frequency.
Tom,Steve: The implementation of get_tbfreq() I've done for 32 bits
returns a long long (r3, r4) not a long. This is such that if we ever
add support for >4Ghz timebases on ppc32, the userland interface won't
have to change.
I have tested gettimeofday() using some glibc patches in both ppc32 and
ppc64 kernels using 32 bits userland (I haven't had a chance to test a
64 bits userland yet, but the implementation didn't change and was
tested earlier). I haven't tested yet the new functions.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/vdso64/vdso64.lds.S')
-rw-r--r-- | arch/ppc64/kernel/vdso64/vdso64.lds.S | 113 |
1 files changed, 0 insertions, 113 deletions
diff --git a/arch/ppc64/kernel/vdso64/vdso64.lds.S b/arch/ppc64/kernel/vdso64/vdso64.lds.S deleted file mode 100644 index 9cb28181da80..000000000000 --- a/arch/ppc64/kernel/vdso64/vdso64.lds.S +++ /dev/null | |||
@@ -1,113 +0,0 @@ | |||
1 | /* | ||
2 | * This is the infamous ld script for the 64 bits vdso | ||
3 | * library | ||
4 | */ | ||
5 | #include <asm/vdso.h> | ||
6 | |||
7 | OUTPUT_FORMAT("elf64-powerpc", "elf64-powerpc", "elf64-powerpc") | ||
8 | OUTPUT_ARCH(powerpc:common64) | ||
9 | ENTRY(_start) | ||
10 | |||
11 | SECTIONS | ||
12 | { | ||
13 | . = VDSO64_LBASE + SIZEOF_HEADERS; | ||
14 | .hash : { *(.hash) } :text | ||
15 | .dynsym : { *(.dynsym) } | ||
16 | .dynstr : { *(.dynstr) } | ||
17 | .gnu.version : { *(.gnu.version) } | ||
18 | .gnu.version_d : { *(.gnu.version_d) } | ||
19 | .gnu.version_r : { *(.gnu.version_r) } | ||
20 | |||
21 | .note : { *(.note.*) } :text :note | ||
22 | |||
23 | . = ALIGN (16); | ||
24 | .text : | ||
25 | { | ||
26 | *(.text .stub .text.* .gnu.linkonce.t.*) | ||
27 | *(.sfpr .glink) | ||
28 | } :text | ||
29 | PROVIDE (__etext = .); | ||
30 | PROVIDE (_etext = .); | ||
31 | PROVIDE (etext = .); | ||
32 | |||
33 | /* Other stuff is appended to the text segment: */ | ||
34 | .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) } | ||
35 | .rodata1 : { *(.rodata1) } | ||
36 | .eh_frame_hdr : { *(.eh_frame_hdr) } :text :eh_frame_hdr | ||
37 | .eh_frame : { KEEP (*(.eh_frame)) } :text | ||
38 | .gcc_except_table : { *(.gcc_except_table) } | ||
39 | |||
40 | .opd ALIGN(8) : { KEEP (*(.opd)) } | ||
41 | .got ALIGN(8) : { *(.got .toc) } | ||
42 | .rela.dyn ALIGN(8) : { *(.rela.dyn) } | ||
43 | |||
44 | .dynamic : { *(.dynamic) } :text :dynamic | ||
45 | |||
46 | _end = .; | ||
47 | PROVIDE (end = .); | ||
48 | |||
49 | /* Stabs debugging sections are here too | ||
50 | */ | ||
51 | .stab 0 : { *(.stab) } | ||
52 | .stabstr 0 : { *(.stabstr) } | ||
53 | .stab.excl 0 : { *(.stab.excl) } | ||
54 | .stab.exclstr 0 : { *(.stab.exclstr) } | ||
55 | .stab.index 0 : { *(.stab.index) } | ||
56 | .stab.indexstr 0 : { *(.stab.indexstr) } | ||
57 | .comment 0 : { *(.comment) } | ||
58 | /* DWARF debug sectio/ns. | ||
59 | Symbols in the DWARF debugging sections are relative to the beginning | ||
60 | of the section so we begin them at 0. */ | ||
61 | /* DWARF 1 */ | ||
62 | .debug 0 : { *(.debug) } | ||
63 | .line 0 : { *(.line) } | ||
64 | /* GNU DWARF 1 extensions */ | ||
65 | .debug_srcinfo 0 : { *(.debug_srcinfo) } | ||
66 | .debug_sfnames 0 : { *(.debug_sfnames) } | ||
67 | /* DWARF 1.1 and DWARF 2 */ | ||
68 | .debug_aranges 0 : { *(.debug_aranges) } | ||
69 | .debug_pubnames 0 : { *(.debug_pubnames) } | ||
70 | /* DWARF 2 */ | ||
71 | .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) } | ||
72 | .debug_abbrev 0 : { *(.debug_abbrev) } | ||
73 | .debug_line 0 : { *(.debug_line) } | ||
74 | .debug_frame 0 : { *(.debug_frame) } | ||
75 | .debug_str 0 : { *(.debug_str) } | ||
76 | .debug_loc 0 : { *(.debug_loc) } | ||
77 | .debug_macinfo 0 : { *(.debug_macinfo) } | ||
78 | /* SGI/MIPS DWARF 2 extensions */ | ||
79 | .debug_weaknames 0 : { *(.debug_weaknames) } | ||
80 | .debug_funcnames 0 : { *(.debug_funcnames) } | ||
81 | .debug_typenames 0 : { *(.debug_typenames) } | ||
82 | .debug_varnames 0 : { *(.debug_varnames) } | ||
83 | |||
84 | /DISCARD/ : { *(.note.GNU-stack) } | ||
85 | /DISCARD/ : { *(.branch_lt) } | ||
86 | /DISCARD/ : { *(.data .data.* .gnu.linkonce.d.*) } | ||
87 | /DISCARD/ : { *(.bss .sbss .dynbss .dynsbss) } | ||
88 | } | ||
89 | |||
90 | PHDRS | ||
91 | { | ||
92 | text PT_LOAD FILEHDR PHDRS FLAGS(5); /* PF_R|PF_X */ | ||
93 | note PT_NOTE FLAGS(4); /* PF_R */ | ||
94 | dynamic PT_DYNAMIC FLAGS(4); /* PF_R */ | ||
95 | eh_frame_hdr 0x6474e550; /* PT_GNU_EH_FRAME, but ld doesn't match the name */ | ||
96 | } | ||
97 | |||
98 | /* | ||
99 | * This controls what symbols we export from the DSO. | ||
100 | */ | ||
101 | VERSION | ||
102 | { | ||
103 | VDSO_VERSION_STRING { | ||
104 | global: | ||
105 | __kernel_datapage_offset; /* Has to be there for the kernel to find it */ | ||
106 | __kernel_get_syscall_map; | ||
107 | __kernel_gettimeofday; | ||
108 | __kernel_sync_dicache; | ||
109 | __kernel_sync_dicache_p5; | ||
110 | __kernel_sigtramp_rt64; | ||
111 | local: *; | ||
112 | }; | ||
113 | } | ||