diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-08-22 22:26:17 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2012-08-22 22:26:17 +0000 |
| commit | 54ae54cf8989fa0418450d71eb02b9dc0ce7ec62 (patch) | |
| tree | 054e65e5d6e732966b85e917c675ae958438dbde /lib/libc/arch/powerpc | |
| parent | 10501a4adacc417f3f59f0df8e5f117d88579066 (diff) | |
Fix missing PIC -> __PIC__ conversions; ok pascal
Diffstat (limited to 'lib/libc/arch/powerpc')
| -rw-r--r-- | lib/libc/arch/powerpc/sys/brk.S | 6 | ||||
| -rw-r--r-- | lib/libc/arch/powerpc/sys/cerror.S | 6 | ||||
| -rw-r--r-- | lib/libc/arch/powerpc/sys/sbrk.S | 4 | ||||
| -rw-r--r-- | lib/libc/arch/powerpc/sys/setlogin.S | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/lib/libc/arch/powerpc/sys/brk.S b/lib/libc/arch/powerpc/sys/brk.S index ad0e30a641c..d2d8a257e06 100644 --- a/lib/libc/arch/powerpc/sys/brk.S +++ b/lib/libc/arch/powerpc/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.7 2003/07/10 17:51:21 tdeval Exp $ */ +/* $OpenBSD: brk.S,v 1.8 2012/08/22 22:26:16 deraadt Exp $ */ /* * Copyright (c) 1996 Dale Rahn @@ -33,7 +33,7 @@ PREFIX2(brk,break) /* check >= _end, if not make the call for _end */ -#ifndef PIC +#ifndef __PIC__ addis 5,0,_C_LABEL(end)@h ori 5,5,_C_LABEL(end)@l /* # 5 = &_end */ #else @@ -50,7 +50,7 @@ PREFIX2(brk,break) .L_brk_call: mr 7, 3 /* call break(size) */ -#ifndef PIC +#ifndef __PIC__ addis 6, 0, _ASM_LABEL(__curbrk)@H ori 6, 6, _ASM_LABEL(__curbrk)@L /* # 6 = &__curbrk */ #else diff --git a/lib/libc/arch/powerpc/sys/cerror.S b/lib/libc/arch/powerpc/sys/cerror.S index 7f817caf8b0..d2cbc5e17c6 100644 --- a/lib/libc/arch/powerpc/sys/cerror.S +++ b/lib/libc/arch/powerpc/sys/cerror.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cerror.S,v 1.8 2011/04/04 12:42:39 guenther Exp $ */ +/* $OpenBSD: cerror.S,v 1.9 2012/08/22 22:26:16 deraadt Exp $ */ /* * Copyright (c) 1996 Dale Rahn @@ -32,7 +32,7 @@ WEAK_ALIAS(__cerror, ___cerror) .text ASENTRY(___cerror) -#if defined (PIC) +#if defined (__PIC__) stwu 1, -16(1) /* follow the SVR4 ABI */ mflr 3 /* error value is in r0, use r3 */ stw 3, 20(1) @@ -47,7 +47,7 @@ ASENTRY(___cerror) stw 0, 0(5) addi 3, 0, -1 addi 4, 0, -1 -#if defined (PIC) +#if defined (__PIC__) lwz 0, 20(1) mtlr 0 addi 1, 1, 16 /* follow the SVR4 ABI */ diff --git a/lib/libc/arch/powerpc/sys/sbrk.S b/lib/libc/arch/powerpc/sys/sbrk.S index 608f28189f3..c5a82d50093 100644 --- a/lib/libc/arch/powerpc/sys/sbrk.S +++ b/lib/libc/arch/powerpc/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.6 2002/10/07 04:47:12 drahn Exp $ */ +/* $OpenBSD: sbrk.S,v 1.7 2012/08/22 22:26:16 deraadt Exp $ */ /* * Copyright (c) 1996 Dale Rahn @@ -41,7 +41,7 @@ _ASM_LABEL(minbrk): PREFIX2(sbrk,break) /* call break(__curbrk + size) */ -#ifndef PIC +#ifndef __PIC__ addis 6, 0, _ASM_LABEL(__curbrk)@H ori 6, 6, _ASM_LABEL(__curbrk)@L /* # 6 = &__curbrk */ #else diff --git a/lib/libc/arch/powerpc/sys/setlogin.S b/lib/libc/arch/powerpc/sys/setlogin.S index 689295de602..3f1019d1c0b 100644 --- a/lib/libc/arch/powerpc/sys/setlogin.S +++ b/lib/libc/arch/powerpc/sys/setlogin.S @@ -1,4 +1,4 @@ -/* $OpenBSD: setlogin.S,v 1.4 2002/10/07 04:47:12 drahn Exp $ */ +/* $OpenBSD: setlogin.S,v 1.5 2012/08/22 22:26:16 deraadt Exp $ */ /* * Copyright (c) 1996 Dale Rahn @@ -29,7 +29,7 @@ .extern _C_LABEL(_logname_valid) RSYSCALL(setlogin) li 4, 4 -#ifndef PIC +#ifndef __PIC__ lis 0,_C_LABEL(_logname_valid)@H stw 4,_C_LABEL(_logname_valid)@L(0) #else |