diff --git a/lib/libc/arch/powerpc/sys/brk.S b/lib/libc/arch/powerpc/sys/brk.S index 5a6337814362..666547038428 100644 --- a/lib/libc/arch/powerpc/sys/brk.S +++ b/lib/libc/arch/powerpc/sys/brk.S @@ -1,8 +1,8 @@ -/* $NetBSD: brk.S,v 1.2 1998/05/25 15:28:03 ws Exp $ */ +/* $NetBSD: brk.S,v 1.3 1998/05/25 15:35:06 ws Exp $ */ #include "SYS.h" - .globl curbrk + .globl _ASM_LABEL(curbrk) .text @@ -10,8 +10,8 @@ XXX #else ENTRY(brk) - lis 5,_end@ha # r5 = &_end - addi 5,5,_end@l + lis 5,_C_LABEL(end)@ha # r5 = &_end + addi 5,5,_C_LABEL(end)@l cmplw 5,3 # if (&_end <= r3) bgt 0f mr 5,3 # r5 = r3 @@ -20,10 +20,10 @@ ENTRY(brk) li 0,SYS_break sc # assume, that r5 is kept bso 1f - lis 6,curbrk@ha - stw 5,curbrk@l(6) # record new break + lis 6,_ASM_LABEL(curbrk)@ha # record new break + stw 5,_ASM_LABEL(curbrk)@l(6) blr # return 0 1: - b cerror + b _ASM_LABEL(cerror) #endif diff --git a/lib/libc/arch/powerpc/sys/pipe.S b/lib/libc/arch/powerpc/sys/pipe.S index 57942b08cefe..232b899199a5 100644 --- a/lib/libc/arch/powerpc/sys/pipe.S +++ b/lib/libc/arch/powerpc/sys/pipe.S @@ -1,9 +1,9 @@ -/* $NetBSD: pipe.S,v 1.2 1998/05/25 15:28:03 ws Exp $ */ +/* $NetBSD: pipe.S,v 1.3 1998/05/25 15:35:06 ws Exp $ */ #include "SYS.h" ENTRY(pipe) - mr 5, 3 # save pointer + mr 5,3 # save pointer li 0,SYS_pipe sc # assume, that r5 is kept bso 1f @@ -12,4 +12,4 @@ ENTRY(pipe) li 3,0 blr # and return 0 1: - b cerror + b _ASM_LABEL(cerror) diff --git a/lib/libc/arch/powerpc/sys/sbrk.S b/lib/libc/arch/powerpc/sys/sbrk.S index 749dc78cc670..6f73c742f9c5 100644 --- a/lib/libc/arch/powerpc/sys/sbrk.S +++ b/lib/libc/arch/powerpc/sys/sbrk.S @@ -1,28 +1,29 @@ -/* $NetBSD: sbrk.S,v 1.2 1998/05/25 15:28:03 ws Exp $ */ +/* $NetBSD: sbrk.S,v 1.3 1998/05/25 15:35:06 ws Exp $ */ #include "SYS.h" - .globl _end - .globl curbrk + .globl _C_LABEL(end) + .globl _ASM_LABEL(curbrk) .data -curbrk: .long _end +_ASM_LABEL(curbrk): + .long _C_LABEL(end) .text ENTRY(sbrk) #ifdef PIC XXX #else - lis 5,curbrk@ha - lwz 6,curbrk@l(5) # r6 = old break + lis 5,_ASM_LABEL(curbrk)@ha + lwz 6,_ASM_LABEL(curbrk)@l(5) # r6 = old break add 3,3,6 mr 7,3 # r7 = new break li 0,SYS_break sc # break(new_break) bso 1f mr 3,6 # set return value - stw 7,curbrk@l(5) # record new break + stw 7,_ASM_LABEL(curbrk)@l(5) # record new break blr 1: - b cerror + b _ASM_LABEL(cerror) #endif diff --git a/lib/libc/arch/powerpc/sys/sigpending.S b/lib/libc/arch/powerpc/sys/sigpending.S index afb58ffbed2b..80d4d0bac856 100644 --- a/lib/libc/arch/powerpc/sys/sigpending.S +++ b/lib/libc/arch/powerpc/sys/sigpending.S @@ -1,4 +1,4 @@ -/* $NetBSD: sigpending.S,v 1.2 1998/05/25 15:28:03 ws Exp $ */ +/* $NetBSD: sigpending.S,v 1.3 1998/05/25 15:35:06 ws Exp $ */ #include "SYS.h" @@ -11,4 +11,4 @@ ENTRY(sigpending) li 3,0 # and return 0 blr 1: - b cerror + b _ASM_LABEL(cerror) diff --git a/lib/libc/arch/powerpc/sys/sigprocmask.S b/lib/libc/arch/powerpc/sys/sigprocmask.S index cb755c6736f8..465ff83dddfb 100644 --- a/lib/libc/arch/powerpc/sys/sigprocmask.S +++ b/lib/libc/arch/powerpc/sys/sigprocmask.S @@ -1,4 +1,4 @@ -/* $NetBSD: sigprocmask.S,v 1.2 1998/05/25 15:28:03 ws Exp $ */ +/* $NetBSD: sigprocmask.S,v 1.3 1998/05/25 15:35:06 ws Exp $ */ #include "SYS.h" @@ -23,4 +23,4 @@ ENTRY(sigprocmask) li 3,0 blr # in any case, return 0 3: - b cerror + b _ASM_LABEL(cerror) diff --git a/lib/libc/arch/powerpc/sys/sigsuspend.S b/lib/libc/arch/powerpc/sys/sigsuspend.S index 9ef03bea645b..560765ed86a9 100644 --- a/lib/libc/arch/powerpc/sys/sigsuspend.S +++ b/lib/libc/arch/powerpc/sys/sigsuspend.S @@ -1,4 +1,4 @@ -/* $NetBSD: sigsuspend.S,v 1.2 1998/05/25 15:28:04 ws Exp $ */ +/* $NetBSD: sigsuspend.S,v 1.3 1998/05/25 15:35:06 ws Exp $ */ #include "SYS.h" @@ -6,4 +6,4 @@ ENTRY(sigsuspend) lwz 3,0(3) # indirect to mask arg li 0,SYS_sigsuspend sc - b cerror # always terminates with EINTR + b _ASM_LABEL(cerror) # always terminates with EINTR