diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-05-06 15:32:46 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-06-23 09:54:56 -0400 |
commit | db5ede6f5e653cc986b3fd6008de970f996d9431 (patch) | |
tree | 35fad58ba3325c6d71de2fa25ed1302c6d2b043a /arch/h8300 | |
parent | c805a5b7ca7696bdf96ccd831fe20f7fd2e1b609 (diff) |
h8300: Hardcode symbol prefixes in asm sources
Commit e1b5bb6d1236d4ad2084c53aa83dde7cdf6f8eea ("consolidate cond_syscall
and SYSCALL_ALIAS declarations") broke the h8300 build because it removed
the duplicate SYMBOL_NAME() macro from arch/h8300/include/asm/linkage.h,
and all the h8300 asm files include <asm/linkage.h> instead of
<linux/linkage.h>:
arch/h8300/kernel/entry.S: Assembler messages:
arch/h8300/kernel/entry.S:158: Error: junk at end of line, first unrecognized character is `('
...
arch/h8300/kernel/syscalls.S: Assembler messages:
arch/h8300/kernel/syscalls.S:6: Error: junk at end of line, first unrecognized character is `('
...
arch/h8300/lib/abs.S: Assembler messages:
arch/h8300/lib/abs.S:12: Error: junk at end of line, first unrecognized character is `('
...
arch/h8300/lib/memcpy.S: Assembler messages:
arch/h8300/lib/memcpy.S:13: Error: junk at end of line, first unrecognized character is `('
...
arch/h8300/lib/memset.S: Assembler messages:
arch/h8300/lib/memset.S:13: Error: junk at end of line, first unrecognized character is `('
...
Commit 126de6b20bfb82cc19012d5048f11f339ae5a021 ("linkage.h: fix build
breakage due to symbol prefix handling") broke it even more, by removing
SYMBOL_NAME() and replacing it by __SYMBOL_NAME().
Commit f8ce1faf55955de62e0a12e330c6d9a526071f65 ("Merge tag
'modules-next-for-linus' of
git://git.kernel.org/pub/scm/linuxkernel/git/rusty/linux")
also removed __SYMBOL_NAME(), hidden in a merge conflict resolution.
Hence, replace the use of SYMBOL_NAME() and SYMBOL_NAME_LABEL() in h8300
assembler sources by hardcoding the underscore symbol prefix, like other
architectures (blackfin/metag) do.
This allows to kill SYMBOL_NAME_LABEL(). Now <asm/linkage.h> becomes empty,
and h8300 can be switched to asm-generic/linkage.h.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/h8300')
-rw-r--r-- | arch/h8300/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/h8300/include/asm/linkage.h | 6 | ||||
-rw-r--r-- | arch/h8300/kernel/entry.S | 118 | ||||
-rw-r--r-- | arch/h8300/kernel/syscalls.S | 646 | ||||
-rw-r--r-- | arch/h8300/lib/abs.S | 4 | ||||
-rw-r--r-- | arch/h8300/lib/memcpy.S | 4 | ||||
-rw-r--r-- | arch/h8300/lib/memset.S | 4 | ||||
-rw-r--r-- | arch/h8300/platform/h8300h/aki3068net/crt0_ram.S | 16 | ||||
-rw-r--r-- | arch/h8300/platform/h8300h/generic/crt0_ram.S | 14 | ||||
-rw-r--r-- | arch/h8300/platform/h8300h/generic/crt0_rom.S | 14 | ||||
-rw-r--r-- | arch/h8300/platform/h8300h/h8max/crt0_ram.S | 16 | ||||
-rw-r--r-- | arch/h8300/platform/h8s/edosk2674/crt0_ram.S | 16 | ||||
-rw-r--r-- | arch/h8300/platform/h8s/edosk2674/crt0_rom.S | 14 | ||||
-rw-r--r-- | arch/h8300/platform/h8s/generic/crt0_ram.S | 16 | ||||
-rw-r--r-- | arch/h8300/platform/h8s/generic/crt0_rom.S | 12 |
15 files changed, 448 insertions, 453 deletions
diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild index 995eb47e01bb..e0bce3028a78 100644 --- a/arch/h8300/include/asm/Kbuild +++ b/arch/h8300/include/asm/Kbuild | |||
@@ -1,6 +1,7 @@ | |||
1 | 1 | ||
2 | generic-y += clkdev.h | 2 | generic-y += clkdev.h |
3 | generic-y += exec.h | 3 | generic-y += exec.h |
4 | generic-y += linkage.h | ||
4 | generic-y += mmu.h | 5 | generic-y += mmu.h |
5 | generic-y += module.h | 6 | generic-y += module.h |
6 | generic-y += trace_clock.h | 7 | generic-y += trace_clock.h |
diff --git a/arch/h8300/include/asm/linkage.h b/arch/h8300/include/asm/linkage.h deleted file mode 100644 index 1d81604fb0ad..000000000000 --- a/arch/h8300/include/asm/linkage.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _H8300_LINKAGE_H | ||
2 | #define _H8300_LINKAGE_H | ||
3 | |||
4 | #undef SYMBOL_NAME_LABEL | ||
5 | #define SYMBOL_NAME_LABEL(_name_) _##_name_##: | ||
6 | #endif | ||
diff --git a/arch/h8300/kernel/entry.S b/arch/h8300/kernel/entry.S index 617a6878787f..94bd30f11df6 100644 --- a/arch/h8300/kernel/entry.S +++ b/arch/h8300/kernel/entry.S | |||
@@ -87,13 +87,13 @@ INTERRUPTS = 128 | |||
87 | bne 5f | 87 | bne 5f |
88 | 88 | ||
89 | /* user mode */ | 89 | /* user mode */ |
90 | mov.l sp,@SYMBOL_NAME(sw_usp) | 90 | mov.l sp,@_sw_usp |
91 | mov.l @sp,er0 /* restore saved er0 */ | 91 | mov.l @sp,er0 /* restore saved er0 */ |
92 | orc #0x10,ccr /* switch kernel stack */ | 92 | orc #0x10,ccr /* switch kernel stack */ |
93 | mov.l @SYMBOL_NAME(sw_ksp),sp | 93 | mov.l @_sw_ksp,sp |
94 | sub.l #(LRET-LORIG),sp /* allocate LORIG - LRET */ | 94 | sub.l #(LRET-LORIG),sp /* allocate LORIG - LRET */ |
95 | SAVEREGS | 95 | SAVEREGS |
96 | mov.l @SYMBOL_NAME(sw_usp),er0 | 96 | mov.l @_sw_usp,er0 |
97 | mov.l @(USERRET:16,er0),er1 /* copy the RET addr */ | 97 | mov.l @(USERRET:16,er0),er1 /* copy the RET addr */ |
98 | mov.l er1,@(LRET-LER3:16,sp) | 98 | mov.l er1,@(LRET-LER3:16,sp) |
99 | SAVEEXR | 99 | SAVEEXR |
@@ -128,7 +128,7 @@ INTERRUPTS = 128 | |||
128 | bne 7f | 128 | bne 7f |
129 | 129 | ||
130 | orc #0x80,ccr | 130 | orc #0x80,ccr |
131 | mov.l @SYMBOL_NAME(sw_usp),er0 | 131 | mov.l @_sw_usp,er0 |
132 | mov.l @(LER0-LER1:16,sp),er1 /* restore ER0 */ | 132 | mov.l @(LER0-LER1:16,sp),er1 /* restore ER0 */ |
133 | mov.l er1,@er0 | 133 | mov.l er1,@er0 |
134 | RESTOREEXR | 134 | RESTOREEXR |
@@ -141,7 +141,7 @@ INTERRUPTS = 128 | |||
141 | 141 | ||
142 | mov.l @sp+,er1 | 142 | mov.l @sp+,er1 |
143 | add.l #(LRET-LER1),sp /* remove LORIG - LRET */ | 143 | add.l #(LRET-LER1),sp /* remove LORIG - LRET */ |
144 | mov.l sp,@SYMBOL_NAME(sw_ksp) | 144 | mov.l sp,@_sw_ksp |
145 | andc #0xef,ccr /* switch to user mode */ | 145 | andc #0xef,ccr /* switch to user mode */ |
146 | mov.l er0,sp | 146 | mov.l er0,sp |
147 | bra 8f | 147 | bra 8f |
@@ -155,20 +155,20 @@ INTERRUPTS = 128 | |||
155 | rte | 155 | rte |
156 | .endm | 156 | .endm |
157 | 157 | ||
158 | .globl SYMBOL_NAME(system_call) | 158 | .globl _system_call |
159 | .globl SYMBOL_NAME(ret_from_exception) | 159 | .globl _ret_from_exception |
160 | .globl SYMBOL_NAME(ret_from_fork) | 160 | .globl _ret_from_fork |
161 | .globl SYMBOL_NAME(ret_from_kernel_thread) | 161 | .globl _ret_from_kernel_thread |
162 | .globl SYMBOL_NAME(ret_from_interrupt) | 162 | .globl _ret_from_interrupt |
163 | .globl SYMBOL_NAME(interrupt_redirect_table) | 163 | .globl _interrupt_redirect_table |
164 | .globl SYMBOL_NAME(sw_ksp),SYMBOL_NAME(sw_usp) | 164 | .globl _sw_ksp,_sw_usp |
165 | .globl SYMBOL_NAME(resume) | 165 | .globl _resume |
166 | .globl SYMBOL_NAME(interrupt_entry) | 166 | .globl _interrupt_entry |
167 | .globl SYMBOL_NAME(trace_break) | 167 | .globl _trace_break |
168 | 168 | ||
169 | #if defined(CONFIG_ROMKERNEL) | 169 | #if defined(CONFIG_ROMKERNEL) |
170 | .section .int_redirect,"ax" | 170 | .section .int_redirect,"ax" |
171 | SYMBOL_NAME_LABEL(interrupt_redirect_table) | 171 | _interrupt_redirect_table: |
172 | #if defined(CONFIG_CPU_H8300H) | 172 | #if defined(CONFIG_CPU_H8300H) |
173 | .rept 7 | 173 | .rept 7 |
174 | .long 0 | 174 | .long 0 |
@@ -178,54 +178,54 @@ SYMBOL_NAME_LABEL(interrupt_redirect_table) | |||
178 | .rept 5 | 178 | .rept 5 |
179 | .long 0 | 179 | .long 0 |
180 | .endr | 180 | .endr |
181 | jmp @SYMBOL_NAME(trace_break) | 181 | jmp @_trace_break |
182 | .long 0 | 182 | .long 0 |
183 | #endif | 183 | #endif |
184 | 184 | ||
185 | jsr @SYMBOL_NAME(interrupt_entry) /* NMI */ | 185 | jsr @_interrupt_entry /* NMI */ |
186 | jmp @SYMBOL_NAME(system_call) /* TRAPA #0 (System call) */ | 186 | jmp @_system_call /* TRAPA #0 (System call) */ |
187 | .long 0 | 187 | .long 0 |
188 | .long 0 | 188 | .long 0 |
189 | jmp @SYMBOL_NAME(trace_break) /* TRAPA #3 (breakpoint) */ | 189 | jmp @_trace_break /* TRAPA #3 (breakpoint) */ |
190 | .rept INTERRUPTS-12 | 190 | .rept INTERRUPTS-12 |
191 | jsr @SYMBOL_NAME(interrupt_entry) | 191 | jsr @_interrupt_entry |
192 | .endr | 192 | .endr |
193 | #endif | 193 | #endif |
194 | #if defined(CONFIG_RAMKERNEL) | 194 | #if defined(CONFIG_RAMKERNEL) |
195 | .globl SYMBOL_NAME(interrupt_redirect_table) | 195 | .globl _interrupt_redirect_table |
196 | .section .bss | 196 | .section .bss |
197 | SYMBOL_NAME_LABEL(interrupt_redirect_table) | 197 | _interrupt_redirect_table: |
198 | .space 4 | 198 | .space 4 |
199 | #endif | 199 | #endif |
200 | 200 | ||
201 | .section .text | 201 | .section .text |
202 | .align 2 | 202 | .align 2 |
203 | SYMBOL_NAME_LABEL(interrupt_entry) | 203 | _interrupt_entry: |
204 | SAVE_ALL | 204 | SAVE_ALL |
205 | mov.l sp,er0 | 205 | mov.l sp,er0 |
206 | add.l #LVEC,er0 | 206 | add.l #LVEC,er0 |
207 | btst #4,r1l | 207 | btst #4,r1l |
208 | bne 1f | 208 | bne 1f |
209 | /* user LVEC */ | 209 | /* user LVEC */ |
210 | mov.l @SYMBOL_NAME(sw_usp),er0 | 210 | mov.l @_sw_usp,er0 |
211 | adds #4,er0 | 211 | adds #4,er0 |
212 | 1: | 212 | 1: |
213 | mov.l @er0,er0 /* LVEC address */ | 213 | mov.l @er0,er0 /* LVEC address */ |
214 | #if defined(CONFIG_ROMKERNEL) | 214 | #if defined(CONFIG_ROMKERNEL) |
215 | sub.l #SYMBOL_NAME(interrupt_redirect_table),er0 | 215 | sub.l #_interrupt_redirect_table,er0 |
216 | #endif | 216 | #endif |
217 | #if defined(CONFIG_RAMKERNEL) | 217 | #if defined(CONFIG_RAMKERNEL) |
218 | mov.l @SYMBOL_NAME(interrupt_redirect_table),er1 | 218 | mov.l @_interrupt_redirect_table,er1 |
219 | sub.l er1,er0 | 219 | sub.l er1,er0 |
220 | #endif | 220 | #endif |
221 | SHLR2 er0 | 221 | SHLR2 er0 |
222 | dec.l #1,er0 | 222 | dec.l #1,er0 |
223 | mov.l sp,er1 | 223 | mov.l sp,er1 |
224 | subs #4,er1 /* adjust ret_pc */ | 224 | subs #4,er1 /* adjust ret_pc */ |
225 | jsr @SYMBOL_NAME(do_IRQ) | 225 | jsr @_do_IRQ |
226 | jmp @SYMBOL_NAME(ret_from_interrupt) | 226 | jmp @_ret_from_interrupt |
227 | 227 | ||
228 | SYMBOL_NAME_LABEL(system_call) | 228 | _system_call: |
229 | subs #4,sp /* dummy LVEC */ | 229 | subs #4,sp /* dummy LVEC */ |
230 | SAVE_ALL | 230 | SAVE_ALL |
231 | andc #0x7f,ccr | 231 | andc #0x7f,ccr |
@@ -233,21 +233,21 @@ SYMBOL_NAME_LABEL(system_call) | |||
233 | 233 | ||
234 | /* save top of frame */ | 234 | /* save top of frame */ |
235 | mov.l sp,er0 | 235 | mov.l sp,er0 |
236 | jsr @SYMBOL_NAME(set_esp0) | 236 | jsr @_set_esp0 |
237 | mov.l sp,er2 | 237 | mov.l sp,er2 |
238 | and.w #0xe000,r2 | 238 | and.w #0xe000,r2 |
239 | mov.b @((TI_FLAGS+3-(TIF_SYSCALL_TRACE >> 3)):16,er2),r2l | 239 | mov.b @((TI_FLAGS+3-(TIF_SYSCALL_TRACE >> 3)):16,er2),r2l |
240 | btst #(TIF_SYSCALL_TRACE & 7),r2l | 240 | btst #(TIF_SYSCALL_TRACE & 7),r2l |
241 | beq 1f | 241 | beq 1f |
242 | jsr @SYMBOL_NAME(do_syscall_trace) | 242 | jsr @_do_syscall_trace |
243 | 1: | 243 | 1: |
244 | cmp.l #NR_syscalls,er4 | 244 | cmp.l #NR_syscalls,er4 |
245 | bcc badsys | 245 | bcc badsys |
246 | SHLL2 er4 | 246 | SHLL2 er4 |
247 | mov.l #SYMBOL_NAME(sys_call_table),er0 | 247 | mov.l #_sys_call_table,er0 |
248 | add.l er4,er0 | 248 | add.l er4,er0 |
249 | mov.l @er0,er4 | 249 | mov.l @er0,er4 |
250 | beq SYMBOL_NAME(ret_from_exception):16 | 250 | beq _ret_from_exception:16 |
251 | mov.l @(LER1:16,sp),er0 | 251 | mov.l @(LER1:16,sp),er0 |
252 | mov.l @(LER2:16,sp),er1 | 252 | mov.l @(LER2:16,sp),er1 |
253 | mov.l @(LER3:16,sp),er2 | 253 | mov.l @(LER3:16,sp),er2 |
@@ -258,10 +258,10 @@ SYMBOL_NAME_LABEL(system_call) | |||
258 | mov.b @((TI_FLAGS+3-(TIF_SYSCALL_TRACE >> 3)):16,er2),r2l | 258 | mov.b @((TI_FLAGS+3-(TIF_SYSCALL_TRACE >> 3)):16,er2),r2l |
259 | btst #(TIF_SYSCALL_TRACE & 7),r2l | 259 | btst #(TIF_SYSCALL_TRACE & 7),r2l |
260 | beq 2f | 260 | beq 2f |
261 | jsr @SYMBOL_NAME(do_syscall_trace) | 261 | jsr @_do_syscall_trace |
262 | 2: | 262 | 2: |
263 | #if defined(CONFIG_SYSCALL_PRINT) | 263 | #if defined(CONFIG_SYSCALL_PRINT) |
264 | jsr @SYMBOL_NAME(syscall_print) | 264 | jsr @_syscall_print |
265 | #endif | 265 | #endif |
266 | orc #0x80,ccr | 266 | orc #0x80,ccr |
267 | bra resume_userspace | 267 | bra resume_userspace |
@@ -275,11 +275,11 @@ badsys: | |||
275 | #define resume_kernel restore_all | 275 | #define resume_kernel restore_all |
276 | #endif | 276 | #endif |
277 | 277 | ||
278 | SYMBOL_NAME_LABEL(ret_from_exception) | 278 | _ret_from_exception: |
279 | #if defined(CONFIG_PREEMPT) | 279 | #if defined(CONFIG_PREEMPT) |
280 | orc #0x80,ccr | 280 | orc #0x80,ccr |
281 | #endif | 281 | #endif |
282 | SYMBOL_NAME_LABEL(ret_from_interrupt) | 282 | _ret_from_interrupt: |
283 | mov.b @(LCCR+1:16,sp),r0l | 283 | mov.b @(LCCR+1:16,sp),r0l |
284 | btst #4,r0l | 284 | btst #4,r0l |
285 | bne resume_kernel:8 /* return from kernel */ | 285 | bne resume_kernel:8 /* return from kernel */ |
@@ -296,12 +296,12 @@ work_pending: | |||
296 | /* work notifysig */ | 296 | /* work notifysig */ |
297 | mov.l sp,er0 | 297 | mov.l sp,er0 |
298 | subs #4,er0 /* er0: pt_regs */ | 298 | subs #4,er0 /* er0: pt_regs */ |
299 | jsr @SYMBOL_NAME(do_notify_resume) | 299 | jsr @_do_notify_resume |
300 | bra restore_all:8 | 300 | bra restore_all:8 |
301 | work_resched: | 301 | work_resched: |
302 | mov.l sp,er0 | 302 | mov.l sp,er0 |
303 | jsr @SYMBOL_NAME(set_esp0) | 303 | jsr @_set_esp0 |
304 | jsr @SYMBOL_NAME(schedule) | 304 | jsr @_schedule |
305 | bra resume_userspace:8 | 305 | bra resume_userspace:8 |
306 | restore_all: | 306 | restore_all: |
307 | RESTORE_ALL /* Does RTE */ | 307 | RESTORE_ALL /* Does RTE */ |
@@ -320,26 +320,26 @@ need_resched: | |||
320 | mov.l er0,@(TI_PRE_COUNT:16,er4) | 320 | mov.l er0,@(TI_PRE_COUNT:16,er4) |
321 | andc #0x7f,ccr | 321 | andc #0x7f,ccr |
322 | mov.l sp,er0 | 322 | mov.l sp,er0 |
323 | jsr @SYMBOL_NAME(set_esp0) | 323 | jsr @_set_esp0 |
324 | jsr @SYMBOL_NAME(schedule) | 324 | jsr @_schedule |
325 | orc #0x80,ccr | 325 | orc #0x80,ccr |
326 | bra need_resched:8 | 326 | bra need_resched:8 |
327 | #endif | 327 | #endif |
328 | 328 | ||
329 | SYMBOL_NAME_LABEL(ret_from_fork) | 329 | _ret_from_fork: |
330 | mov.l er2,er0 | 330 | mov.l er2,er0 |
331 | jsr @SYMBOL_NAME(schedule_tail) | 331 | jsr @_schedule_tail |
332 | jmp @SYMBOL_NAME(ret_from_exception) | 332 | jmp @_ret_from_exception |
333 | 333 | ||
334 | SYMBOL_NAME_LABEL(ret_from_kernel_thread) | 334 | _ret_from_kernel_thread: |
335 | mov.l er2,er0 | 335 | mov.l er2,er0 |
336 | jsr @SYMBOL_NAME(schedule_tail) | 336 | jsr @_schedule_tail |
337 | mov.l @(LER4:16,sp),er0 | 337 | mov.l @(LER4:16,sp),er0 |
338 | mov.l @(LER5:16,sp),er1 | 338 | mov.l @(LER5:16,sp),er1 |
339 | jsr @er1 | 339 | jsr @er1 |
340 | jmp @SYMBOL_NAME(ret_from_exception) | 340 | jmp @_ret_from_exception |
341 | 341 | ||
342 | SYMBOL_NAME_LABEL(resume) | 342 | _resume: |
343 | /* | 343 | /* |
344 | * Beware - when entering resume, offset of tss is in d1, | 344 | * Beware - when entering resume, offset of tss is in d1, |
345 | * prev (the current task) is in a0, next (the new task) | 345 | * prev (the current task) is in a0, next (the new task) |
@@ -355,7 +355,7 @@ SYMBOL_NAME_LABEL(resume) | |||
355 | 355 | ||
356 | /* disable interrupts */ | 356 | /* disable interrupts */ |
357 | orc #0x80,ccr | 357 | orc #0x80,ccr |
358 | mov.l @SYMBOL_NAME(sw_usp),er3 | 358 | mov.l @_sw_usp,er3 |
359 | mov.l er3,@(THREAD_USP:16,er0) | 359 | mov.l er3,@(THREAD_USP:16,er0) |
360 | mov.l sp,@(THREAD_KSP:16,er0) | 360 | mov.l sp,@(THREAD_KSP:16,er0) |
361 | 361 | ||
@@ -363,7 +363,7 @@ SYMBOL_NAME_LABEL(resume) | |||
363 | /* FIXME: what did we hack out of here, this does nothing! */ | 363 | /* FIXME: what did we hack out of here, this does nothing! */ |
364 | 364 | ||
365 | mov.l @(THREAD_USP:16,er1),er0 | 365 | mov.l @(THREAD_USP:16,er1),er0 |
366 | mov.l er0,@SYMBOL_NAME(sw_usp) | 366 | mov.l er0,@_sw_usp |
367 | mov.l @(THREAD_KSP:16,er1),sp | 367 | mov.l @(THREAD_KSP:16,er1),sp |
368 | 368 | ||
369 | /* restore status register */ | 369 | /* restore status register */ |
@@ -372,15 +372,15 @@ SYMBOL_NAME_LABEL(resume) | |||
372 | ldc r3l,ccr | 372 | ldc r3l,ccr |
373 | rts | 373 | rts |
374 | 374 | ||
375 | SYMBOL_NAME_LABEL(trace_break) | 375 | _trace_break: |
376 | subs #4,sp | 376 | subs #4,sp |
377 | SAVE_ALL | 377 | SAVE_ALL |
378 | sub.l er1,er1 | 378 | sub.l er1,er1 |
379 | dec.l #1,er1 | 379 | dec.l #1,er1 |
380 | mov.l er1,@(LORIG,sp) | 380 | mov.l er1,@(LORIG,sp) |
381 | mov.l sp,er0 | 381 | mov.l sp,er0 |
382 | jsr @SYMBOL_NAME(set_esp0) | 382 | jsr @_set_esp0 |
383 | mov.l @SYMBOL_NAME(sw_usp),er0 | 383 | mov.l @_sw_usp,er0 |
384 | mov.l @er0,er1 | 384 | mov.l @er0,er1 |
385 | mov.w @(-2:16,er1),r2 | 385 | mov.w @(-2:16,er1),r2 |
386 | cmp.w #0x5730,r2 | 386 | cmp.w #0x5730,r2 |
@@ -390,13 +390,13 @@ SYMBOL_NAME_LABEL(trace_break) | |||
390 | 1: | 390 | 1: |
391 | and.w #0xff,e1 | 391 | and.w #0xff,e1 |
392 | mov.l er1,er0 | 392 | mov.l er1,er0 |
393 | jsr @SYMBOL_NAME(trace_trap) | 393 | jsr @_trace_trap |
394 | jmp @SYMBOL_NAME(ret_from_exception) | 394 | jmp @_ret_from_exception |
395 | 395 | ||
396 | .section .bss | 396 | .section .bss |
397 | SYMBOL_NAME_LABEL(sw_ksp) | 397 | _sw_ksp: |
398 | .space 4 | 398 | .space 4 |
399 | SYMBOL_NAME_LABEL(sw_usp) | 399 | _sw_usp: |
400 | .space 4 | 400 | .space 4 |
401 | 401 | ||
402 | .end | 402 | .end |
diff --git a/arch/h8300/kernel/syscalls.S b/arch/h8300/kernel/syscalls.S index 5c2168fb9b9e..749700157349 100644 --- a/arch/h8300/kernel/syscalls.S +++ b/arch/h8300/kernel/syscalls.S | |||
@@ -2,8 +2,8 @@ | |||
2 | #include <linux/sys.h> | 2 | #include <linux/sys.h> |
3 | #include <asm/linkage.h> | 3 | #include <asm/linkage.h> |
4 | #include <asm/unistd.h> | 4 | #include <asm/unistd.h> |
5 | 5 | ||
6 | .globl SYMBOL_NAME(sys_call_table) | 6 | .globl _sys_call_table |
7 | 7 | ||
8 | #if defined(CONFIG_CPU_H8300H) | 8 | #if defined(CONFIG_CPU_H8300H) |
9 | .h8300h | 9 | .h8300h |
@@ -13,324 +13,324 @@ | |||
13 | #endif | 13 | #endif |
14 | .section .text | 14 | .section .text |
15 | .align 2 | 15 | .align 2 |
16 | SYMBOL_NAME_LABEL(sys_call_table) | 16 | _sys_call_table: |
17 | .long SYMBOL_NAME(sys_ni_syscall) /* 0 - old "setup()" system call*/ | 17 | .long _sys_ni_syscall /* 0 - old "setup()" system call*/ |
18 | .long SYMBOL_NAME(sys_exit) | 18 | .long _sys_exit |
19 | .long SYMBOL_NAME(sys_fork) | 19 | .long _sys_fork |
20 | .long SYMBOL_NAME(sys_read) | 20 | .long _sys_read |
21 | .long SYMBOL_NAME(sys_write) | 21 | .long _sys_write |
22 | .long SYMBOL_NAME(sys_open) /* 5 */ | 22 | .long _sys_open /* 5 */ |
23 | .long SYMBOL_NAME(sys_close) | 23 | .long _sys_close |
24 | .long SYMBOL_NAME(sys_waitpid) | 24 | .long _sys_waitpid |
25 | .long SYMBOL_NAME(sys_creat) | 25 | .long _sys_creat |
26 | .long SYMBOL_NAME(sys_link) | 26 | .long _sys_link |
27 | .long SYMBOL_NAME(sys_unlink) /* 10 */ | 27 | .long _sys_unlink /* 10 */ |
28 | .long SYMBOL_NAME(sys_execve) | 28 | .long _sys_execve |
29 | .long SYMBOL_NAME(sys_chdir) | 29 | .long _sys_chdir |
30 | .long SYMBOL_NAME(sys_time) | 30 | .long _sys_time |
31 | .long SYMBOL_NAME(sys_mknod) | 31 | .long _sys_mknod |
32 | .long SYMBOL_NAME(sys_chmod) /* 15 */ | 32 | .long _sys_chmod /* 15 */ |
33 | .long SYMBOL_NAME(sys_chown16) | 33 | .long _sys_chown16 |
34 | .long SYMBOL_NAME(sys_ni_syscall) /* old break syscall holder */ | 34 | .long _sys_ni_syscall /* old break syscall holder */ |
35 | .long SYMBOL_NAME(sys_stat) | 35 | .long _sys_stat |
36 | .long SYMBOL_NAME(sys_lseek) | 36 | .long _sys_lseek |
37 | .long SYMBOL_NAME(sys_getpid) /* 20 */ | 37 | .long _sys_getpid /* 20 */ |
38 | .long SYMBOL_NAME(sys_mount) | 38 | .long _sys_mount |
39 | .long SYMBOL_NAME(sys_oldumount) | 39 | .long _sys_oldumount |
40 | .long SYMBOL_NAME(sys_setuid16) | 40 | .long _sys_setuid16 |
41 | .long SYMBOL_NAME(sys_getuid16) | 41 | .long _sys_getuid16 |
42 | .long SYMBOL_NAME(sys_stime) /* 25 */ | 42 | .long _sys_stime /* 25 */ |
43 | .long SYMBOL_NAME(sys_ptrace) | 43 | .long _sys_ptrace |
44 | .long SYMBOL_NAME(sys_alarm) | 44 | .long _sys_alarm |
45 | .long SYMBOL_NAME(sys_fstat) | 45 | .long _sys_fstat |
46 | .long SYMBOL_NAME(sys_pause) | 46 | .long _sys_pause |
47 | .long SYMBOL_NAME(sys_utime) /* 30 */ | 47 | .long _sys_utime /* 30 */ |
48 | .long SYMBOL_NAME(sys_ni_syscall) /* old stty syscall holder */ | 48 | .long _sys_ni_syscall /* old stty syscall holder */ |
49 | .long SYMBOL_NAME(sys_ni_syscall) /* old gtty syscall holder */ | 49 | .long _sys_ni_syscall /* old gtty syscall holder */ |
50 | .long SYMBOL_NAME(sys_access) | 50 | .long _sys_access |
51 | .long SYMBOL_NAME(sys_nice) | 51 | .long _sys_nice |
52 | .long SYMBOL_NAME(sys_ni_syscall) /* 35 old ftime syscall holder */ | 52 | .long _sys_ni_syscall /* 35 old ftime syscall holder */ |
53 | .long SYMBOL_NAME(sys_sync) | 53 | .long _sys_sync |
54 | .long SYMBOL_NAME(sys_kill) | 54 | .long _sys_kill |
55 | .long SYMBOL_NAME(sys_rename) | 55 | .long _sys_rename |
56 | .long SYMBOL_NAME(sys_mkdir) | 56 | .long _sys_mkdir |
57 | .long SYMBOL_NAME(sys_rmdir) /* 40 */ | 57 | .long _sys_rmdir /* 40 */ |
58 | .long SYMBOL_NAME(sys_dup) | 58 | .long _sys_dup |
59 | .long SYMBOL_NAME(sys_pipe) | 59 | .long _sys_pipe |
60 | .long SYMBOL_NAME(sys_times) | 60 | .long _sys_times |
61 | .long SYMBOL_NAME(sys_ni_syscall) /* old prof syscall holder */ | 61 | .long _sys_ni_syscall /* old prof syscall holder */ |
62 | .long SYMBOL_NAME(sys_brk) /* 45 */ | 62 | .long _sys_brk /* 45 */ |
63 | .long SYMBOL_NAME(sys_setgid16) | 63 | .long _sys_setgid16 |
64 | .long SYMBOL_NAME(sys_getgid16) | 64 | .long _sys_getgid16 |
65 | .long SYMBOL_NAME(sys_signal) | 65 | .long _sys_signal |
66 | .long SYMBOL_NAME(sys_geteuid16) | 66 | .long _sys_geteuid16 |
67 | .long SYMBOL_NAME(sys_getegid16) /* 50 */ | 67 | .long _sys_getegid16 /* 50 */ |
68 | .long SYMBOL_NAME(sys_acct) | 68 | .long _sys_acct |
69 | .long SYMBOL_NAME(sys_umount) /* recycled never used phys() */ | 69 | .long _sys_umount /* recycled never used phys() */ |
70 | .long SYMBOL_NAME(sys_ni_syscall) /* old lock syscall holder */ | 70 | .long _sys_ni_syscall /* old lock syscall holder */ |
71 | .long SYMBOL_NAME(sys_ioctl) | 71 | .long _sys_ioctl |
72 | .long SYMBOL_NAME(sys_fcntl) /* 55 */ | 72 | .long _sys_fcntl /* 55 */ |
73 | .long SYMBOL_NAME(sys_ni_syscall) /* old mpx syscall holder */ | 73 | .long _sys_ni_syscall /* old mpx syscall holder */ |
74 | .long SYMBOL_NAME(sys_setpgid) | 74 | .long _sys_setpgid |
75 | .long SYMBOL_NAME(sys_ni_syscall) /* old ulimit syscall holder */ | 75 | .long _sys_ni_syscall /* old ulimit syscall holder */ |
76 | .long SYMBOL_NAME(sys_ni_syscall) | 76 | .long _sys_ni_syscall |
77 | .long SYMBOL_NAME(sys_umask) /* 60 */ | 77 | .long _sys_umask /* 60 */ |
78 | .long SYMBOL_NAME(sys_chroot) | 78 | .long _sys_chroot |
79 | .long SYMBOL_NAME(sys_ustat) | 79 | .long _sys_ustat |
80 | .long SYMBOL_NAME(sys_dup2) | 80 | .long _sys_dup2 |
81 | .long SYMBOL_NAME(sys_getppid) | 81 | .long _sys_getppid |
82 | .long SYMBOL_NAME(sys_getpgrp) /* 65 */ | 82 | .long _sys_getpgrp /* 65 */ |
83 | .long SYMBOL_NAME(sys_setsid) | 83 | .long _sys_setsid |
84 | .long SYMBOL_NAME(sys_sigaction) | 84 | .long _sys_sigaction |
85 | .long SYMBOL_NAME(sys_sgetmask) | 85 | .long _sys_sgetmask |
86 | .long SYMBOL_NAME(sys_ssetmask) | 86 | .long _sys_ssetmask |
87 | .long SYMBOL_NAME(sys_setreuid16) /* 70 */ | 87 | .long _sys_setreuid16 /* 70 */ |
88 | .long SYMBOL_NAME(sys_setregid16) | 88 | .long _sys_setregid16 |
89 | .long SYMBOL_NAME(sys_sigsuspend) | 89 | .long _sys_sigsuspend |
90 | .long SYMBOL_NAME(sys_sigpending) | 90 | .long _sys_sigpending |
91 | .long SYMBOL_NAME(sys_sethostname) | 91 | .long _sys_sethostname |
92 | .long SYMBOL_NAME(sys_setrlimit) /* 75 */ | 92 | .long _sys_setrlimit /* 75 */ |
93 | .long SYMBOL_NAME(sys_old_getrlimit) | 93 | .long _sys_old_getrlimit |
94 | .long SYMBOL_NAME(sys_getrusage) | 94 | .long _sys_getrusage |
95 | .long SYMBOL_NAME(sys_gettimeofday) | 95 | .long _sys_gettimeofday |
96 | .long SYMBOL_NAME(sys_settimeofday) | 96 | .long _sys_settimeofday |
97 | .long SYMBOL_NAME(sys_getgroups16) /* 80 */ | 97 | .long _sys_getgroups16 /* 80 */ |
98 | .long SYMBOL_NAME(sys_setgroups16) | 98 | .long _sys_setgroups16 |
99 | .long SYMBOL_NAME(sys_old_select) | 99 | .long _sys_old_select |
100 | .long SYMBOL_NAME(sys_symlink) | 100 | .long _sys_symlink |
101 | .long SYMBOL_NAME(sys_lstat) | 101 | .long _sys_lstat |
102 | .long SYMBOL_NAME(sys_readlink) /* 85 */ | 102 | .long _sys_readlink /* 85 */ |
103 | .long SYMBOL_NAME(sys_uselib) | 103 | .long _sys_uselib |
104 | .long SYMBOL_NAME(sys_swapon) | 104 | .long _sys_swapon |
105 | .long SYMBOL_NAME(sys_reboot) | 105 | .long _sys_reboot |
106 | .long SYMBOL_NAME(sys_old_readdir) | 106 | .long _sys_old_readdir |
107 | .long SYMBOL_NAME(sys_old_mmap) /* 90 */ | 107 | .long _sys_old_mmap /* 90 */ |
108 | .long SYMBOL_NAME(sys_munmap) | 108 | .long _sys_munmap |
109 | .long SYMBOL_NAME(sys_truncate) | 109 | .long _sys_truncate |
110 | .long SYMBOL_NAME(sys_ftruncate) | 110 | .long _sys_ftruncate |
111 | .long SYMBOL_NAME(sys_fchmod) | 111 | .long _sys_fchmod |
112 | .long SYMBOL_NAME(sys_fchown16) /* 95 */ | 112 | .long _sys_fchown16 /* 95 */ |
113 | .long SYMBOL_NAME(sys_getpriority) | 113 | .long _sys_getpriority |
114 | .long SYMBOL_NAME(sys_setpriority) | 114 | .long _sys_setpriority |
115 | .long SYMBOL_NAME(sys_ni_syscall) /* old profil syscall holder */ | 115 | .long _sys_ni_syscall /* old profil syscall holder */ |
116 | .long SYMBOL_NAME(sys_statfs) | 116 | .long _sys_statfs |
117 | .long SYMBOL_NAME(sys_fstatfs) /* 100 */ | 117 | .long _sys_fstatfs /* 100 */ |
118 | .long SYMBOL_NAME(sys_ni_syscall) /* ioperm for i386 */ | 118 | .long _sys_ni_syscall /* ioperm for i386 */ |
119 | .long SYMBOL_NAME(sys_socketcall) | 119 | .long _sys_socketcall |
120 | .long SYMBOL_NAME(sys_syslog) | 120 | .long _sys_syslog |
121 | .long SYMBOL_NAME(sys_setitimer) | 121 | .long _sys_setitimer |
122 | .long SYMBOL_NAME(sys_getitimer) /* 105 */ | 122 | .long _sys_getitimer /* 105 */ |
123 | .long SYMBOL_NAME(sys_newstat) | 123 | .long _sys_newstat |
124 | .long SYMBOL_NAME(sys_newlstat) | 124 | .long _sys_newlstat |
125 | .long SYMBOL_NAME(sys_newfstat) | 125 | .long _sys_newfstat |
126 | .long SYMBOL_NAME(sys_ni_syscall) | 126 | .long _sys_ni_syscall |
127 | .long SYMBOL_NAME(sys_ni_syscall) /* iopl for i386 */ /* 110 */ | 127 | .long _sys_ni_syscall /* iopl for i386 */ /* 110 */ |
128 | .long SYMBOL_NAME(sys_vhangup) | 128 | .long _sys_vhangup |
129 | .long SYMBOL_NAME(sys_ni_syscall) /* obsolete idle() syscall */ | 129 | .long _sys_ni_syscall /* obsolete idle() syscall */ |
130 | .long SYMBOL_NAME(sys_ni_syscall) /* vm86old for i386 */ | 130 | .long _sys_ni_syscall /* vm86old for i386 */ |
131 | .long SYMBOL_NAME(sys_wait4) | 131 | .long _sys_wait4 |
132 | .long SYMBOL_NAME(sys_swapoff) /* 115 */ | 132 | .long _sys_swapoff /* 115 */ |
133 | .long SYMBOL_NAME(sys_sysinfo) | 133 | .long _sys_sysinfo |
134 | .long SYMBOL_NAME(sys_ipc) | 134 | .long _sys_ipc |
135 | .long SYMBOL_NAME(sys_fsync) | 135 | .long _sys_fsync |
136 | .long SYMBOL_NAME(sys_sigreturn) | 136 | .long _sys_sigreturn |
137 | .long SYMBOL_NAME(sys_clone) /* 120 */ | 137 | .long _sys_clone /* 120 */ |
138 | .long SYMBOL_NAME(sys_setdomainname) | 138 | .long _sys_setdomainname |
139 | .long SYMBOL_NAME(sys_newuname) | 139 | .long _sys_newuname |
140 | .long SYMBOL_NAME(sys_cacheflush) /* modify_ldt for i386 */ | 140 | .long _sys_cacheflush /* modify_ldt for i386 */ |
141 | .long SYMBOL_NAME(sys_adjtimex) | 141 | .long _sys_adjtimex |
142 | .long SYMBOL_NAME(sys_ni_syscall) /* 125 sys_mprotect */ | 142 | .long _sys_ni_syscall /* 125 sys_mprotect */ |
143 | .long SYMBOL_NAME(sys_sigprocmask) | 143 | .long _sys_sigprocmask |
144 | .long SYMBOL_NAME(sys_ni_syscall) /* sys_create_module */ | 144 | .long _sys_ni_syscall /* sys_create_module */ |
145 | .long SYMBOL_NAME(sys_init_module) | 145 | .long _sys_init_module |
146 | .long SYMBOL_NAME(sys_delete_module) | 146 | .long _sys_delete_module |
147 | .long SYMBOL_NAME(sys_ni_syscall) /* 130 sys_get_kernel_syms */ | 147 | .long _sys_ni_syscall /* 130 sys_get_kernel_syms */ |
148 | .long SYMBOL_NAME(sys_quotactl) | 148 | .long _sys_quotactl |
149 | .long SYMBOL_NAME(sys_getpgid) | 149 | .long _sys_getpgid |
150 | .long SYMBOL_NAME(sys_fchdir) | 150 | .long _sys_fchdir |
151 | .long SYMBOL_NAME(sys_bdflush) | 151 | .long _sys_bdflush |
152 | .long SYMBOL_NAME(sys_sysfs) /* 135 */ | 152 | .long _sys_sysfs /* 135 */ |
153 | .long SYMBOL_NAME(sys_personality) | 153 | .long _sys_personality |
154 | .long SYMBOL_NAME(sys_ni_syscall) /* for afs_syscall */ | 154 | .long _sys_ni_syscall /* for afs_syscall */ |
155 | .long SYMBOL_NAME(sys_setfsuid16) | 155 | .long _sys_setfsuid16 |
156 | .long SYMBOL_NAME(sys_setfsgid16) | 156 | .long _sys_setfsgid16 |
157 | .long SYMBOL_NAME(sys_llseek) /* 140 */ | 157 | .long _sys_llseek /* 140 */ |
158 | .long SYMBOL_NAME(sys_getdents) | 158 | .long _sys_getdents |
159 | .long SYMBOL_NAME(sys_select) | 159 | .long _sys_select |
160 | .long SYMBOL_NAME(sys_flock) | 160 | .long _sys_flock |
161 | .long SYMBOL_NAME(sys_ni_syscall) /* sys_msync */ | 161 | .long _sys_ni_syscall /* sys_msync */ |
162 | .long SYMBOL_NAME(sys_readv) /* 145 */ | 162 | .long _sys_readv /* 145 */ |
163 | .long SYMBOL_NAME(sys_writev) | 163 | .long _sys_writev |
164 | .long SYMBOL_NAME(sys_getsid) | 164 | .long _sys_getsid |
165 | .long SYMBOL_NAME(sys_fdatasync) | 165 | .long _sys_fdatasync |
166 | .long SYMBOL_NAME(sys_sysctl) | 166 | .long _sys_sysctl |
167 | .long SYMBOL_NAME(sys_ni_syscall) /* 150 sys_mlock */ | 167 | .long _sys_ni_syscall /* 150 sys_mlock */ |
168 | .long SYMBOL_NAME(sys_ni_syscall) /* sys_munlock */ | 168 | .long _sys_ni_syscall /* sys_munlock */ |
169 | .long SYMBOL_NAME(sys_ni_syscall) /* sys_mlockall */ | 169 | .long _sys_ni_syscall /* sys_mlockall */ |
170 | .long SYMBOL_NAME(sys_ni_syscall) /* sys_munlockall */ | 170 | .long _sys_ni_syscall /* sys_munlockall */ |
171 | .long SYMBOL_NAME(sys_sched_setparam) | 171 | .long _sys_sched_setparam |
172 | .long SYMBOL_NAME(sys_sched_getparam) /* 155 */ | 172 | .long _sys_sched_getparam /* 155 */ |
173 | .long SYMBOL_NAME(sys_sched_setscheduler) | 173 | .long _sys_sched_setscheduler |
174 | .long SYMBOL_NAME(sys_sched_getscheduler) | 174 | .long _sys_sched_getscheduler |
175 | .long SYMBOL_NAME(sys_sched_yield) | 175 | .long _sys_sched_yield |
176 | .long SYMBOL_NAME(sys_sched_get_priority_max) | 176 | .long _sys_sched_get_priority_max |
177 | .long SYMBOL_NAME(sys_sched_get_priority_min) /* 160 */ | 177 | .long _sys_sched_get_priority_min /* 160 */ |
178 | .long SYMBOL_NAME(sys_sched_rr_get_interval) | 178 | .long _sys_sched_rr_get_interval |
179 | .long SYMBOL_NAME(sys_nanosleep) | 179 | .long _sys_nanosleep |
180 | .long SYMBOL_NAME(sys_ni_syscall) /* sys_mremap */ | 180 | .long _sys_ni_syscall /* sys_mremap */ |
181 | .long SYMBOL_NAME(sys_setresuid16) | 181 | .long _sys_setresuid16 |
182 | .long SYMBOL_NAME(sys_getresuid16) /* 165 */ | 182 | .long _sys_getresuid16 /* 165 */ |
183 | .long SYMBOL_NAME(sys_ni_syscall) /* for vm86 */ | 183 | .long _sys_ni_syscall /* for vm86 */ |
184 | .long SYMBOL_NAME(sys_ni_syscall) /* sys_query_module */ | 184 | .long _sys_ni_syscall /* sys_query_module */ |
185 | .long SYMBOL_NAME(sys_poll) | 185 | .long _sys_poll |
186 | .long SYMBOL_NAME(sys_ni_syscall) /* old nfsservctl */ | 186 | .long _sys_ni_syscall /* old nfsservctl */ |
187 | .long SYMBOL_NAME(sys_setresgid16) /* 170 */ | 187 | .long _sys_setresgid16 /* 170 */ |
188 | .long SYMBOL_NAME(sys_getresgid16) | 188 | .long _sys_getresgid16 |
189 | .long SYMBOL_NAME(sys_prctl) | 189 | .long _sys_prctl |
190 | .long SYMBOL_NAME(sys_rt_sigreturn) | 190 | .long _sys_rt_sigreturn |
191 | .long SYMBOL_NAME(sys_rt_sigaction) | 191 | .long _sys_rt_sigaction |
192 | .long SYMBOL_NAME(sys_rt_sigprocmask) /* 175 */ | 192 | .long _sys_rt_sigprocmask /* 175 */ |
193 | .long SYMBOL_NAME(sys_rt_sigpending) | 193 | .long _sys_rt_sigpending |
194 | .long SYMBOL_NAME(sys_rt_sigtimedwait) | 194 | .long _sys_rt_sigtimedwait |
195 | .long SYMBOL_NAME(sys_rt_sigqueueinfo) | 195 | .long _sys_rt_sigqueueinfo |
196 | .long SYMBOL_NAME(sys_rt_sigsuspend) | 196 | .long _sys_rt_sigsuspend |
197 | .long SYMBOL_NAME(sys_pread64) /* 180 */ | 197 | .long _sys_pread64 /* 180 */ |
198 | .long SYMBOL_NAME(sys_pwrite64) | 198 | .long _sys_pwrite64 |
199 | .long SYMBOL_NAME(sys_lchown16); | 199 | .long _sys_lchown16; |
200 | .long SYMBOL_NAME(sys_getcwd) | 200 | .long _sys_getcwd |
201 | .long SYMBOL_NAME(sys_capget) | 201 | .long _sys_capget |
202 | .long SYMBOL_NAME(sys_capset) /* 185 */ | 202 | .long _sys_capset /* 185 */ |
203 | .long SYMBOL_NAME(sys_sigaltstack) | 203 | .long _sys_sigaltstack |
204 | .long SYMBOL_NAME(sys_sendfile) | 204 | .long _sys_sendfile |
205 | .long SYMBOL_NAME(sys_ni_syscall) /* streams1 */ | 205 | .long _sys_ni_syscall /* streams1 */ |
206 | .long SYMBOL_NAME(sys_ni_syscall) /* streams2 */ | 206 | .long _sys_ni_syscall /* streams2 */ |
207 | .long SYMBOL_NAME(sys_vfork) /* 190 */ | 207 | .long _sys_vfork /* 190 */ |
208 | .long SYMBOL_NAME(sys_getrlimit) | 208 | .long _sys_getrlimit |
209 | .long SYMBOL_NAME(sys_mmap_pgoff) | 209 | .long _sys_mmap_pgoff |
210 | .long SYMBOL_NAME(sys_truncate64) | 210 | .long _sys_truncate64 |
211 | .long SYMBOL_NAME(sys_ftruncate64) | 211 | .long _sys_ftruncate64 |
212 | .long SYMBOL_NAME(sys_stat64) /* 195 */ | 212 | .long _sys_stat64 /* 195 */ |
213 | .long SYMBOL_NAME(sys_lstat64) | 213 | .long _sys_lstat64 |
214 | .long SYMBOL_NAME(sys_fstat64) | 214 | .long _sys_fstat64 |
215 | .long SYMBOL_NAME(sys_chown) | 215 | .long _sys_chown |
216 | .long SYMBOL_NAME(sys_getuid) | 216 | .long _sys_getuid |
217 | .long SYMBOL_NAME(sys_getgid) /* 200 */ | 217 | .long _sys_getgid /* 200 */ |
218 | .long SYMBOL_NAME(sys_geteuid) | 218 | .long _sys_geteuid |
219 | .long SYMBOL_NAME(sys_getegid) | 219 | .long _sys_getegid |
220 | .long SYMBOL_NAME(sys_setreuid) | 220 | .long _sys_setreuid |
221 | .long SYMBOL_NAME(sys_setregid) | 221 | .long _sys_setregid |
222 | .long SYMBOL_NAME(sys_getgroups) /* 205 */ | 222 | .long _sys_getgroups /* 205 */ |
223 | .long SYMBOL_NAME(sys_setgroups) | 223 | .long _sys_setgroups |
224 | .long SYMBOL_NAME(sys_fchown) | 224 | .long _sys_fchown |
225 | .long SYMBOL_NAME(sys_setresuid) | 225 | .long _sys_setresuid |
226 | .long SYMBOL_NAME(sys_getresuid) | 226 | .long _sys_getresuid |
227 | .long SYMBOL_NAME(sys_setresgid) /* 210 */ | 227 | .long _sys_setresgid /* 210 */ |
228 | .long SYMBOL_NAME(sys_getresgid) | 228 | .long _sys_getresgid |
229 | .long SYMBOL_NAME(sys_lchown) | 229 | .long _sys_lchown |
230 | .long SYMBOL_NAME(sys_setuid) | 230 | .long _sys_setuid |
231 | .long SYMBOL_NAME(sys_setgid) | 231 | .long _sys_setgid |
232 | .long SYMBOL_NAME(sys_setfsuid) /* 215 */ | 232 | .long _sys_setfsuid /* 215 */ |
233 | .long SYMBOL_NAME(sys_setfsgid) | 233 | .long _sys_setfsgid |
234 | .long SYMBOL_NAME(sys_pivot_root) | 234 | .long _sys_pivot_root |
235 | .long SYMBOL_NAME(sys_ni_syscall) | 235 | .long _sys_ni_syscall |
236 | .long SYMBOL_NAME(sys_ni_syscall) | 236 | .long _sys_ni_syscall |
237 | .long SYMBOL_NAME(sys_getdents64) /* 220 */ | 237 | .long _sys_getdents64 /* 220 */ |
238 | .long SYMBOL_NAME(sys_fcntl64) | 238 | .long _sys_fcntl64 |
239 | .long SYMBOL_NAME(sys_ni_syscall) /* reserved TUX */ | 239 | .long _sys_ni_syscall /* reserved TUX */ |
240 | .long SYMBOL_NAME(sys_ni_syscall) /* reserved Security */ | 240 | .long _sys_ni_syscall /* reserved Security */ |
241 | .long SYMBOL_NAME(sys_gettid) | 241 | .long _sys_gettid |
242 | .long SYMBOL_NAME(sys_readahead) /* 225 */ | 242 | .long _sys_readahead /* 225 */ |
243 | .long SYMBOL_NAME(sys_setxattr) | 243 | .long _sys_setxattr |
244 | .long SYMBOL_NAME(sys_lsetxattr) | 244 | .long _sys_lsetxattr |
245 | .long SYMBOL_NAME(sys_fsetxattr) | 245 | .long _sys_fsetxattr |
246 | .long SYMBOL_NAME(sys_getxattr) | 246 | .long _sys_getxattr |
247 | .long SYMBOL_NAME(sys_lgetxattr) /* 230 */ | 247 | .long _sys_lgetxattr /* 230 */ |
248 | .long SYMBOL_NAME(sys_fgetxattr) | 248 | .long _sys_fgetxattr |
249 | .long SYMBOL_NAME(sys_listxattr) | 249 | .long _sys_listxattr |
250 | .long SYMBOL_NAME(sys_llistxattr) | 250 | .long _sys_llistxattr |
251 | .long SYMBOL_NAME(sys_flistxattr) | 251 | .long _sys_flistxattr |
252 | .long SYMBOL_NAME(sys_removexattr) /* 235 */ | 252 | .long _sys_removexattr /* 235 */ |
253 | .long SYMBOL_NAME(sys_lremovexattr) | 253 | .long _sys_lremovexattr |
254 | .long SYMBOL_NAME(sys_fremovexattr) | 254 | .long _sys_fremovexattr |
255 | .long SYMBOL_NAME(sys_tkill) | 255 | .long _sys_tkill |
256 | .long SYMBOL_NAME(sys_sendfile64) | 256 | .long _sys_sendfile64 |
257 | .long SYMBOL_NAME(sys_futex) /* 240 */ | 257 | .long _sys_futex /* 240 */ |
258 | .long SYMBOL_NAME(sys_sched_setaffinity) | 258 | .long _sys_sched_setaffinity |
259 | .long SYMBOL_NAME(sys_sched_getaffinity) | 259 | .long _sys_sched_getaffinity |
260 | .long SYMBOL_NAME(sys_ni_syscall) | 260 | .long _sys_ni_syscall |
261 | .long SYMBOL_NAME(sys_ni_syscall) | 261 | .long _sys_ni_syscall |
262 | .long SYMBOL_NAME(sys_io_setup) /* 245 */ | 262 | .long _sys_io_setup /* 245 */ |
263 | .long SYMBOL_NAME(sys_io_destroy) | 263 | .long _sys_io_destroy |
264 | .long SYMBOL_NAME(sys_io_getevents) | 264 | .long _sys_io_getevents |
265 | .long SYMBOL_NAME(sys_io_submit) | 265 | .long _sys_io_submit |
266 | .long SYMBOL_NAME(sys_io_cancel) | 266 | .long _sys_io_cancel |
267 | .long SYMBOL_NAME(sys_fadvise64) /* 250 */ | 267 | .long _sys_fadvise64 /* 250 */ |
268 | .long SYMBOL_NAME(sys_ni_syscall) | 268 | .long _sys_ni_syscall |
269 | .long SYMBOL_NAME(sys_exit_group) | 269 | .long _sys_exit_group |
270 | .long SYMBOL_NAME(sys_lookup_dcookie) | 270 | .long _sys_lookup_dcookie |
271 | .long SYMBOL_NAME(sys_epoll_create) | 271 | .long _sys_epoll_create |
272 | .long SYMBOL_NAME(sys_epoll_ctl) /* 255 */ | 272 | .long _sys_epoll_ctl /* 255 */ |
273 | .long SYMBOL_NAME(sys_epoll_wait) | 273 | .long _sys_epoll_wait |
274 | .long SYMBOL_NAME(sys_ni_syscall) /* sys_remap_file_pages */ | 274 | .long _sys_ni_syscall /* sys_remap_file_pages */ |
275 | .long SYMBOL_NAME(sys_set_tid_address) | 275 | .long _sys_set_tid_address |
276 | .long SYMBOL_NAME(sys_timer_create) | 276 | .long _sys_timer_create |
277 | .long SYMBOL_NAME(sys_timer_settime) /* 260 */ | 277 | .long _sys_timer_settime /* 260 */ |
278 | .long SYMBOL_NAME(sys_timer_gettime) | 278 | .long _sys_timer_gettime |
279 | .long SYMBOL_NAME(sys_timer_getoverrun) | 279 | .long _sys_timer_getoverrun |
280 | .long SYMBOL_NAME(sys_timer_delete) | 280 | .long _sys_timer_delete |
281 | .long SYMBOL_NAME(sys_clock_settime) | 281 | .long _sys_clock_settime |
282 | .long SYMBOL_NAME(sys_clock_gettime) /* 265 */ | 282 | .long _sys_clock_gettime /* 265 */ |
283 | .long SYMBOL_NAME(sys_clock_getres) | 283 | .long _sys_clock_getres |
284 | .long SYMBOL_NAME(sys_clock_nanosleep) | 284 | .long _sys_clock_nanosleep |
285 | .long SYMBOL_NAME(sys_statfs64) | 285 | .long _sys_statfs64 |
286 | .long SYMBOL_NAME(sys_fstatfs64) | 286 | .long _sys_fstatfs64 |
287 | .long SYMBOL_NAME(sys_tgkill) /* 270 */ | 287 | .long _sys_tgkill /* 270 */ |
288 | .long SYMBOL_NAME(sys_utimes) | 288 | .long _sys_utimes |
289 | .long SYMBOL_NAME(sys_fadvise64_64) | 289 | .long _sys_fadvise64_64 |
290 | .long SYMBOL_NAME(sys_ni_syscall) /* sys_vserver */ | 290 | .long _sys_ni_syscall /* sys_vserver */ |
291 | .long SYMBOL_NAME(sys_ni_syscall) | 291 | .long _sys_ni_syscall |
292 | .long SYMBOL_NAME(sys_get_mempolicy) /* 275 */ | 292 | .long _sys_get_mempolicy /* 275 */ |
293 | .long SYMBOL_NAME(sys_set_mempolicy) | 293 | .long _sys_set_mempolicy |
294 | .long SYMBOL_NAME(sys_mq_open) | 294 | .long _sys_mq_open |
295 | .long SYMBOL_NAME(sys_mq_unlink) | 295 | .long _sys_mq_unlink |
296 | .long SYMBOL_NAME(sys_mq_timedsend) | 296 | .long _sys_mq_timedsend |
297 | .long SYMBOL_NAME(sys_mq_timedreceive) /* 280 */ | 297 | .long _sys_mq_timedreceive /* 280 */ |
298 | .long SYMBOL_NAME(sys_mq_notify) | 298 | .long _sys_mq_notify |
299 | .long SYMBOL_NAME(sys_mq_getsetattr) | 299 | .long _sys_mq_getsetattr |
300 | .long SYMBOL_NAME(sys_waitid) | 300 | .long _sys_waitid |
301 | .long SYMBOL_NAME(sys_ni_syscall) /* sys_kexec_load */ | 301 | .long _sys_ni_syscall /* sys_kexec_load */ |
302 | .long SYMBOL_NAME(sys_add_key) /* 285 */ | 302 | .long _sys_add_key /* 285 */ |
303 | .long SYMBOL_NAME(sys_request_key) | 303 | .long _sys_request_key |
304 | .long SYMBOL_NAME(sys_keyctl) | 304 | .long _sys_keyctl |
305 | .long SYMBOL_NAME(sys_ioprio_set) | 305 | .long _sys_ioprio_set |
306 | .long SYMBOL_NAME(sys_ioprio_get) /* 290 */ | 306 | .long _sys_ioprio_get /* 290 */ |
307 | .long SYMBOL_NAME(sys_inotify_init) | 307 | .long _sys_inotify_init |
308 | .long SYMBOL_NAME(sys_inotify_add_watch) | 308 | .long _sys_inotify_add_watch |
309 | .long SYMBOL_NAME(sys_inotify_rm_watch) | 309 | .long _sys_inotify_rm_watch |
310 | .long SYMBOL_NAME(sys_migrate_pages) | 310 | .long _sys_migrate_pages |
311 | .long SYMBOL_NAME(sys_openat) /* 295 */ | 311 | .long _sys_openat /* 295 */ |
312 | .long SYMBOL_NAME(sys_mkdirat) | 312 | .long _sys_mkdirat |
313 | .long SYMBOL_NAME(sys_mknodat) | 313 | .long _sys_mknodat |
314 | .long SYMBOL_NAME(sys_fchownat) | 314 | .long _sys_fchownat |
315 | .long SYMBOL_NAME(sys_futimesat) | 315 | .long _sys_futimesat |
316 | .long SYMBOL_NAME(sys_fstatat64) /* 300 */ | 316 | .long _sys_fstatat64 /* 300 */ |
317 | .long SYMBOL_NAME(sys_unlinkat) | 317 | .long _sys_unlinkat |
318 | .long SYMBOL_NAME(sys_renameat) | 318 | .long _sys_renameat |
319 | .long SYMBOL_NAME(sys_linkat) | 319 | .long _sys_linkat |
320 | .long SYMBOL_NAME(sys_symlinkat) | 320 | .long _sys_symlinkat |
321 | .long SYMBOL_NAME(sys_readlinkat) /* 305 */ | 321 | .long _sys_readlinkat /* 305 */ |
322 | .long SYMBOL_NAME(sys_fchmodat) | 322 | .long _sys_fchmodat |
323 | .long SYMBOL_NAME(sys_faccessat) | 323 | .long _sys_faccessat |
324 | .long SYMBOL_NAME(sys_ni_syscall) /* sys_pselect6 */ | 324 | .long _sys_ni_syscall /* sys_pselect6 */ |
325 | .long SYMBOL_NAME(sys_ni_syscall) /* sys_ppoll */ | 325 | .long _sys_ni_syscall /* sys_ppoll */ |
326 | .long SYMBOL_NAME(sys_unshare) /* 310 */ | 326 | .long _sys_unshare /* 310 */ |
327 | .long SYMBOL_NAME(sys_set_robust_list) | 327 | .long _sys_set_robust_list |
328 | .long SYMBOL_NAME(sys_get_robust_list) | 328 | .long _sys_get_robust_list |
329 | .long SYMBOL_NAME(sys_splice) | 329 | .long _sys_splice |
330 | .long SYMBOL_NAME(sys_sync_file_range) | 330 | .long _sys_sync_file_range |
331 | .long SYMBOL_NAME(sys_tee) /* 315 */ | 331 | .long _sys_tee /* 315 */ |
332 | .long SYMBOL_NAME(sys_vmsplice) | 332 | .long _sys_vmsplice |
333 | .long SYMBOL_NAME(sys_ni_syscall) /* sys_move_pages */ | 333 | .long _sys_ni_syscall /* sys_move_pages */ |
334 | .long SYMBOL_NAME(sys_getcpu) | 334 | .long _sys_getcpu |
335 | .long SYMBOL_NAME(sys_ni_syscall) /* sys_epoll_pwait */ | 335 | .long _sys_ni_syscall /* sys_epoll_pwait */ |
336 | .long SYMBOL_NAME(sys_setns) /* 320 */ | 336 | .long _sys_setns /* 320 */ |
diff --git a/arch/h8300/lib/abs.S b/arch/h8300/lib/abs.S index cabdd46b41db..ddd1fb3d01ad 100644 --- a/arch/h8300/lib/abs.S +++ b/arch/h8300/lib/abs.S | |||
@@ -9,10 +9,10 @@ | |||
9 | .h8300s | 9 | .h8300s |
10 | #endif | 10 | #endif |
11 | .text | 11 | .text |
12 | .global SYMBOL_NAME(abs) | 12 | .global _abs |
13 | 13 | ||
14 | ;;; int abs(int n) | 14 | ;;; int abs(int n) |
15 | SYMBOL_NAME_LABEL(abs) | 15 | _abs: |
16 | mov.l er0,er0 | 16 | mov.l er0,er0 |
17 | bpl 1f | 17 | bpl 1f |
18 | neg.l er0 | 18 | neg.l er0 |
diff --git a/arch/h8300/lib/memcpy.S b/arch/h8300/lib/memcpy.S index fdcbc1ee673c..cad325e2c0e8 100644 --- a/arch/h8300/lib/memcpy.S +++ b/arch/h8300/lib/memcpy.S | |||
@@ -10,10 +10,10 @@ | |||
10 | #endif | 10 | #endif |
11 | 11 | ||
12 | .text | 12 | .text |
13 | .global SYMBOL_NAME(memcpy) | 13 | .global _memcpy |
14 | 14 | ||
15 | ;;; void *memcpy(void *to, void *from, size_t n) | 15 | ;;; void *memcpy(void *to, void *from, size_t n) |
16 | SYMBOL_NAME_LABEL(memcpy) | 16 | _memcpy: |
17 | mov.l er2,er2 | 17 | mov.l er2,er2 |
18 | bne 1f | 18 | bne 1f |
19 | rts | 19 | rts |
diff --git a/arch/h8300/lib/memset.S b/arch/h8300/lib/memset.S index 59abdf9485a5..4549a64c5b79 100644 --- a/arch/h8300/lib/memset.S +++ b/arch/h8300/lib/memset.S | |||
@@ -10,13 +10,13 @@ | |||
10 | #endif | 10 | #endif |
11 | .text | 11 | .text |
12 | 12 | ||
13 | .global SYMBOL_NAME(memset) | 13 | .global _memset |
14 | 14 | ||
15 | ;;void *memset(*ptr, int c, size_t count) | 15 | ;;void *memset(*ptr, int c, size_t count) |
16 | ;; ptr = er0 | 16 | ;; ptr = er0 |
17 | ;; c = er1(r1l) | 17 | ;; c = er1(r1l) |
18 | ;; count = er2 | 18 | ;; count = er2 |
19 | SYMBOL_NAME_LABEL(memset) | 19 | _memset: |
20 | btst #0,r0l | 20 | btst #0,r0l |
21 | beq 2f | 21 | beq 2f |
22 | 22 | ||
diff --git a/arch/h8300/platform/h8300h/aki3068net/crt0_ram.S b/arch/h8300/platform/h8300h/aki3068net/crt0_ram.S index ecaeb31ae9a4..b2ad0f2d0417 100644 --- a/arch/h8300/platform/h8300h/aki3068net/crt0_ram.S +++ b/arch/h8300/platform/h8300h/aki3068net/crt0_ram.S | |||
@@ -22,10 +22,10 @@ | |||
22 | #define RAMEND CONFIG_BLKDEV_RESERVE_ADDRESS | 22 | #define RAMEND CONFIG_BLKDEV_RESERVE_ADDRESS |
23 | #endif | 23 | #endif |
24 | 24 | ||
25 | .global SYMBOL_NAME(_start) | 25 | .global __start |
26 | .global SYMBOL_NAME(command_line) | 26 | .global _command_line |
27 | .global SYMBOL_NAME(_platform_gpio_table) | 27 | .global __platform_gpio_table |
28 | .global SYMBOL_NAME(_target_name) | 28 | .global __target_name |
29 | 29 | ||
30 | .h8300h | 30 | .h8300h |
31 | 31 | ||
@@ -33,7 +33,7 @@ | |||
33 | .file "crt0_ram.S" | 33 | .file "crt0_ram.S" |
34 | 34 | ||
35 | /* CPU Reset entry */ | 35 | /* CPU Reset entry */ |
36 | SYMBOL_NAME_LABEL(_start) | 36 | __start: |
37 | mov.l #RAMEND,sp | 37 | mov.l #RAMEND,sp |
38 | ldc #0x80,ccr | 38 | ldc #0x80,ccr |
39 | 39 | ||
@@ -59,13 +59,13 @@ SYMBOL_NAME_LABEL(_start) | |||
59 | 59 | ||
60 | /* copy kernel commandline */ | 60 | /* copy kernel commandline */ |
61 | mov.l #COMMAND_START,er5 | 61 | mov.l #COMMAND_START,er5 |
62 | mov.l #SYMBOL_NAME(command_line),er6 | 62 | mov.l #_command_line,er6 |
63 | mov.w #512,r4 | 63 | mov.w #512,r4 |
64 | eepmov.w | 64 | eepmov.w |
65 | 65 | ||
66 | /* uClinux kernel start */ | 66 | /* uClinux kernel start */ |
67 | ldc #0x90,ccr /* running kernel */ | 67 | ldc #0x90,ccr /* running kernel */ |
68 | mov.l #SYMBOL_NAME(init_thread_union),sp | 68 | mov.l #_init_thread_union,sp |
69 | add.l #0x2000,sp | 69 | add.l #0x2000,sp |
70 | jsr @_start_kernel | 70 | jsr @_start_kernel |
71 | _exit: | 71 | _exit: |
@@ -107,4 +107,4 @@ __target_name: | |||
107 | .asciz "AE-3068" | 107 | .asciz "AE-3068" |
108 | 108 | ||
109 | .section .bootvec,"ax" | 109 | .section .bootvec,"ax" |
110 | jmp @SYMBOL_NAME(_start) | 110 | jmp @__start |
diff --git a/arch/h8300/platform/h8300h/generic/crt0_ram.S b/arch/h8300/platform/h8300h/generic/crt0_ram.S index 80d0e16a4499..5ab7d9c12910 100644 --- a/arch/h8300/platform/h8300h/generic/crt0_ram.S +++ b/arch/h8300/platform/h8300h/generic/crt0_ram.S | |||
@@ -22,10 +22,10 @@ | |||
22 | #define RAMEND CONFIG_BLKDEV_RESERVE_ADDRESS | 22 | #define RAMEND CONFIG_BLKDEV_RESERVE_ADDRESS |
23 | #endif | 23 | #endif |
24 | 24 | ||
25 | .global SYMBOL_NAME(_start) | 25 | .global __start |
26 | .global SYMBOL_NAME(command_line) | 26 | .global _command_line |
27 | .global SYMBOL_NAME(_platform_gpio_table) | 27 | .global __platform_gpio_table |
28 | .global SYMBOL_NAME(_target_name) | 28 | .global __target_name |
29 | 29 | ||
30 | .h8300h | 30 | .h8300h |
31 | 31 | ||
@@ -33,7 +33,7 @@ | |||
33 | .file "crt0_ram.S" | 33 | .file "crt0_ram.S" |
34 | 34 | ||
35 | /* CPU Reset entry */ | 35 | /* CPU Reset entry */ |
36 | SYMBOL_NAME_LABEL(_start) | 36 | __start: |
37 | mov.l #RAMEND,sp | 37 | mov.l #RAMEND,sp |
38 | ldc #0x80,ccr | 38 | ldc #0x80,ccr |
39 | 39 | ||
@@ -59,13 +59,13 @@ SYMBOL_NAME_LABEL(_start) | |||
59 | 59 | ||
60 | /* copy kernel commandline */ | 60 | /* copy kernel commandline */ |
61 | mov.l #COMMAND_START,er5 | 61 | mov.l #COMMAND_START,er5 |
62 | mov.l #SYMBOL_NAME(command_line),er6 | 62 | mov.l #_command_line,er6 |
63 | mov.w #512,r4 | 63 | mov.w #512,r4 |
64 | eepmov.w | 64 | eepmov.w |
65 | 65 | ||
66 | /* uClinux kernel start */ | 66 | /* uClinux kernel start */ |
67 | ldc #0x90,ccr /* running kernel */ | 67 | ldc #0x90,ccr /* running kernel */ |
68 | mov.l #SYMBOL_NAME(init_thread_union),sp | 68 | mov.l #_init_thread_union,sp |
69 | add.l #0x2000,sp | 69 | add.l #0x2000,sp |
70 | jsr @_start_kernel | 70 | jsr @_start_kernel |
71 | _exit: | 71 | _exit: |
diff --git a/arch/h8300/platform/h8300h/generic/crt0_rom.S b/arch/h8300/platform/h8300h/generic/crt0_rom.S index 120add7ca832..dda1dfa15a5e 100644 --- a/arch/h8300/platform/h8300h/generic/crt0_rom.S +++ b/arch/h8300/platform/h8300h/generic/crt0_rom.S | |||
@@ -12,17 +12,17 @@ | |||
12 | 12 | ||
13 | #include <asm/linkage.h> | 13 | #include <asm/linkage.h> |
14 | 14 | ||
15 | .global SYMBOL_NAME(_start) | 15 | .global __start |
16 | .global SYMBOL_NAME(_command_line) | 16 | .global __command_line |
17 | .global SYMBOL_NAME(_platform_gpio_table) | 17 | .global __platform_gpio_table |
18 | .global SYMBOL_NAME(_target_name) | 18 | .global __target_name |
19 | 19 | ||
20 | .h8300h | 20 | .h8300h |
21 | .section .text | 21 | .section .text |
22 | .file "crt0_rom.S" | 22 | .file "crt0_rom.S" |
23 | 23 | ||
24 | /* CPU Reset entry */ | 24 | /* CPU Reset entry */ |
25 | SYMBOL_NAME_LABEL(_start) | 25 | __start: |
26 | mov.l #__ramend,sp | 26 | mov.l #__ramend,sp |
27 | ldc #0x80,ccr | 27 | ldc #0x80,ccr |
28 | 28 | ||
@@ -60,13 +60,13 @@ SYMBOL_NAME_LABEL(_start) | |||
60 | 60 | ||
61 | /* copy kernel commandline */ | 61 | /* copy kernel commandline */ |
62 | mov.l #COMMAND_START,er5 | 62 | mov.l #COMMAND_START,er5 |
63 | mov.l #SYMBOL_NAME(_command_line),er6 | 63 | mov.l #__command_line,er6 |
64 | mov.w #512,r4 | 64 | mov.w #512,r4 |
65 | eepmov.w | 65 | eepmov.w |
66 | 66 | ||
67 | /* linux kernel start */ | 67 | /* linux kernel start */ |
68 | ldc #0x90,ccr /* running kernel */ | 68 | ldc #0x90,ccr /* running kernel */ |
69 | mov.l #SYMBOL_NAME(init_thread_union),sp | 69 | mov.l #_init_thread_union,sp |
70 | add.l #0x2000,sp | 70 | add.l #0x2000,sp |
71 | jsr @_start_kernel | 71 | jsr @_start_kernel |
72 | _exit: | 72 | _exit: |
diff --git a/arch/h8300/platform/h8300h/h8max/crt0_ram.S b/arch/h8300/platform/h8300h/h8max/crt0_ram.S index efcbefb91b67..6a0d4e2d9ec6 100644 --- a/arch/h8300/platform/h8300h/h8max/crt0_ram.S +++ b/arch/h8300/platform/h8300h/h8max/crt0_ram.S | |||
@@ -22,10 +22,10 @@ | |||
22 | #define RAMEND CONFIG_BLKDEV_RESERVE_ADDRESS | 22 | #define RAMEND CONFIG_BLKDEV_RESERVE_ADDRESS |
23 | #endif | 23 | #endif |
24 | 24 | ||
25 | .global SYMBOL_NAME(_start) | 25 | .global __start |
26 | .global SYMBOL_NAME(command_line) | 26 | .global _command_line |
27 | .global SYMBOL_NAME(_platform_gpio_table) | 27 | .global __platform_gpio_table |
28 | .global SYMBOL_NAME(_target_name) | 28 | .global __target_name |
29 | 29 | ||
30 | .h8300h | 30 | .h8300h |
31 | 31 | ||
@@ -33,7 +33,7 @@ | |||
33 | .file "crt0_ram.S" | 33 | .file "crt0_ram.S" |
34 | 34 | ||
35 | /* CPU Reset entry */ | 35 | /* CPU Reset entry */ |
36 | SYMBOL_NAME_LABEL(_start) | 36 | __start: |
37 | mov.l #RAMEND,sp | 37 | mov.l #RAMEND,sp |
38 | ldc #0x80,ccr | 38 | ldc #0x80,ccr |
39 | 39 | ||
@@ -59,13 +59,13 @@ SYMBOL_NAME_LABEL(_start) | |||
59 | 59 | ||
60 | /* copy kernel commandline */ | 60 | /* copy kernel commandline */ |
61 | mov.l #COMMAND_START,er5 | 61 | mov.l #COMMAND_START,er5 |
62 | mov.l #SYMBOL_NAME(command_line),er6 | 62 | mov.l #_command_line,er6 |
63 | mov.w #512,r4 | 63 | mov.w #512,r4 |
64 | eepmov.w | 64 | eepmov.w |
65 | 65 | ||
66 | /* uClinux kernel start */ | 66 | /* uClinux kernel start */ |
67 | ldc #0x90,ccr /* running kernel */ | 67 | ldc #0x90,ccr /* running kernel */ |
68 | mov.l #SYMBOL_NAME(init_thread_union),sp | 68 | mov.l #_init_thread_union,sp |
69 | add.l #0x2000,sp | 69 | add.l #0x2000,sp |
70 | jsr @_start_kernel | 70 | jsr @_start_kernel |
71 | _exit: | 71 | _exit: |
@@ -107,4 +107,4 @@ __target_name: | |||
107 | .asciz "H8MAX" | 107 | .asciz "H8MAX" |
108 | 108 | ||
109 | .section .bootvec,"ax" | 109 | .section .bootvec,"ax" |
110 | jmp @SYMBOL_NAME(_start) | 110 | jmp @__start |
diff --git a/arch/h8300/platform/h8s/edosk2674/crt0_ram.S b/arch/h8300/platform/h8s/edosk2674/crt0_ram.S index d12b0debe478..5ed191b37cde 100644 --- a/arch/h8300/platform/h8s/edosk2674/crt0_ram.S +++ b/arch/h8300/platform/h8s/edosk2674/crt0_ram.S | |||
@@ -23,10 +23,10 @@ | |||
23 | #define RAMEND CONFIG_BLKDEV_RESERVE_ADDRESS | 23 | #define RAMEND CONFIG_BLKDEV_RESERVE_ADDRESS |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | .global SYMBOL_NAME(_start) | 26 | .global __start |
27 | .global SYMBOL_NAME(_command_line) | 27 | .global __command_line |
28 | .global SYMBOL_NAME(_platform_gpio_table) | 28 | .global __platform_gpio_table |
29 | .global SYMBOL_NAME(_target_name) | 29 | .global __target_name |
30 | 30 | ||
31 | .h8300s | 31 | .h8300s |
32 | 32 | ||
@@ -34,7 +34,7 @@ | |||
34 | .file "crt0_ram.S" | 34 | .file "crt0_ram.S" |
35 | 35 | ||
36 | /* CPU Reset entry */ | 36 | /* CPU Reset entry */ |
37 | SYMBOL_NAME_LABEL(_start) | 37 | __start: |
38 | mov.l #RAMEND,sp | 38 | mov.l #RAMEND,sp |
39 | ldc #0x80,ccr | 39 | ldc #0x80,ccr |
40 | ldc #0x00,exr | 40 | ldc #0x00,exr |
@@ -66,13 +66,13 @@ SYMBOL_NAME_LABEL(_start) | |||
66 | 66 | ||
67 | /* copy kernel commandline */ | 67 | /* copy kernel commandline */ |
68 | mov.l #COMMAND_START,er5 | 68 | mov.l #COMMAND_START,er5 |
69 | mov.l #SYMBOL_NAME(command_line),er6 | 69 | mov.l #_command_line,er6 |
70 | mov.w #512,r4 | 70 | mov.w #512,r4 |
71 | eepmov.w | 71 | eepmov.w |
72 | 72 | ||
73 | /* uClinux kernel start */ | 73 | /* uClinux kernel start */ |
74 | ldc #0x90,ccr /* running kernel */ | 74 | ldc #0x90,ccr /* running kernel */ |
75 | mov.l #SYMBOL_NAME(init_thread_union),sp | 75 | mov.l #_init_thread_union,sp |
76 | add.l #0x2000,sp | 76 | add.l #0x2000,sp |
77 | jsr @_start_kernel | 77 | jsr @_start_kernel |
78 | _exit: | 78 | _exit: |
@@ -127,4 +127,4 @@ __target_name: | |||
127 | .asciz "EDOSK-2674" | 127 | .asciz "EDOSK-2674" |
128 | 128 | ||
129 | .section .bootvec,"ax" | 129 | .section .bootvec,"ax" |
130 | jmp @SYMBOL_NAME(_start) | 130 | jmp @__start |
diff --git a/arch/h8300/platform/h8s/edosk2674/crt0_rom.S b/arch/h8300/platform/h8s/edosk2674/crt0_rom.S index c03d23c6fe12..06d1d7f324ca 100644 --- a/arch/h8300/platform/h8s/edosk2674/crt0_rom.S +++ b/arch/h8300/platform/h8s/edosk2674/crt0_rom.S | |||
@@ -13,17 +13,17 @@ | |||
13 | #include <asm/linkage.h> | 13 | #include <asm/linkage.h> |
14 | #include <asm/regs267x.h> | 14 | #include <asm/regs267x.h> |
15 | 15 | ||
16 | .global SYMBOL_NAME(_start) | 16 | .global __start |
17 | .global SYMBOL_NAME(_command_line) | 17 | .global __command_line |
18 | .global SYMBOL_NAME(_platform_gpio_table) | 18 | .global __platform_gpio_table |
19 | .global SYMBOL_NAME(_target_name) | 19 | .global __target_name |
20 | 20 | ||
21 | .h8300s | 21 | .h8300s |
22 | .section .text | 22 | .section .text |
23 | .file "crt0_rom.S" | 23 | .file "crt0_rom.S" |
24 | 24 | ||
25 | /* CPU Reset entry */ | 25 | /* CPU Reset entry */ |
26 | SYMBOL_NAME_LABEL(_start) | 26 | __start: |
27 | mov.l #__ramend,sp | 27 | mov.l #__ramend,sp |
28 | ldc #0x80,ccr | 28 | ldc #0x80,ccr |
29 | ldc #0,exr | 29 | ldc #0,exr |
@@ -82,13 +82,13 @@ SYMBOL_NAME_LABEL(_start) | |||
82 | 82 | ||
83 | /* copy kernel commandline */ | 83 | /* copy kernel commandline */ |
84 | mov.l #COMMAND_START,er5 | 84 | mov.l #COMMAND_START,er5 |
85 | mov.l #SYMBOL_NAME(_command_line),er6 | 85 | mov.l #__command_line,er6 |
86 | mov.w #512,r4 | 86 | mov.w #512,r4 |
87 | eepmov.w | 87 | eepmov.w |
88 | 88 | ||
89 | /* linux kernel start */ | 89 | /* linux kernel start */ |
90 | ldc #0x90,ccr /* running kernel */ | 90 | ldc #0x90,ccr /* running kernel */ |
91 | mov.l #SYMBOL_NAME(init_thread_union),sp | 91 | mov.l #_init_thread_union,sp |
92 | add.l #0x2000,sp | 92 | add.l #0x2000,sp |
93 | jsr @_start_kernel | 93 | jsr @_start_kernel |
94 | _exit: | 94 | _exit: |
diff --git a/arch/h8300/platform/h8s/generic/crt0_ram.S b/arch/h8300/platform/h8s/generic/crt0_ram.S index b04541069976..7018915de74f 100644 --- a/arch/h8300/platform/h8s/generic/crt0_ram.S +++ b/arch/h8300/platform/h8s/generic/crt0_ram.S | |||
@@ -23,10 +23,10 @@ | |||
23 | #define RAMEND CONFIG_BLKDEV_RESERVE_ADDRESS | 23 | #define RAMEND CONFIG_BLKDEV_RESERVE_ADDRESS |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | .global SYMBOL_NAME(_start) | 26 | .global __start |
27 | .global SYMBOL_NAME(_command_line) | 27 | .global __command_line |
28 | .global SYMBOL_NAME(_platform_gpio_table) | 28 | .global __platform_gpio_table |
29 | .global SYMBOL_NAME(_target_name) | 29 | .global __target_name |
30 | 30 | ||
31 | .h8300s | 31 | .h8300s |
32 | 32 | ||
@@ -34,7 +34,7 @@ | |||
34 | .file "crt0_ram.S" | 34 | .file "crt0_ram.S" |
35 | 35 | ||
36 | /* CPU Reset entry */ | 36 | /* CPU Reset entry */ |
37 | SYMBOL_NAME_LABEL(_start) | 37 | __start: |
38 | mov.l #RAMEND,sp | 38 | mov.l #RAMEND,sp |
39 | ldc #0x80,ccr | 39 | ldc #0x80,ccr |
40 | ldc #0x00,exr | 40 | ldc #0x00,exr |
@@ -63,13 +63,13 @@ SYMBOL_NAME_LABEL(_start) | |||
63 | 63 | ||
64 | /* copy kernel commandline */ | 64 | /* copy kernel commandline */ |
65 | mov.l #COMMAND_START,er5 | 65 | mov.l #COMMAND_START,er5 |
66 | mov.l #SYMBOL_NAME(command_line),er6 | 66 | mov.l #_command_line,er6 |
67 | mov.w #512,r4 | 67 | mov.w #512,r4 |
68 | eepmov.w | 68 | eepmov.w |
69 | 69 | ||
70 | /* uClinux kernel start */ | 70 | /* uClinux kernel start */ |
71 | ldc #0x90,ccr /* running kernel */ | 71 | ldc #0x90,ccr /* running kernel */ |
72 | mov.l #SYMBOL_NAME(init_thread_union),sp | 72 | mov.l #_init_thread_union,sp |
73 | add.l #0x2000,sp | 73 | add.l #0x2000,sp |
74 | jsr @_start_kernel | 74 | jsr @_start_kernel |
75 | _exit: | 75 | _exit: |
@@ -124,4 +124,4 @@ __target_name: | |||
124 | .asciz "generic" | 124 | .asciz "generic" |
125 | 125 | ||
126 | .section .bootvec,"ax" | 126 | .section .bootvec,"ax" |
127 | jmp @SYMBOL_NAME(_start) | 127 | jmp @__start |
diff --git a/arch/h8300/platform/h8s/generic/crt0_rom.S b/arch/h8300/platform/h8s/generic/crt0_rom.S index 95b6f2898f52..623ba7828193 100644 --- a/arch/h8300/platform/h8s/generic/crt0_rom.S +++ b/arch/h8300/platform/h8s/generic/crt0_rom.S | |||
@@ -13,17 +13,17 @@ | |||
13 | #include <asm/linkage.h> | 13 | #include <asm/linkage.h> |
14 | #include <asm/regs267x.h> | 14 | #include <asm/regs267x.h> |
15 | 15 | ||
16 | .global SYMBOL_NAME(_start) | 16 | .global __start |
17 | .global SYMBOL_NAME(_command_line) | 17 | .global __command_line |
18 | .global SYMBOL_NAME(_platform_gpio_table) | 18 | .global __platform_gpio_table |
19 | .global SYMBOL_NAME(_target_name) | 19 | .global __target_name |
20 | 20 | ||
21 | .h8300s | 21 | .h8300s |
22 | .section .text | 22 | .section .text |
23 | .file "crt0_rom.S" | 23 | .file "crt0_rom.S" |
24 | 24 | ||
25 | /* CPU Reset entry */ | 25 | /* CPU Reset entry */ |
26 | SYMBOL_NAME_LABEL(_start) | 26 | __start: |
27 | mov.l #__ramend,sp | 27 | mov.l #__ramend,sp |
28 | ldc #0x80,ccr | 28 | ldc #0x80,ccr |
29 | ldc #0,exr | 29 | ldc #0,exr |
@@ -61,7 +61,7 @@ SYMBOL_NAME_LABEL(_start) | |||
61 | 61 | ||
62 | /* linux kernel start */ | 62 | /* linux kernel start */ |
63 | ldc #0x90,ccr /* running kernel */ | 63 | ldc #0x90,ccr /* running kernel */ |
64 | mov.l #SYMBOL_NAME(init_thread_union),sp | 64 | mov.l #_init_thread_union,sp |
65 | add.l #0x2000,sp | 65 | add.l #0x2000,sp |
66 | jsr @_start_kernel | 66 | jsr @_start_kernel |
67 | _exit: | 67 | _exit: |