diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2002-10-07 04:30:31 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2002-10-07 04:30:31 +0000 |
| commit | f673100e04e61cbdc1c6b7c36245226c5fca0b67 (patch) | |
| tree | f4931e634e276fb77db650b726f4325f4482fbe0 | |
| parent | 87f432ba2939777cbf3af2f9352cbf749033183c (diff) | |
s/curbrk/__curbrk/ as suggested by art, a few _ASM_LABEL added as appropriate.
| -rw-r--r-- | lib/libc/arch/powerpc/sys/brk.S | 12 | ||||
| -rw-r--r-- | lib/libc/arch/powerpc/sys/sbrk.S | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/lib/libc/arch/powerpc/sys/brk.S b/lib/libc/arch/powerpc/sys/brk.S index be1be589b56..df371c2d9eb 100644 --- a/lib/libc/arch/powerpc/sys/brk.S +++ b/lib/libc/arch/powerpc/sys/brk.S @@ -1,6 +1,6 @@ #include "SYS.h" - .extern curbrk + .extern _ASM_LABEL(__curbrk) .extern _C_LABEL(end) PREFIX2(brk,break) @@ -24,10 +24,10 @@ PREFIX2(brk,break) mr 7, 3 /* call break(size) */ #ifndef PIC - addis 6, 0, curbrk@H - ori 6, 6, curbrk@L /* # 6 = &curbrk */ + addis 6, 0, _ASM_LABEL(__curbrk)@H + ori 6, 6, _ASM_LABEL(__curbrk)@L /* # 6 = &__curbrk */ #else - lwz 6,_ASM_LABEL(curbrk)@got(9) + lwz 6,_ASM_LABEL(__curbrk)@got(9) #endif sc @@ -37,8 +37,8 @@ PREFIX2(brk,break) beq+ .L_brk_ok /* OK so this is stupid but I haven't read b */ b PIC_PLT(_ASM_LABEL(__cerror)) - /* update, curbrk and return */ + /* update, __curbrk and return */ .L_brk_ok: - stw 7, 0(6) /* # remember, 6=&curbrk, 3= new value */ + stw 7, 0(6) /* # remember, 6=&__curbrk, 3= new value */ mr 3, 0 /* # return 0 */ blr diff --git a/lib/libc/arch/powerpc/sys/sbrk.S b/lib/libc/arch/powerpc/sys/sbrk.S index 1c51482fe2e..58c5f11701a 100644 --- a/lib/libc/arch/powerpc/sys/sbrk.S +++ b/lib/libc/arch/powerpc/sys/sbrk.S @@ -2,9 +2,9 @@ .data .globl _end - .globl curbrk + .globl _ASM_LABEL(__curbrk) .globl minbrk -_ASM_LABEL(curbrk): +_ASM_LABEL(__curbrk): .long _C_LABEL(end) _ASM_LABEL(minbrk): .long _C_LABEL(end) @@ -13,16 +13,16 @@ _ASM_LABEL(minbrk): .text PREFIX2(sbrk,break) - /* call break(curbrk + size) */ + /* call break(__curbrk + size) */ #ifndef PIC - addis 6, 0, curbrk@H - ori 6, 6, curbrk@L /* # 6 = &curbrk */ + addis 6, 0, _ASM_LABEL(__curbrk)@H + ori 6, 6, _ASM_LABEL(__curbrk)@L /* # 6 = &__curbrk */ #else mflr 10 bl _GLOBAL_OFFSET_TABLE_@local-4 mflr 9 mtlr 10 - lwz 6,_ASM_LABEL(curbrk)@got(9) + lwz 6,_ASM_LABEL(__curbrk)@got(9) #endif lwz 5, 0(6) /* # 5 = *6 (old_curbrk) */ add 3, 5, 3 /* # 3 = new_curbrk */ @@ -35,8 +35,8 @@ PREFIX2(sbrk,break) beq+ .L_sbrk_ok b PIC_PLT(_ASM_LABEL(__cerror)) - /* update, curbrk and return */ + /* update, __curbrk and return */ .L_sbrk_ok: - stw 7, 0(6) /* # remember, 6=&curbrk, 7=new_curbrk */ + stw 7, 0(6) /* # remember, 6=&__curbrk, 7=new_curbrk */ mr 3, 5 /* # remember, 5=old_curbrk */ blr |