diff options
-rw-r--r-- | sys/arch/m68k/include/asm.h | 4 | ||||
-rw-r--r-- | sys/arch/m68k/m68k/bcopy.s | 6 | ||||
-rw-r--r-- | sys/arch/mac68k/mac68k/locore.s | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/m68k/include/asm.h b/sys/arch/m68k/include/asm.h index cf7762dc3a6..6e806a72da0 100644 --- a/sys/arch/m68k/include/asm.h +++ b/sys/arch/m68k/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.7 2007/05/15 13:46:22 martin Exp $ */ +/* $OpenBSD: asm.h,v 1.8 2007/11/24 20:58:26 deraadt Exp $ */ /* $NetBSD: asm.h,v 1.13 1997/04/24 22:49:39 thorpej Exp $ */ /* @@ -88,7 +88,7 @@ * to use it would be a desirable change. */ #ifdef PROF -#define ALTENTRY(name, rname) ENTRY(name); jra rname+12 +#define ALTENTRY(name, rname) ENTRY(name); jra _C_LABEL(rname)+12 #else #define ALTENTRY(name, rname) _ENTRY(_C_LABEL(name)) #endif diff --git a/sys/arch/m68k/m68k/bcopy.s b/sys/arch/m68k/m68k/bcopy.s index 596dfbe4494..b4ba2ea6c86 100644 --- a/sys/arch/m68k/m68k/bcopy.s +++ b/sys/arch/m68k/m68k/bcopy.s @@ -1,4 +1,4 @@ -/* $OpenBSD: bcopy.s,v 1.2 2003/06/02 23:27:48 millert Exp $ */ +/* $OpenBSD: bcopy.s,v 1.3 2007/11/24 20:58:26 deraadt Exp $ */ /* $NetBSD: bcopy.s,v 1.1 1997/03/17 19:44:33 gwr Exp $ */ /*- @@ -50,14 +50,14 @@ * * Works for counts up to 128K. */ -ALTENTRY(memmove, _memcpy) +ALTENTRY(memmove, memcpy) ENTRY(memcpy) movl sp@(12),d0 | get count jeq Lbccpyexit | if zero, return movl sp@(8), a0 | src address movl sp@(4), a1 | dest address jra Lbcdocopy | jump into bcopy -ALTENTRY(ovbcopy, _bcopy) +ALTENTRY(ovbcopy, bcopy) ENTRY(bcopy) movl sp@(12),d0 | get count jeq Lbccpyexit | if zero, return diff --git a/sys/arch/mac68k/mac68k/locore.s b/sys/arch/mac68k/mac68k/locore.s index 1c589abad89..7539543992f 100644 --- a/sys/arch/mac68k/mac68k/locore.s +++ b/sys/arch/mac68k/mac68k/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.59 2007/10/10 15:53:52 art Exp $ */ +/* $OpenBSD: locore.s,v 1.60 2007/11/24 20:58:26 deraadt Exp $ */ /* $NetBSD: locore.s,v 1.103 1998/07/09 06:02:50 scottr Exp $ */ /* @@ -1368,7 +1368,7 @@ Lm68881rdone: */ .balign 8 | align to half-line boundary -ALTENTRY(_delay, _delay) +ALTENTRY(_delay, delay) ENTRY(delay) movl sp@(4),d0 | get microseconds to delay cmpl #0x40000,d0 | is it a "large" delay? |