Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to reflect that unlike in m68k a.out environments, where the .align 

directive is given a log2 argument, .align is given a linear argument in
m68k ELF environments.
This commit is contained in:
kleink 2001-11-28 09:49:51 +00:00
parent dd626d89c9
commit a83174b856
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/arch/amiga/amiga/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.126 2001/11/07 23:25:03 aymeric Exp $ */ /* $NetBSD: locore.s,v 1.127 2001/11/28 09:49:51 kleink Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -1104,7 +1104,11 @@ GLOBAL(curpcb)
.long 0 .long 0
ASGLOBAL(pcbflag) ASGLOBAL(pcbflag)
.byte 0 | copy of pcb_flags low byte .byte 0 | copy of pcb_flags low byte
#ifdef __ELF__
.align 4
#else
.align 2 .align 2
#endif
BSS(nullpcb,SIZEOF_PCB) BSS(nullpcb,SIZEOF_PCB)
.text .text
@ -1733,7 +1737,11 @@ Ldoboot1:
jmp %a0@ | otherwise, jump to the ROM to reset jmp %a0@ | otherwise, jump to the ROM to reset
| reset needs to be on longword boundary | reset needs to be on longword boundary
nop nop
#ifdef __ELF__
.align 4
#else
.align 2 .align 2
#endif
Ldoreset: Ldoreset:
| reset unconfigures all memory! | reset unconfigures all memory!
reset reset
@ -1768,7 +1776,11 @@ LdbOnDraCo:
.word 0x4e7b,0x0004 | movc d0,ITT0 .word 0x4e7b,0x0004 | movc d0,ITT0
jmp %a0@ jmp %a0@
#ifdef __ELF__
.align 4
#else
.align 2 .align 2
#endif
LdoDraCoBoot: LdoDraCoBoot:
| turn off MMU now ... were more ore less guaranteed to run on 040/060: | turn off MMU now ... were more ore less guaranteed to run on 040/060:
movl #0,%d0 movl #0,%d0
@ -1866,7 +1878,11 @@ ASLOCAL(zero)
.long 0 .long 0
Ldorebootend: Ldorebootend:
#ifdef __ELF__
.align 4
#else
.align 2 .align 2
#endif
nop nop
ENTRY_NOPROFILE(delay) ENTRY_NOPROFILE(delay)
ENTRY_NOPROFILE(DELAY) ENTRY_NOPROFILE(DELAY)
@ -1957,7 +1973,11 @@ GLOBAL(intrnames)
.asciz "fpe" .asciz "fpe"
#endif #endif
GLOBAL(eintrnames) GLOBAL(eintrnames)
#ifdef __ELF__
.align 4
#else
.align 2 .align 2
#endif
GLOBAL(intrcnt) GLOBAL(intrcnt)
.long 0,0,0,0,0,0,0,0,0,0 .long 0,0,0,0,0,0,0,0,0,0
#ifdef DRACO #ifdef DRACO