diff options
| author | Pascal Stumpf <pascal@cvs.openbsd.org> | 2012-08-22 17:19:36 +0000 |
|---|---|---|
| committer | Pascal Stumpf <pascal@cvs.openbsd.org> | 2012-08-22 17:19:36 +0000 |
| commit | 0b17a3ce8acce6123900b78334061ec5da7fff13 (patch) | |
| tree | 899daa1fa911a22452f013b57bb5873909dd7ed4 | |
| parent | 9e13e109aa5166fac25ad417e38996ce27251c67 (diff) | |
Convert cpp | as rules in bsd.lib.mk and lib/libc/sys/Makefile.inc to pure cc
invocations. This allows us to use the compiler builtin define __PIC__ to check
for PIC/PIEness rather than passing -DPIC. Simplifies PIE work a lot.
ok matthew@, conceptually ok kurt@
78 files changed, 213 insertions, 208 deletions
diff --git a/lib/csu/arm/md_init.h b/lib/csu/arm/md_init.h index e5c5eac35aa..1085a81b6cf 100644 --- a/lib/csu/arm/md_init.h +++ b/lib/csu/arm/md_init.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md_init.h,v 1.2 2004/02/09 02:40:49 drahn Exp $ */ +/* $OpenBSD: md_init.h,v 1.3 2012/08/22 17:19:34 pascal Exp $ */ /*- * Copyright (c) 2001 Ross Harvey @@ -33,7 +33,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef PIC +#ifdef __PIC__ /* This nastyness derived from gcc3 output */ #define MD_SECT_CALL_FUNC(section, func) \ __asm (".section "#section", \"ax\" \n" \ diff --git a/lib/csu/hppa/md_init.h b/lib/csu/hppa/md_init.h index bb26b84a761..732605ed263 100644 --- a/lib/csu/hppa/md_init.h +++ b/lib/csu/hppa/md_init.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md_init.h,v 1.2 2004/05/26 19:17:35 mickey Exp $ */ +/* $OpenBSD: md_init.h,v 1.3 2012/08/22 17:19:34 pascal Exp $ */ /* * Copyright (c) 2003 Dale Rahn. All rights reserved. @@ -25,7 +25,7 @@ */ -#ifdef PIC +#ifdef __PIC__ #define MD_SECT_CALL_FUNC(section, func) \ __asm (".section "#section",\"ax\",@progbits \n" \ " bl " #func ",%r2 \n" \ diff --git a/lib/libc/arch/amd64/SYS.h b/lib/libc/arch/amd64/SYS.h index 2821493c42e..a7864ffa2ad 100644 --- a/lib/libc/arch/amd64/SYS.h +++ b/lib/libc/arch/amd64/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.7 2011/10/11 01:54:41 guenther Exp $ */ +/* $OpenBSD: SYS.h,v 1.8 2012/08/22 17:19:34 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -63,7 +63,7 @@ SYSENTRY(x); \ SYSTRAP(y) -#ifdef PIC +#ifdef __PIC__ #define _SYSCALL(x,y) \ .text; _ALIGN_TEXT; \ 2: mov PIC_GOT(CERROR), %rcx; \ diff --git a/lib/libc/arch/amd64/gen/flt_rounds.S b/lib/libc/arch/amd64/gen/flt_rounds.S index 009c59ab64a..81077fae55f 100644 --- a/lib/libc/arch/amd64/gen/flt_rounds.S +++ b/lib/libc/arch/amd64/gen/flt_rounds.S @@ -1,4 +1,4 @@ -/* $OpenBSD: flt_rounds.S,v 1.1 2004/01/28 01:44:45 mickey Exp $ */ +/* $OpenBSD: flt_rounds.S,v 1.2 2012/08/22 17:19:34 pascal Exp $ */ /* $NetBSD: flt_rounds.S,v 1.2 2002/06/06 23:04:35 fvdl Exp $ */ /* @@ -21,7 +21,7 @@ ENTRY(__flt_rounds) movl -4(%rsp),%eax shrl $10,%eax andl $3,%eax -#ifdef PIC +#ifdef __PIC__ leaq PIC_GOT(_map),%rcx movb (%rcx,%rax,1),%al #else diff --git a/lib/libc/arch/amd64/gen/setjmp.S b/lib/libc/arch/amd64/gen/setjmp.S index b7ae81f2141..1641add9a3a 100644 --- a/lib/libc/arch/amd64/gen/setjmp.S +++ b/lib/libc/arch/amd64/gen/setjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: setjmp.S,v 1.2 2004/02/09 21:25:08 deraadt Exp $ */ +/* $OpenBSD: setjmp.S,v 1.3 2012/08/22 17:19:34 pascal Exp $ */ /* $NetBSD: __setjmp14.S,v 1.1 2001/06/19 00:25:02 fvdl Exp $ */ /* @@ -53,7 +53,7 @@ ENTRY(setjmp) pushq %rdi xorq %rdi,%rdi -#ifdef PIC +#ifdef __PIC__ call PIC_PLT(_C_LABEL(sigblock)) #else call _C_LABEL(sigblock) @@ -80,7 +80,7 @@ ENTRY(longjmp) movq (_JB_SIGMASK * 8)(%rdi),%rdi pushq %r8 -#ifdef PIC +#ifdef __PIC__ call PIC_PLT(_C_LABEL(sigsetmask)) #else call _C_LABEL(sigsetmask) diff --git a/lib/libc/arch/amd64/gen/sigsetjmp.S b/lib/libc/arch/amd64/gen/sigsetjmp.S index e4c26d50927..51b055a0f58 100644 --- a/lib/libc/arch/amd64/gen/sigsetjmp.S +++ b/lib/libc/arch/amd64/gen/sigsetjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigsetjmp.S,v 1.2 2004/02/09 21:25:08 deraadt Exp $ */ +/* $OpenBSD: sigsetjmp.S,v 1.3 2012/08/22 17:19:34 pascal Exp $ */ /* $NetBSD: __setjmp14.S,v 1.1 2001/06/19 00:25:02 fvdl Exp $ */ /* @@ -57,7 +57,7 @@ ENTRY(sigsetjmp) pushq %rdi xorq %rdi,%rdi -#ifdef PIC +#ifdef __PIC__ call PIC_PLT(_C_LABEL(sigblock)) #else call _C_LABEL(sigblock) @@ -85,7 +85,7 @@ ENTRY(siglongjmp) jz 2f movq (_JB_SIGMASK * 8)(%rdi),%rdi -#ifdef PIC +#ifdef __PIC__ call PIC_PLT(_C_LABEL(sigsetmask)) #else call _C_LABEL(sigsetmask) diff --git a/lib/libc/arch/amd64/sys/Ovfork.S b/lib/libc/arch/amd64/sys/Ovfork.S index 98407ff38fa..84986ffbef9 100644 --- a/lib/libc/arch/amd64/sys/Ovfork.S +++ b/lib/libc/arch/amd64/sys/Ovfork.S @@ -1,4 +1,4 @@ -/* $OpenBSD: Ovfork.S,v 1.2 2005/12/13 00:10:48 jsg Exp $ */ +/* $OpenBSD: Ovfork.S,v 1.3 2012/08/22 17:19:34 pascal Exp $ */ /* $NetBSD: Ovfork.S,v 1.2 2002/06/03 18:30:33 fvdl Exp $ */ /*- @@ -55,7 +55,7 @@ SYSENTRY(vfork) jmp *%r9 err: pushq %r9 -#ifdef PIC +#ifdef __PIC__ movq PIC_GOT(CERROR), %rcx jmp *%rcx #else diff --git a/lib/libc/arch/amd64/sys/brk.S b/lib/libc/arch/amd64/sys/brk.S index 939b800c3ed..fe5a0b9acfd 100644 --- a/lib/libc/arch/amd64/sys/brk.S +++ b/lib/libc/arch/amd64/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.3 2005/12/13 00:10:48 jsg Exp $ */ +/* $OpenBSD: brk.S,v 1.4 2012/08/22 17:19:34 pascal Exp $ */ /* $NetBSD: brk.S,v 1.2 2002/06/03 18:30:33 fvdl Exp $ */ /*- @@ -55,7 +55,7 @@ _C_LABEL(__minbrk): .text SYSENTRY(_brk) -#ifdef PIC +#ifdef __PIC__ movq PIC_GOT(_C_LABEL(__minbrk)),%rdx cmpq %rdi,(%rdx) jb 1f diff --git a/lib/libc/arch/amd64/sys/cerror.S b/lib/libc/arch/amd64/sys/cerror.S index 0749fdab4de..3debb1b9bac 100644 --- a/lib/libc/arch/amd64/sys/cerror.S +++ b/lib/libc/arch/amd64/sys/cerror.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cerror.S,v 1.5 2011/04/04 12:42:39 guenther Exp $ */ +/* $OpenBSD: cerror.S,v 1.6 2012/08/22 17:19:34 pascal Exp $ */ /* $NetBSD: cerror.S,v 1.2 2002/06/03 18:30:33 fvdl Exp $ */ /*- @@ -44,7 +44,7 @@ WEAK_ALIAS(CERROR, _CERROR) _ENTRY(_CERROR) -#ifdef PIC +#ifdef __PIC__ movq PIC_GOT(_C_LABEL(errno)), %rcx movl %eax, (%rcx) #else diff --git a/lib/libc/arch/amd64/sys/exect.S b/lib/libc/arch/amd64/sys/exect.S index 6781425604d..654134fd4f7 100644 --- a/lib/libc/arch/amd64/sys/exect.S +++ b/lib/libc/arch/amd64/sys/exect.S @@ -1,4 +1,4 @@ -/* $OpenBSD: exect.S,v 1.2 2005/12/13 00:10:48 jsg Exp $ */ +/* $OpenBSD: exect.S,v 1.3 2012/08/22 17:19:34 pascal Exp $ */ /* $NetBSD: exect.S,v 1.1 2001/06/19 00:25:06 fvdl Exp $ */ /*- @@ -45,7 +45,7 @@ SYSENTRY(exect) orb $(PSL_T>>8),1(%rsp) popfq SYSTRAP(execve) -#ifdef PIC +#ifdef __PIC__ movq PIC_GOT(CERROR), %rcx jmp *%rcx #else diff --git a/lib/libc/arch/amd64/sys/sbrk.S b/lib/libc/arch/amd64/sys/sbrk.S index 98fceaf9e0a..e6a3bbd7d87 100644 --- a/lib/libc/arch/amd64/sys/sbrk.S +++ b/lib/libc/arch/amd64/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.3 2006/05/09 22:52:13 drahn Exp $ */ +/* $OpenBSD: sbrk.S,v 1.4 2012/08/22 17:19:34 pascal Exp $ */ /* $NetBSD: sbrk.S,v 1.1 2001/06/19 00:25:06 fvdl Exp $ */ /*- @@ -55,7 +55,7 @@ __curbrk: .quad _end .text SYSENTRY(_sbrk) -#ifdef PIC +#ifdef __PIC__ movq PIC_GOT(__curbrk),%rdx movslq %edi, %rax movq (%rdx),%rdi diff --git a/lib/libc/arch/amd64/sys/sigprocmask.S b/lib/libc/arch/amd64/sys/sigprocmask.S index a34a4146f3c..c23a9f87395 100644 --- a/lib/libc/arch/amd64/sys/sigprocmask.S +++ b/lib/libc/arch/amd64/sys/sigprocmask.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigprocmask.S,v 1.3 2005/12/13 00:10:48 jsg Exp $ */ +/* $OpenBSD: sigprocmask.S,v 1.4 2012/08/22 17:19:34 pascal Exp $ */ /* $NetBSD: sigprocmask.S,v 1.1 2001/06/19 00:25:06 fvdl Exp $ */ /*- @@ -54,7 +54,7 @@ out: xorl %eax,%eax ret err: -#ifdef PIC +#ifdef __PIC__ movq PIC_GOT(CERROR), %rcx jmp *%rcx #else diff --git a/lib/libc/arch/amd64/sys/sigsuspend.S b/lib/libc/arch/amd64/sys/sigsuspend.S index f24a1c6ae47..b181fda0a63 100644 --- a/lib/libc/arch/amd64/sys/sigsuspend.S +++ b/lib/libc/arch/amd64/sys/sigsuspend.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigsuspend.S,v 1.2 2005/12/13 00:10:48 jsg Exp $ */ +/* $OpenBSD: sigsuspend.S,v 1.3 2012/08/22 17:19:34 pascal Exp $ */ /* $NetBSD: sigsuspend.S,v 1.1 2001/06/19 00:25:07 fvdl Exp $ */ /*- @@ -46,7 +46,7 @@ SYSENTRY(sigsuspend) xorl %eax,%eax # shouldn t happen ret err: -#ifdef PIC +#ifdef __PIC__ movq PIC_GOT(CERROR), %rcx jmp *%rcx #else diff --git a/lib/libc/arch/amd64/sys/syscall.S b/lib/libc/arch/amd64/sys/syscall.S index d398db2f2e2..4fcc823c891 100644 --- a/lib/libc/arch/amd64/sys/syscall.S +++ b/lib/libc/arch/amd64/sys/syscall.S @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.S,v 1.3 2005/12/13 00:10:48 jsg Exp $ */ +/* $OpenBSD: syscall.S,v 1.4 2012/08/22 17:19:34 pascal Exp $ */ /* $NetBSD: syscall.S,v 1.2 2002/06/03 18:30:33 fvdl Exp $ */ /*- @@ -46,7 +46,7 @@ SYSENTRY(syscall) jc err ret err: -#ifdef PIC +#ifdef __PIC__ movq PIC_GOT(CERROR), %rcx jmp *%rcx #else diff --git a/lib/libc/arch/amd64/sys/tfork_thread.S b/lib/libc/arch/amd64/sys/tfork_thread.S index 9eb4f0631fe..f8ddde0662f 100644 --- a/lib/libc/arch/amd64/sys/tfork_thread.S +++ b/lib/libc/arch/amd64/sys/tfork_thread.S @@ -1,4 +1,4 @@ -/* $OpenBSD: tfork_thread.S,v 1.2 2012/06/21 00:56:59 guenther Exp $ */ +/* $OpenBSD: tfork_thread.S,v 1.3 2012/08/22 17:19:34 pascal Exp $ */ /*- * Copyright (c) 2000 Peter Wemm <peter@FreeBSD.org> * Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu> @@ -85,7 +85,7 @@ ENTRY(__tfork_thread) * Branch here if the thread creation fails: */ 2: -#ifdef PIC +#ifdef __PIC__ movq PIC_GOT(CERROR), %rcx jmp *%rcx #else diff --git a/lib/libc/arch/arm/sys/brk.S b/lib/libc/arch/arm/sys/brk.S index 34ed7336b39..27adaf62fa9 100644 --- a/lib/libc/arch/arm/sys/brk.S +++ b/lib/libc/arch/arm/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.4 2004/10/01 04:08:45 jsg Exp $ */ +/* $OpenBSD: brk.S,v 1.5 2012/08/22 17:19:34 pascal Exp $ */ /* $NetBSD: brk.S,v 1.7 2003/12/26 11:23:44 martin Exp $ */ /*- @@ -52,7 +52,7 @@ _C_LABEL(__minbrk): * Change the data segment size */ SYSENTRY(_brk) -#ifdef PIC +#ifdef __PIC__ /* Setup the GOT */ ldr r3, .Lgot ldr r1, .Lminbrk @@ -75,7 +75,7 @@ SYSENTRY(_brk) SYSTRAP(break) bcs PIC_SYM(CERROR, PLT) -#ifdef PIC +#ifdef __PIC__ ldr r1, .Lcurbrk ldr r1, [r3, r1] #else @@ -89,7 +89,7 @@ SYSENTRY(_brk) mov r15, r14 .align 2 -#ifdef PIC +#ifdef __PIC__ .Lgot: .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) - (.L1+8) #endif diff --git a/lib/libc/arch/arm/sys/cerror.S b/lib/libc/arch/arm/sys/cerror.S index 1e93ad300d5..8c941bd0042 100644 --- a/lib/libc/arch/arm/sys/cerror.S +++ b/lib/libc/arch/arm/sys/cerror.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cerror.S,v 1.4 2011/04/04 12:42:39 guenther Exp $ */ +/* $OpenBSD: cerror.S,v 1.5 2012/08/22 17:19:34 pascal Exp $ */ /* $NetBSD: cerror.S,v 1.5 2003/08/07 16:42:04 agc Exp $ */ /*- @@ -46,7 +46,7 @@ ASENTRY(_CERROR) mvn r1, #0x00000000 ldmfd sp!, {r4, pc} #else -#ifdef PIC +#ifdef __PIC__ /* Setup the GOT */ ldr r3, .Lgot ldr r1, .Lerrno @@ -61,7 +61,7 @@ ASENTRY(_CERROR) mvn r1, #0x00000000 mov pc, lr -#ifdef PIC +#ifdef __PIC__ .align 0 .Lgot: .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) - (.L1+8) diff --git a/lib/libc/arch/arm/sys/sbrk.S b/lib/libc/arch/arm/sys/sbrk.S index 15b8b57e14f..6d501d71efb 100644 --- a/lib/libc/arch/arm/sys/sbrk.S +++ b/lib/libc/arch/arm/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.4 2004/02/07 06:02:07 drahn Exp $ */ +/* $OpenBSD: sbrk.S,v 1.5 2012/08/22 17:19:34 pascal Exp $ */ /* $NetBSD: sbrk.S,v 1.7 2003/08/07 16:42:05 agc Exp $ */ /*- @@ -55,7 +55,7 @@ _ASM_LABEL(minbrk): * Change the data segment size */ SYSENTRY(_sbrk) -#ifdef PIC +#ifdef __PIC__ /* Setup the GOT */ ldr r3, .Lgot ldr r2, .Lcurbrk @@ -83,7 +83,7 @@ SYSENTRY(_sbrk) mov r15, r14 .align 0 -#ifdef PIC +#ifdef __PIC__ .Lgot: .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) - (.L1+8) #endif diff --git a/lib/libc/arch/hppa/sys/brk.S b/lib/libc/arch/hppa/sys/brk.S index 84588130c22..2163e5ae3af 100644 --- a/lib/libc/arch/hppa/sys/brk.S +++ b/lib/libc/arch/hppa/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.14 2006/01/05 22:13:55 kettenis Exp $ */ +/* $OpenBSD: brk.S,v 1.15 2012/08/22 17:19:34 pascal Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -37,7 +37,7 @@ minbrk .long end SYSENTRY(brk) -#ifdef PIC +#ifdef __PIC__ addil LT%minbrk, r19 ldw RT%minbrk(r1), t1 ldw 0(t1), t2 @@ -52,7 +52,7 @@ SYSENTRY(brk) SYSCALL(break) ldw HPPA_FRAME_ARG(0)(sp), arg0 -#ifdef PIC +#ifdef __PIC__ addil LT%__curbrk, r19 ldw RT%__curbrk(r1), t1 bv r0(rp) diff --git a/lib/libc/arch/hppa/sys/cerror.S b/lib/libc/arch/hppa/sys/cerror.S index fb9998fb6da..fbec5adfd92 100644 --- a/lib/libc/arch/hppa/sys/cerror.S +++ b/lib/libc/arch/hppa/sys/cerror.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cerror.S,v 1.5 2011/04/04 12:42:39 guenther Exp $ */ +/* $OpenBSD: cerror.S,v 1.6 2012/08/22 17:19:34 pascal Exp $ */ /* * Copyright (c) 2004 Michael Shalayeff @@ -32,7 +32,7 @@ WEAK_ALIAS(__cerror, ___cerror) .import errno, data ENTRY(___cerror,0) -#ifdef PIC +#ifdef __PIC__ addil LT%errno, r19 ldw RT%errno(r1), r1 stw t1, 0(r1) diff --git a/lib/libc/arch/hppa/sys/sbrk.S b/lib/libc/arch/hppa/sys/sbrk.S index 1813d6ad85e..91ccd18c21c 100644 --- a/lib/libc/arch/hppa/sys/sbrk.S +++ b/lib/libc/arch/hppa/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.13 2006/01/05 22:13:55 kettenis Exp $ */ +/* $OpenBSD: sbrk.S,v 1.14 2012/08/22 17:19:34 pascal Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -36,7 +36,7 @@ __curbrk .long end SYSENTRY(sbrk) -#ifdef PIC +#ifdef __PIC__ addil LT%__curbrk, r19 ldw RT%__curbrk(r1), t1 ldw 0(t1), t2 @@ -49,7 +49,7 @@ SYSENTRY(sbrk) SYSCALL(break) -#ifdef PIC +#ifdef __PIC__ addil LT%__curbrk, r19 ldw RT%__curbrk(r1), t1 #else diff --git a/lib/libc/arch/hppa64/sys/brk.S b/lib/libc/arch/hppa64/sys/brk.S index cc2bae54616..15376196eae 100644 --- a/lib/libc/arch/hppa64/sys/brk.S +++ b/lib/libc/arch/hppa64/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.4 2011/04/21 14:12:20 jsing Exp $ */ +/* $OpenBSD: brk.S,v 1.5 2012/08/22 17:19:34 pascal Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -37,7 +37,7 @@ minbrk .long end SYSENTRY(brk) -#ifdef PIC +#ifdef __PIC__ addil LT%minbrk, %r19 ldd RT%minbrk(%r1), arg4 ldd 0(arg4), arg5 @@ -52,7 +52,7 @@ SYSENTRY(brk) SYSCALL(break) ldd HPPA_FRAME_ARG(0)(%sp), %arg0 -#ifdef PIC +#ifdef __PIC__ addil LT%__curbrk, %r19 ldd RT%__curbrk(%r1), arg4 bv %r0(%rp) diff --git a/lib/libc/arch/hppa64/sys/cerror.S b/lib/libc/arch/hppa64/sys/cerror.S index ae880bb0b2c..ab81d5ecffa 100644 --- a/lib/libc/arch/hppa64/sys/cerror.S +++ b/lib/libc/arch/hppa64/sys/cerror.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cerror.S,v 1.4 2011/09/19 19:06:48 kettenis Exp $ */ +/* $OpenBSD: cerror.S,v 1.5 2012/08/22 17:19:34 pascal Exp $ */ /* * Copyright (c) 2004 Michael Shalayeff @@ -32,7 +32,7 @@ WEAK_ALIAS(__cerror, ___cerror) .import errno, data ENTRY(___cerror,0) -#ifdef PIC +#ifdef __PIC__ addil LT%errno, %dp ldd RT%errno(%r1), %r1 stw %ret0, 0(%r1) diff --git a/lib/libc/arch/hppa64/sys/sbrk.S b/lib/libc/arch/hppa64/sys/sbrk.S index b1b81beec66..df3e303e40f 100644 --- a/lib/libc/arch/hppa64/sys/sbrk.S +++ b/lib/libc/arch/hppa64/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.4 2011/04/21 14:12:20 jsing Exp $ */ +/* $OpenBSD: sbrk.S,v 1.5 2012/08/22 17:19:34 pascal Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -36,7 +36,7 @@ __curbrk .long end SYSENTRY(sbrk) -#ifdef PIC +#ifdef __PIC__ addil LT%__curbrk, %r19 ldd RT%__curbrk(%r1), %arg3 ldd 0(%arg3), %arg2 @@ -49,7 +49,7 @@ SYSENTRY(sbrk) SYSCALL(break) -#ifdef PIC +#ifdef __PIC__ addil LT%__curbrk, %r19 ldd RT%__curbrk(%r1), %arg3 #else diff --git a/lib/libc/arch/i386/SYS.h b/lib/libc/arch/i386/SYS.h index 7ad5a102fea..40428b0619c 100644 --- a/lib/libc/arch/i386/SYS.h +++ b/lib/libc/arch/i386/SYS.h @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenBSD: SYS.h,v 1.17 2011/04/04 12:42:39 guenther Exp $ + * $OpenBSD: SYS.h,v 1.18 2012/08/22 17:19:34 pascal Exp $ */ #include <machine/asm.h> @@ -80,7 +80,7 @@ _SYSCALL_NOERROR(x,x) /* perform a syscall, set errno */ -#ifdef PIC +#ifdef __PIC__ #define _SYSCALL(x,y) \ .text; \ .align 2; \ diff --git a/lib/libc/arch/i386/gen/fixunsdfsi.S b/lib/libc/arch/i386/gen/fixunsdfsi.S index f353d0a0d7b..6097f8ca06d 100644 --- a/lib/libc/arch/i386/gen/fixunsdfsi.S +++ b/lib/libc/arch/i386/gen/fixunsdfsi.S @@ -1,4 +1,4 @@ -/* $OpenBSD: fixunsdfsi.S,v 1.5 2005/08/07 11:30:38 espie Exp $ */ +/* $OpenBSD: fixunsdfsi.S,v 1.6 2012/08/22 17:19:34 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -36,7 +36,7 @@ ENTRY(__fixunsdfsi) fldl 4(%esp) /* argument double to accum stack */ frndint /* create integer */ -#ifdef PIC +#ifdef __PIC__ PIC_PROLOGUE leal PIC_GOTOFF(fbiggestsigned),%eax PIC_EPILOGUE @@ -53,7 +53,7 @@ ENTRY(__fixunsdfsi) ret 1: -#ifdef PIC +#ifdef __PIC__ PIC_PROLOGUE leal PIC_GOTOFF(fbiggestsigned),%eax PIC_EPILOGUE diff --git a/lib/libc/arch/i386/gen/flt_rounds.S b/lib/libc/arch/i386/gen/flt_rounds.S index f50fc88a277..968d5a2eed3 100644 --- a/lib/libc/arch/i386/gen/flt_rounds.S +++ b/lib/libc/arch/i386/gen/flt_rounds.S @@ -1,4 +1,4 @@ -/* $OpenBSD: flt_rounds.S,v 1.3 2005/08/07 11:30:38 espie Exp $ */ +/* $OpenBSD: flt_rounds.S,v 1.4 2012/08/22 17:19:34 pascal Exp $ */ /* * Written by J.T. Conklin, Apr 4, 1995 * Public domain. @@ -20,7 +20,7 @@ ENTRY(__flt_rounds) movl (%esp),%eax shrl $10,%eax andl $3,%eax -#ifdef PIC +#ifdef __PIC__ PIC_PROLOGUE leal PIC_GOTOFF(_map),%ecx PIC_EPILOGUE diff --git a/lib/libc/arch/i386/gen/setjmp.S b/lib/libc/arch/i386/gen/setjmp.S index bcb5f9d5e5d..0c09e321610 100644 --- a/lib/libc/arch/i386/gen/setjmp.S +++ b/lib/libc/arch/i386/gen/setjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: setjmp.S,v 1.8 2005/08/07 11:30:38 espie Exp $ */ +/* $OpenBSD: setjmp.S,v 1.9 2012/08/22 17:19:34 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -46,7 +46,7 @@ ENTRY(setjmp) PIC_PROLOGUE pushl $0 -#ifdef PIC +#ifdef __PIC__ call PIC_PLT(_C_LABEL(sigblock)) #else call _C_LABEL(sigblock) @@ -70,7 +70,7 @@ ENTRY(longjmp) movl 4(%esp),%edx PIC_PROLOGUE pushl 24(%edx) -#ifdef PIC +#ifdef __PIC__ call PIC_PLT(_C_LABEL(sigsetmask)) #else call _C_LABEL(sigsetmask) diff --git a/lib/libc/arch/i386/gen/sigsetjmp.S b/lib/libc/arch/i386/gen/sigsetjmp.S index c990a0582a5..33215b13b33 100644 --- a/lib/libc/arch/i386/gen/sigsetjmp.S +++ b/lib/libc/arch/i386/gen/sigsetjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigsetjmp.S,v 1.7 2005/08/07 11:30:38 espie Exp $ */ +/* $OpenBSD: sigsetjmp.S,v 1.8 2012/08/22 17:19:34 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -42,7 +42,7 @@ ENTRY(sigsetjmp) PIC_PROLOGUE pushl $0 -#ifdef PIC +#ifdef __PIC__ call PIC_PLT(_C_LABEL(sigblock)) #else call _C_LABEL(sigblock) @@ -69,7 +69,7 @@ ENTRY(siglongjmp) PIC_PROLOGUE pushl 24(%edx) -#ifdef PIC +#ifdef __PIC__ call PIC_PLT(_C_LABEL(sigsetmask)) #else call _C_LABEL(sigsetmask) diff --git a/lib/libc/arch/i386/sys/Ovfork.S b/lib/libc/arch/i386/sys/Ovfork.S index c4f64416cae..984c26c3cb0 100644 --- a/lib/libc/arch/i386/sys/Ovfork.S +++ b/lib/libc/arch/i386/sys/Ovfork.S @@ -1,4 +1,4 @@ -/* $OpenBSD: Ovfork.S,v 1.6 2005/08/07 11:30:38 espie Exp $ */ +/* $OpenBSD: Ovfork.S,v 1.7 2012/08/22 17:19:34 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -49,7 +49,7 @@ SYSENTRY(vfork) andl %edx,%eax jmp *%ecx err: -#ifdef PIC +#ifdef __PIC__ PIC_PROLOGUE movl PIC_GOT(_C_LABEL(errno)),%edx PIC_EPILOGUE diff --git a/lib/libc/arch/i386/sys/brk.S b/lib/libc/arch/i386/sys/brk.S index acae4399514..5d3149db906 100644 --- a/lib/libc/arch/i386/sys/brk.S +++ b/lib/libc/arch/i386/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.8 2005/08/07 11:30:38 espie Exp $ */ +/* $OpenBSD: brk.S,v 1.9 2012/08/22 17:19:34 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -42,7 +42,7 @@ minbrk: .long _end .text ENTRY(brk) -#ifdef PIC +#ifdef __PIC__ movl 4(%esp),%ecx PIC_PROLOGUE movl PIC_GOT(minbrk),%edx diff --git a/lib/libc/arch/i386/sys/cerror.S b/lib/libc/arch/i386/sys/cerror.S index 4cffd703531..de36747aa6c 100644 --- a/lib/libc/arch/i386/sys/cerror.S +++ b/lib/libc/arch/i386/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 17:19:34 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -38,7 +38,7 @@ WEAK_ALIAS(CERROR, _CERROR) _ENTRY(_CERROR) -#ifdef PIC +#ifdef __PIC__ PIC_PROLOGUE movl PIC_GOT(_C_LABEL(errno)),%ecx PIC_EPILOGUE diff --git a/lib/libc/arch/i386/sys/exect.S b/lib/libc/arch/i386/sys/exect.S index 363f3003f6e..68f4639f360 100644 --- a/lib/libc/arch/i386/sys/exect.S +++ b/lib/libc/arch/i386/sys/exect.S @@ -1,4 +1,4 @@ -/* $OpenBSD: exect.S,v 1.6 2005/08/07 11:30:38 espie Exp $ */ +/* $OpenBSD: exect.S,v 1.7 2012/08/22 17:19:34 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -42,7 +42,7 @@ ENTRY(exect) pushl %edx popf int $0x80 -#ifdef PIC +#ifdef __PIC__ PIC_PROLOGUE movl PIC_GOT(CERROR), %ecx PIC_EPILOGUE diff --git a/lib/libc/arch/i386/sys/sbrk.S b/lib/libc/arch/i386/sys/sbrk.S index 9d97e2c383e..8e61d00cab6 100644 --- a/lib/libc/arch/i386/sys/sbrk.S +++ b/lib/libc/arch/i386/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.8 2005/08/07 11:30:38 espie Exp $ */ +/* $OpenBSD: sbrk.S,v 1.9 2012/08/22 17:19:34 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -41,7 +41,7 @@ __curbrk: .long _end .text ENTRY(sbrk) -#ifdef PIC +#ifdef __PIC__ movl 4(%esp),%ecx PIC_PROLOGUE movl PIC_GOT(__curbrk),%edx diff --git a/lib/libc/arch/i386/sys/sigprocmask.S b/lib/libc/arch/i386/sys/sigprocmask.S index b0265042086..b99f631e8ff 100644 --- a/lib/libc/arch/i386/sys/sigprocmask.S +++ b/lib/libc/arch/i386/sys/sigprocmask.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigprocmask.S,v 1.8 2005/08/07 11:30:38 espie Exp $ */ +/* $OpenBSD: sigprocmask.S,v 1.9 2012/08/22 17:19:34 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -53,7 +53,7 @@ out: xorl %eax,%eax ret err: -#ifdef PIC +#ifdef __PIC__ PIC_PROLOGUE movl PIC_GOT(CERROR), %ecx PIC_EPILOGUE diff --git a/lib/libc/arch/i386/sys/sigsuspend.S b/lib/libc/arch/i386/sys/sigsuspend.S index c14858224cd..ed760b2dfe8 100644 --- a/lib/libc/arch/i386/sys/sigsuspend.S +++ b/lib/libc/arch/i386/sys/sigsuspend.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigsuspend.S,v 1.7 2005/08/07 11:30:38 espie Exp $ */ +/* $OpenBSD: sigsuspend.S,v 1.8 2012/08/22 17:19:34 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -43,7 +43,7 @@ SYSENTRY(sigsuspend) xorl %eax,%eax # shouldn t happen ret err: -#ifdef PIC +#ifdef __PIC__ PIC_PROLOGUE movl PIC_GOT(CERROR), %ecx PIC_EPILOGUE diff --git a/lib/libc/arch/i386/sys/syscall.S b/lib/libc/arch/i386/sys/syscall.S index aa86e1c763d..c555b100f0e 100644 --- a/lib/libc/arch/i386/sys/syscall.S +++ b/lib/libc/arch/i386/sys/syscall.S @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.S,v 1.8 2005/08/07 11:30:38 espie Exp $ */ +/* $OpenBSD: syscall.S,v 1.9 2012/08/22 17:19:34 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -42,7 +42,7 @@ SYSENTRY(syscall) jc err ret err: -#ifdef PIC +#ifdef __PIC__ PIC_PROLOGUE movl PIC_GOT(CERROR), %ecx PIC_EPILOGUE diff --git a/lib/libc/arch/i386/sys/tfork_thread.S b/lib/libc/arch/i386/sys/tfork_thread.S index 57a7339eed3..ee82d061265 100644 --- a/lib/libc/arch/i386/sys/tfork_thread.S +++ b/lib/libc/arch/i386/sys/tfork_thread.S @@ -1,4 +1,4 @@ -/* $OpenBSD: tfork_thread.S,v 1.3 2012/06/21 00:56:59 guenther Exp $ */ +/* $OpenBSD: tfork_thread.S,v 1.4 2012/08/22 17:19:34 pascal Exp $ */ /*- * Copyright (c) 2000 Peter Wemm <peter@FreeBSD.org> * All rights reserved. @@ -109,7 +109,7 @@ ENTRY(__tfork_thread) popl %esi movl %ebp, %esp popl %ebp -#ifdef PIC +#ifdef __PIC__ PIC_PROLOGUE movl PIC_GOT(CERROR), %ecx PIC_EPILOGUE diff --git a/lib/libc/arch/m68k/sys/Ovfork.S b/lib/libc/arch/m68k/sys/Ovfork.S index 00309da692e..c14d4ed3b94 100644 --- a/lib/libc/arch/m68k/sys/Ovfork.S +++ b/lib/libc/arch/m68k/sys/Ovfork.S @@ -1,4 +1,4 @@ -/* $OpenBSD: Ovfork.S,v 1.5 2005/08/07 16:40:14 espie Exp $ */ +/* $OpenBSD: Ovfork.S,v 1.6 2012/08/22 17:19:34 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -60,7 +60,7 @@ SYSENTRY(vfork) jmp a0@ err: .globl _errno -#ifdef PIC +#ifdef __PIC__ movel #__GLOBAL_OFFSET_TABLE_,a1 lea pc@(0,a1:l),a1 movl a1@(_errno:w),a1 diff --git a/lib/libc/arch/m68k/sys/brk.S b/lib/libc/arch/m68k/sys/brk.S index 979513c2339..dbe3e2ded58 100644 --- a/lib/libc/arch/m68k/sys/brk.S +++ b/lib/libc/arch/m68k/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.6 2005/08/07 16:40:14 espie Exp $ */ +/* $OpenBSD: brk.S,v 1.7 2012/08/22 17:19:35 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -43,7 +43,7 @@ minbrk: .long _end .text ENTRY(brk) -#ifdef PIC +#ifdef __PIC__ movl #__GLOBAL_OFFSET_TABLE_,a1 lea pc@(0,a1:l),a1 movl a1@(minbrk:w),a0 @@ -58,7 +58,7 @@ ok: movl #SYS_break,d0 trap #0 jcs err -#ifdef PIC +#ifdef __PIC__ movl a1@(__curbrk:w),a0 movl sp@(4),a0@ #else diff --git a/lib/libc/arch/m68k/sys/cerror.S b/lib/libc/arch/m68k/sys/cerror.S index dd81a1a6c66..7a9c929ee0d 100644 --- a/lib/libc/arch/m68k/sys/cerror.S +++ b/lib/libc/arch/m68k/sys/cerror.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cerror.S,v 1.7 2011/04/09 15:45:16 deraadt Exp $ */ +/* $OpenBSD: cerror.S,v 1.8 2012/08/22 17:19:35 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -39,7 +39,7 @@ WEAK_ALIAS(_cerror,__cerror) .even .globl _errno ___cerror: -#ifdef PIC +#ifdef __PIC__ movl #__GLOBAL_OFFSET_TABLE_,a0 lea pc@(0,a0:l),a0 movl a0@(_errno:w),a0 diff --git a/lib/libc/arch/m68k/sys/sbrk.S b/lib/libc/arch/m68k/sys/sbrk.S index 0ad61366d5b..b2e880d73b1 100644 --- a/lib/libc/arch/m68k/sys/sbrk.S +++ b/lib/libc/arch/m68k/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.5 2005/08/07 16:40:14 espie Exp $ */ +/* $OpenBSD: sbrk.S,v 1.6 2012/08/22 17:19:35 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -42,7 +42,7 @@ __curbrk:.long _end .text ENTRY(sbrk) -#ifdef PIC +#ifdef __PIC__ movl #__GLOBAL_OFFSET_TABLE_,a1 lea pc@(0,a1:l),a1 movl a1@(__curbrk:w),a1 @@ -54,7 +54,7 @@ ENTRY(sbrk) movl #SYS_break,d0 trap #0 jcs err -#ifdef PIC +#ifdef __PIC__ movl a1@,d0 movl sp@(4),a1@ #else diff --git a/lib/libc/arch/m68k/sys/setlogin.S b/lib/libc/arch/m68k/sys/setlogin.S index 4d4497c4285..18c1d3394b5 100644 --- a/lib/libc/arch/m68k/sys/setlogin.S +++ b/lib/libc/arch/m68k/sys/setlogin.S @@ -1,4 +1,4 @@ -/* $OpenBSD: setlogin.S,v 1.4 2005/08/07 16:40:14 espie Exp $ */ +/* $OpenBSD: setlogin.S,v 1.5 2012/08/22 17:19:35 pascal Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. * All rights reserved. @@ -33,7 +33,7 @@ .globl ___logname_valid /* in getlogin() */ SYSCALL(setlogin) -#ifdef PIC +#ifdef __PIC__ movl #__GLOBAL_OFFSET_TABLE_,a1 lea pc@(0,a1:l),a1 movl a1@(___logname_valid:w),a1 diff --git a/lib/libc/arch/sh/SYS.h b/lib/libc/arch/sh/SYS.h index f15fbed39ed..81dcfb9873f 100644 --- a/lib/libc/arch/sh/SYS.h +++ b/lib/libc/arch/sh/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.3 2011/04/04 12:42:39 guenther Exp $ */ +/* $OpenBSD: SYS.h,v 1.4 2012/08/22 17:19:35 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -74,7 +74,7 @@ SYSENTRY(x); \ SYSTRAP(y) -#ifdef PIC +#ifdef __PIC__ #define JUMP_CERROR \ mov r0, r4; \ diff --git a/lib/libc/arch/sh/sys/brk.S b/lib/libc/arch/sh/sys/brk.S index 282ffc578c2..2670373019b 100644 --- a/lib/libc/arch/sh/sys/brk.S +++ b/lib/libc/arch/sh/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.1 2006/10/10 22:07:10 miod Exp $ */ +/* $OpenBSD: brk.S,v 1.2 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: brk.S,v 1.10 2006/01/06 03:58:31 uwe Exp $ */ /*- @@ -50,7 +50,7 @@ _C_LABEL(__minbrk): .text SYSENTRY(_brk) -#ifdef PIC +#ifdef __PIC__ mova L_GOT, r0 mov.l L_GOT, r2 add r0, r2 @@ -68,7 +68,7 @@ SYSENTRY(_brk) mov.l LSYS_break, r0 trapa #0x80 bf err -#ifdef PIC +#ifdef __PIC__ mov.l Lcurbrk, r0 mov.l @(r0, r2), r1 xor r0, r0 @@ -83,7 +83,7 @@ err: .align 2 LSYS_break: .long SYS_break -#ifdef PIC +#ifdef __PIC__ L_GOT: .long _GLOBAL_OFFSET_TABLE_ Lminbrk: .long _C_LABEL(__minbrk)@GOT Lcurbrk: .long _C_LABEL(__curbrk)@GOT diff --git a/lib/libc/arch/sh/sys/cerror.S b/lib/libc/arch/sh/sys/cerror.S index 6baa0bc69b4..c873e076a4d 100644 --- a/lib/libc/arch/sh/sys/cerror.S +++ b/lib/libc/arch/sh/sys/cerror.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cerror.S,v 1.2 2011/04/04 12:42:39 guenther Exp $ */ +/* $OpenBSD: cerror.S,v 1.3 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: cerror.S,v 1.10 2006/01/06 05:14:39 uwe Exp $ */ /*- @@ -60,7 +60,7 @@ ASENTRY(_CERROR) SET_ASENTRY_SIZE(_CERROR) #else /* !_REENTRANT */ -#ifdef PIC +#ifdef __PIC__ mova L_GOT, r0 mov.l L_GOT, r1 add r0, r1 @@ -76,7 +76,7 @@ ASENTRY(_CERROR) mov #-1, r1 .align 2 -#ifdef PIC +#ifdef __PIC__ L_GOT: .long _GLOBAL_OFFSET_TABLE_ L_errno: .long _C_LABEL(errno)@GOT #else diff --git a/lib/libc/arch/sh/sys/sbrk.S b/lib/libc/arch/sh/sys/sbrk.S index 1dfcb028fca..bb783cfe3aa 100644 --- a/lib/libc/arch/sh/sys/sbrk.S +++ b/lib/libc/arch/sh/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.1 2006/10/10 22:07:10 miod Exp $ */ +/* $OpenBSD: sbrk.S,v 1.2 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: sbrk.S,v 1.9 2006/01/06 03:58:31 uwe Exp $ */ /*- @@ -51,7 +51,7 @@ _C_LABEL(__curbrk): SYSENTRY(_sbrk) mov r4, r2 -#ifdef PIC +#ifdef __PIC__ mova L_GOT, r0 mov.l L_GOT, r3 add r0, r3 @@ -65,7 +65,7 @@ SYSENTRY(_sbrk) mov.l LSYS_break, r0 trapa #0x80 bf err -#ifdef PIC +#ifdef __PIC__ mov.l Lcurbrk, r0 mov.l @(r0, r3), r1 #else @@ -80,7 +80,7 @@ err: .align 2 LSYS_break: .long SYS_break -#ifdef PIC +#ifdef __PIC__ L_GOT: .long _GLOBAL_OFFSET_TABLE_ Lcurbrk: .long _C_LABEL(__curbrk)@GOT #else diff --git a/lib/libc/arch/sparc/SYS.h b/lib/libc/arch/sparc/SYS.h index e45864d4f12..f4610e88c3f 100644 --- a/lib/libc/arch/sparc/SYS.h +++ b/lib/libc/arch/sparc/SYS.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenBSD: SYS.h,v 1.13 2003/06/02 20:18:32 millert Exp $ + * $OpenBSD: SYS.h,v 1.14 2012/08/22 17:19:35 pascal Exp $ */ #include <machine/asm.h> @@ -48,7 +48,7 @@ /* * ERROR branches to cerror. */ -#ifdef PIC +#ifdef __PIC__ #define ERROR() \ PIC_PROLOGUE(%g1,%g2); \ ld [%g1+_C_LABEL(__cerror)],%g2; jmp %g2; nop diff --git a/lib/libc/arch/sparc/gen/fixunsdfsi.S b/lib/libc/arch/sparc/gen/fixunsdfsi.S index ba5e33e4ff1..a3aff2c8779 100644 --- a/lib/libc/arch/sparc/gen/fixunsdfsi.S +++ b/lib/libc/arch/sparc/gen/fixunsdfsi.S @@ -1,4 +1,4 @@ -/* $OpenBSD: fixunsdfsi.S,v 1.6 2005/08/07 16:40:15 espie Exp $ */ +/* $OpenBSD: fixunsdfsi.S,v 1.7 2012/08/22 17:19:35 pascal Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -50,7 +50,7 @@ ENTRY(__fixunsdfsi) sub %sp, 8, %sp std %o0, [%sp + 64] ! get argument into fpu reg ldd [%sp + 64], %f0 -#ifdef PIC +#ifdef __PIC__ PICCY_SET(Lbig, %g1, %o0) ldd [%g1], %f2 #else diff --git a/lib/libc/arch/sparc/gen/modf.S b/lib/libc/arch/sparc/gen/modf.S index 8bdedf8641b..6eda1351ef4 100644 --- a/lib/libc/arch/sparc/gen/modf.S +++ b/lib/libc/arch/sparc/gen/modf.S @@ -1,4 +1,4 @@ -/* $OpenBSD: modf.S,v 1.7 2011/07/08 22:28:33 martynas Exp $ */ +/* $OpenBSD: modf.S,v 1.8 2012/08/22 17:19:35 pascal Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -92,7 +92,7 @@ ENTRY(modf) sethi %hi(0x80000000), %l1 ! sign bit andn %i0, %l1, %l0 st %l0, [%fp - 16] -#ifdef PIC +#ifdef __PIC__ PICCY_SET(Lmagic, %l0, %o7) ldd [%l0], %f2 #else @@ -173,7 +173,7 @@ Lbig: * case the integer part is the original value, and the * fractional part is 0. */ -#ifdef PIC +#ifdef __PIC__ PICCY_SET(L0, %l0, %o7) std %f0, [%i2] ! *ival = val; ldd [%l0], %f0 ! return 0.0; diff --git a/lib/libc/arch/sparc/gen/sigsetjmp.S b/lib/libc/arch/sparc/gen/sigsetjmp.S index 3891944eb58..76c1628844e 100644 --- a/lib/libc/arch/sparc/gen/sigsetjmp.S +++ b/lib/libc/arch/sparc/gen/sigsetjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigsetjmp.S,v 1.5 2005/08/07 16:40:15 espie Exp $ */ +/* $OpenBSD: sigsetjmp.S,v 1.6 2012/08/22 17:19:35 pascal Exp $ */ /* * Copyright (c) 1995 Paul Kranenburg * All rights reserved. @@ -32,7 +32,7 @@ #include "SYS.h" -#ifdef PIC +#ifdef __PIC__ ENTRY(sigsetjmp) PIC_PROLOGUE(%g1,%g2) ! %g1 = _GLOBAL_OFFSET_TABLE diff --git a/lib/libc/arch/sparc/string/ffs.S b/lib/libc/arch/sparc/string/ffs.S index eb1788a02cb..ae885d896c4 100644 --- a/lib/libc/arch/sparc/string/ffs.S +++ b/lib/libc/arch/sparc/string/ffs.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs.S,v 1.4 2005/08/07 16:40:15 espie Exp $ */ +/* $OpenBSD: ffs.S,v 1.5 2012/08/22 17:19:35 pascal Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -49,7 +49,7 @@ * that ffstab[0] must be -24 so that ffs(0) will return 0. */ ENTRY(ffs) -#ifdef PIC +#ifdef __PIC__ PICCY_SET(ffstab, %o2, %o5) #else set ffstab, %o2 diff --git a/lib/libc/arch/sparc/sys/brk.S b/lib/libc/arch/sparc/sys/brk.S index ea4738c4188..96dd6ef5cb0 100644 --- a/lib/libc/arch/sparc/sys/brk.S +++ b/lib/libc/arch/sparc/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.6 2005/08/07 16:40:15 espie Exp $ */ +/* $OpenBSD: brk.S,v 1.7 2012/08/22 17:19:35 pascal Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -41,7 +41,7 @@ minbrk: .long _end ! lower brk limit; also for gmon code .text -#ifdef PIC +#ifdef __PIC__ ENTRY(brk) PIC_PROLOGUE(%o5,%o4) ld [%o5 + minbrk], %o4 diff --git a/lib/libc/arch/sparc/sys/cerror.S b/lib/libc/arch/sparc/sys/cerror.S index 613b2bf953e..8287c0bf742 100644 --- a/lib/libc/arch/sparc/sys/cerror.S +++ b/lib/libc/arch/sparc/sys/cerror.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cerror.S,v 1.6 2011/04/04 12:42:39 guenther Exp $ */ +/* $OpenBSD: cerror.S,v 1.7 2012/08/22 17:19:35 pascal Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -40,7 +40,7 @@ WEAK_ALIAS(__cerror, ___cerror) FUNC(_C_LABEL(___cerror)) -#ifdef PIC +#ifdef __PIC__ ld [%g1 + _C_LABEL(errno)], %g1 st %o0, [%g1] #else diff --git a/lib/libc/arch/sparc/sys/sbrk.S b/lib/libc/arch/sparc/sys/sbrk.S index adddaf7d1b3..90bd7717247 100644 --- a/lib/libc/arch/sparc/sys/sbrk.S +++ b/lib/libc/arch/sparc/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.5 2005/08/07 16:40:15 espie Exp $ */ +/* $OpenBSD: sbrk.S,v 1.6 2012/08/22 17:19:35 pascal Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -42,7 +42,7 @@ __curbrk: .long _end .text ENTRY(sbrk) -#ifdef PIC +#ifdef __PIC__ PIC_PROLOGUE(%o5,%o4) ld [%o5 + __curbrk], %o2 ld [%o2], %o3 ! %o3 = old break diff --git a/lib/libc/arch/sparc/sys/setlogin.S b/lib/libc/arch/sparc/sys/setlogin.S index a03af6904d4..216df34eb1e 100644 --- a/lib/libc/arch/sparc/sys/setlogin.S +++ b/lib/libc/arch/sparc/sys/setlogin.S @@ -1,4 +1,4 @@ -/* $OpenBSD: setlogin.S,v 1.4 2005/08/07 16:40:15 espie Exp $ */ +/* $OpenBSD: setlogin.S,v 1.5 2012/08/22 17:19:35 pascal Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -37,7 +37,7 @@ .globl ___logname_valid /* in getlogin() */ SYSCALL(setlogin) -#ifdef PIC +#ifdef __PIC__ PIC_PROLOGUE(%g1,%g2) ld [%g1 + ___logname_valid], %g1 retl diff --git a/lib/libc/arch/sparc64/SYS.h b/lib/libc/arch/sparc64/SYS.h index 47ae6bca4c6..7f167c9de56 100644 --- a/lib/libc/arch/sparc64/SYS.h +++ b/lib/libc/arch/sparc64/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.9 2003/06/02 20:18:32 millert Exp $ */ +/* $OpenBSD: SYS.h,v 1.10 2012/08/22 17:19:35 pascal Exp $ */ /*- * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -53,7 +53,7 @@ * ERROR branches to cerror. This is done with a macro so that I can * change it to be position independent later, if need be. */ -#ifdef PIC +#ifdef __PIC__ #define CALL(name) \ PIC_PROLOGUE(%g1,%g2); \ sethi %hi(name),%g2; \ diff --git a/lib/libc/arch/sparc64/gen/fixunsdfsi.S b/lib/libc/arch/sparc64/gen/fixunsdfsi.S index aec3b66b49a..a515c828701 100644 --- a/lib/libc/arch/sparc64/gen/fixunsdfsi.S +++ b/lib/libc/arch/sparc64/gen/fixunsdfsi.S @@ -1,4 +1,4 @@ -/* $OpenBSD: fixunsdfsi.S,v 1.3 2003/07/21 18:43:55 jason Exp $ */ +/* $OpenBSD: fixunsdfsi.S,v 1.4 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: fixunsdfsi.S,v 1.3 2000/07/25 04:26:12 mycroft Exp $ */ /* * Copyright (c) 1992, 1993 @@ -58,7 +58,7 @@ Lbigf: ENTRY(__dtoul) sub %sp, 16, %sp std %f2, [%sp + 64 + BIAS + 8] -#ifdef PIC +#ifdef __PIC__ PICCY_SET(Lbigd, %g1, %o0) ldd [%g1], %f2 #else @@ -100,7 +100,7 @@ ENTRY(__ftoul) sub %sp, 16, %sp st %f1, [%sp + 64 + BIAS + 8] st %f2, [%sp + 64 + BIAS + 12] -#ifdef PIC +#ifdef __PIC__ PICCY_SET(Lbigf, %g1, %o0) ld [%g1], %f2 #else diff --git a/lib/libc/arch/sparc64/gen/modf.S b/lib/libc/arch/sparc64/gen/modf.S index 48023098a37..9850b7d94f3 100644 --- a/lib/libc/arch/sparc64/gen/modf.S +++ b/lib/libc/arch/sparc64/gen/modf.S @@ -1,4 +1,4 @@ -/* $OpenBSD: modf.S,v 1.5 2011/07/08 22:28:33 martynas Exp $ */ +/* $OpenBSD: modf.S,v 1.6 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: modf.S,v 1.3 2000/11/01 23:32:41 eeh Exp $ */ /* @@ -93,7 +93,7 @@ ENTRY(modf) */ fabsd %f0, %f4 ! %f4:f5 = v fcmped %fcc1, %f0, %f4 ! %fcc1 = (val == abs(val)) -#ifdef PIC +#ifdef __PIC__ PICCY_SET(Lmagic, %l0, %o7) ldd [%l0], %f2 #else @@ -167,7 +167,7 @@ Lbig: * case the integer part is the original value, and the * fractional part is 0. */ -#ifdef PIC +#ifdef __PIC__ PICCY_SET(L0, %l0, %o7) std %f0, [%i1] ! *ival = val; ldd [%l0], %f0 ! return 0.0; diff --git a/lib/libc/arch/sparc64/gen/sigsetjmp.S b/lib/libc/arch/sparc64/gen/sigsetjmp.S index 66e869e0e13..72833cc0547 100644 --- a/lib/libc/arch/sparc64/gen/sigsetjmp.S +++ b/lib/libc/arch/sparc64/gen/sigsetjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigsetjmp.S,v 1.2 2001/10/11 21:56:53 millert Exp $ */ +/* $OpenBSD: sigsetjmp.S,v 1.3 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: sigsetjmp.S,v 1.5 2000/08/28 00:45:59 eeh Exp $ */ /* * Copyright (c) 1995 Paul Kranenburg @@ -33,7 +33,7 @@ #include "SYS.h" -#ifdef PIC +#ifdef __PIC__ ENTRY(sigsetjmp) PIC_PROLOGUE(%g1,%o2) ! %g1 = _GLOBAL_OFFSET_TABLE diff --git a/lib/libc/arch/sparc64/string/ffs.S b/lib/libc/arch/sparc64/string/ffs.S index 82d2c073d49..ee55fdab384 100644 --- a/lib/libc/arch/sparc64/string/ffs.S +++ b/lib/libc/arch/sparc64/string/ffs.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs.S,v 1.3 2004/10/01 04:08:45 jsg Exp $ */ +/* $OpenBSD: ffs.S,v 1.4 2012/08/22 17:19:35 pascal Exp $ */ /* * Copyright (c) 1992, 1993 @@ -49,7 +49,7 @@ * that ffstab[0] must be -24 so that ffs(0) will return 0. */ ENTRY(ffs) -#ifdef PIC +#ifdef __PIC__ PICCY_SET(_C_LABEL(__ffstab), %o2, %o3) #else set _C_LABEL(__ffstab), %o2 diff --git a/lib/libc/arch/sparc64/sys/brk.S b/lib/libc/arch/sparc64/sys/brk.S index e1e22500577..188ca3db508 100644 --- a/lib/libc/arch/sparc64/sys/brk.S +++ b/lib/libc/arch/sparc64/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.4 2003/12/25 18:49:07 miod Exp $ */ +/* $OpenBSD: brk.S,v 1.5 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: brk.S,v 1.9 2000/07/25 20:15:40 mycroft Exp $ */ /* @@ -53,7 +53,7 @@ _C_LABEL(minbrk): .text ENTRY(_brk) -#ifdef PIC +#ifdef __PIC__ PIC_PROLOGUE(%o5,%o4) set _C_LABEL(minbrk), %o4 ldx [%o5 + %o4], %o4 diff --git a/lib/libc/arch/sparc64/sys/cerror.S b/lib/libc/arch/sparc64/sys/cerror.S index 50830c0b5da..67d5cd4c054 100644 --- a/lib/libc/arch/sparc64/sys/cerror.S +++ b/lib/libc/arch/sparc64/sys/cerror.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cerror.S,v 1.4 2011/04/04 12:42:39 guenther Exp $ */ +/* $OpenBSD: cerror.S,v 1.5 2012/08/22 17:19:35 pascal Exp $ */ /* * Copyright (c) 1992, 1993 @@ -41,7 +41,7 @@ WEAK_ALIAS(__cerror, ___cerror) .globl _C_LABEL(errno) FUNC(___cerror) -#ifdef PIC +#ifdef __PIC__ PIC_PROLOGUE(%g1, %o3) sethi %hi(_C_LABEL(errno)), %o3 or %o3, %lo(_C_LABEL(errno)), %o3 diff --git a/lib/libc/arch/sparc64/sys/sbrk.S b/lib/libc/arch/sparc64/sys/sbrk.S index 877b895bcda..58abd4f5098 100644 --- a/lib/libc/arch/sparc64/sys/sbrk.S +++ b/lib/libc/arch/sparc64/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.2 2003/06/02 20:18:33 millert Exp $ */ +/* $OpenBSD: sbrk.S,v 1.3 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: sbrk.S,v 1.7 2000/07/25 15:14:46 mycroft Exp $ */ /* @@ -48,7 +48,7 @@ _C_LABEL(__curbrk): .text ENTRY(sbrk) -#ifdef PIC +#ifdef __PIC__ PIC_PROLOGUE(%o5,%o4) set _C_LABEL(__curbrk), %o3 ldx [%o5 + %o3], %o2 diff --git a/lib/libc/arch/sparc64/sys/setlogin.S b/lib/libc/arch/sparc64/sys/setlogin.S index 28e40ad4eed..2d7aa3e4027 100644 --- a/lib/libc/arch/sparc64/sys/setlogin.S +++ b/lib/libc/arch/sparc64/sys/setlogin.S @@ -1,4 +1,4 @@ -/* $OpenBSD: setlogin.S,v 1.2 2003/06/02 20:18:33 millert Exp $ */ +/* $OpenBSD: setlogin.S,v 1.3 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: setlogin.S,v 1.3 2000/07/21 03:14:15 eeh Exp $ */ /* @@ -41,7 +41,7 @@ .globl _C_LABEL(__logname_valid) /* in getlogin() */ SYSCALL(setlogin) -#ifdef PIC +#ifdef __PIC__ PIC_PROLOGUE(%o1,%o2) set _C_LABEL(__logname_valid), %o2 ldx [%o1 + %o2], %o1 diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index ce75c6bb2bd..6f756922789 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.104 2012/08/21 15:30:09 pascal Exp $ +# $OpenBSD: Makefile.inc,v 1.105 2012/08/22 17:19:34 pascal Exp $ # $NetBSD: Makefile.inc,v 1.35 1995/10/16 23:49:07 jtc Exp $ # @(#)Makefile.inc 8.1 (Berkeley) 6/17/93 @@ -88,81 +88,90 @@ OBJS+= ${ASM} ${PSEUDO} ${PSEUDO_NOERR} ${GASM}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h @echo creating ${.TARGET} @printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \ - ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o + ${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} -x assembler-with-cpp - \ + -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o ${PASM}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h @echo creating ${.TARGET} @printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \ - ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o + ${COMPILE.S} -DPROF ${CFLAGS:M-[ID]*} ${AINC} \ + -x assembler-with-cpp - -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o ${SASM}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h @echo creating ${.TARGET} @printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \ - ${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} | \ - ${AS} ${ASPICFLAG} -o ${.TARGET} + ${COMPILE.S} ${PICFLAG} ${CFLAGS:M-[ID]*} ${AINC} \ + -x assembler-with-cpp - -o ${.TARGET} ${ASM}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h @echo creating ${.TARGET} @printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \ - ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o + ${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} -x assembler-with-cpp - \ + -o ${.TARGET}.o @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o ${GPSEUDO}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h @echo creating ${.TARGET} @printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \ - ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o + ${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} -x assembler-with-cpp - \ + -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o ${PPSEUDO}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h @echo creating ${.TARGET} @printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \ - ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o + ${COMPILE.S} -DPROF ${CFLAGS:M-[ID]*} ${AINC} \ + -x assembler-with-cpp - -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o ${SPSEUDO}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h @echo creating ${.TARGET} @printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \ - ${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} | \ - ${AS} ${ASPICFLAG} -o ${.TARGET} + ${COMPILE.S} ${PICFLAG} ${CFLAGS:M-[ID]*} ${AINC} \ + -x assembler-with-cpp - -o ${.TARGET} ${PSEUDO}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h @echo creating ${.TARGET} @printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \ - ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o + ${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} -x assembler-with-cpp - \ + -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o ${GPSEUDO_NOERR}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h @echo creating ${.TARGET} @printf '#include "SYS.h"\nPSEUDO_NOERROR(${.PREFIX},${.PREFIX:S/_//})\n' | \ - ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o + ${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} -x assembler-with-cpp - \ + -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o ${PPSEUDO_NOERR}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h @echo creating ${.TARGET} @printf '#include "SYS.h"\nPSEUDO_NOERROR(${.PREFIX},${.PREFIX:S/_//})\n' | \ - ${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o + ${COMPILE.S} -DPROF ${CFLAGS:M-[ID]*} ${AINC} \ + -x assembler-with-cpp - -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o ${SPSEUDO_NOERR}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h @echo creating ${.TARGET} @printf '#include "SYS.h"\nPSEUDO_NOERROR(${.PREFIX},${.PREFIX:S/_//})\n' | \ - ${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} | \ - ${AS} ${ASPICFLAG} -o ${.TARGET} + ${COMPILE.S} ${PICFLAG} ${CFLAGS:M-[ID]*} ${AINC} \ + -x assembler-with-cpp - -o ${.TARGET} ${PSEUDO_NOERR}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h @echo creating ${.TARGET} @printf '#include "SYS.h"\nPSEUDO_NOERROR(${.PREFIX},${.PREFIX:S/_//})\n' | \ - ${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o + ${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} -x assembler-with-cpp - \ + -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o diff --git a/lib/librthread/arch/m68k/cerror.S b/lib/librthread/arch/m68k/cerror.S index 0705a4aa841..15c2b617cdc 100644 --- a/lib/librthread/arch/m68k/cerror.S +++ b/lib/librthread/arch/m68k/cerror.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cerror.S,v 1.1 2011/10/17 06:39:20 guenther Exp $ */ +/* $OpenBSD: cerror.S,v 1.2 2012/08/22 17:19:35 pascal Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -38,7 +38,7 @@ .globl ___errno __cerror: movl d0,sp@- -#ifdef PIC +#ifdef __PIC__ movl #__GLOBAL_OFFSET_TABLE_,a0 lea pc@(0,a0:l),a0 movl a0@(___errno:l),a0 diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index d05539b6001..3bfb1ac75cb 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.lib.mk,v 1.64 2012/07/08 08:44:55 espie Exp $ +# $OpenBSD: bsd.lib.mk,v 1.65 2012/08/22 17:19:34 pascal Exp $ # $NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $ # @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 @@ -101,34 +101,30 @@ SHLIB_MINOR=${minor} @rm -f ${.TARGET}.o .S.o .s.o: - @echo "${CPP} ${CPPFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ - ${AS} -o ${.TARGET}" - @${CPP} ${CPPFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ - ${AS} -o ${.TARGET}.o + @echo "${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}" + @${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .S.go .s.go: - @echo "${CPP} ${CPPFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} |\ - ${AS} -o ${.TARGET}" - @${CPP} ${CPPFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ - ${AS} -o ${.TARGET}.o + @echo "${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}" + @${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .S.po .s.po: - @echo "${CPP} -DPROF ${CPPFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} |\ - ${AS} -o ${.TARGET}" - @${CPP} -DPROF ${CPPFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ - ${AS} -o ${.TARGET}.o + @echo "${COMPILE.S} -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} \ + -o ${.TARGET}" + @${COMPILE.S} -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} \ + -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o .S.so .s.so: - @echo "${CPP} -DPIC ${CPPFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ - ${AS} ${ASPICFLAG} -o ${.TARGET}" - @${CPP} -DPIC ${CPPFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ - ${AS} ${ASPICFLAG} -o ${.TARGET}.o + @echo "${COMPILE.S} ${PICFLAG} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} \ + -o ${.TARGET}" + @${COMPILE.S} ${PICFLAG} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} \ + -o ${.TARGET}.o @${LD} -X -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o diff --git a/sys/arch/amd64/include/asm.h b/sys/arch/amd64/include/asm.h index d9b41e9ac10..23bd1caf3b6 100644 --- a/sys/arch/amd64/include/asm.h +++ b/sys/arch/amd64/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $ */ +/* $OpenBSD: asm.h,v 1.4 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: asm.h,v 1.2 2003/05/02 18:05:47 yamt Exp $ */ /*- @@ -38,7 +38,7 @@ #ifndef _MACHINE_ASM_H_ #define _MACHINE_ASM_H_ -#ifdef PIC +#ifdef __PIC__ #define PIC_PLT(x) x@PLT #define PIC_GOT(x) x@GOTPCREL(%rip) #else diff --git a/sys/arch/amd64/include/profile.h b/sys/arch/amd64/include/profile.h index 56b984d2671..9cb638f6ad2 100644 --- a/sys/arch/amd64/include/profile.h +++ b/sys/arch/amd64/include/profile.h @@ -1,4 +1,4 @@ -/* $OpenBSD: profile.h,v 1.3 2006/10/28 16:20:04 kettenis Exp $ */ +/* $OpenBSD: profile.h,v 1.4 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: profile.h,v 1.3 2003/11/28 23:22:45 fvdl Exp $ */ /* @@ -34,7 +34,7 @@ #define _MCOUNT_DECL void _mcount -#ifdef PIC +#ifdef __PIC__ #define __MCPLT "@PLT" #else #define __MCPLT diff --git a/sys/arch/arm/include/profile.h b/sys/arch/arm/include/profile.h index 75df4f5e310..41c90f83dd2 100644 --- a/sys/arch/arm/include/profile.h +++ b/sys/arch/arm/include/profile.h @@ -1,4 +1,4 @@ -/* $OpenBSD: profile.h,v 1.2 2011/09/20 22:02:13 miod Exp $ */ +/* $OpenBSD: profile.h,v 1.3 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: profile.h,v 1.5 2002/03/24 15:49:40 bjh21 Exp $ */ /* @@ -41,7 +41,7 @@ #ifdef __ELF__ #define MCOUNT_ASM_NAME "__mcount" -#ifdef PIC +#ifdef __PIC__ #define PLTSYM "(PLT)" #endif #else diff --git a/sys/arch/i386/include/asm.h b/sys/arch/i386/include/asm.h index ce4d1de02ff..332afac5fd8 100644 --- a/sys/arch/i386/include/asm.h +++ b/sys/arch/i386/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.11 2011/03/23 16:54:35 pirofti Exp $ */ +/* $OpenBSD: asm.h,v 1.12 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: asm.h,v 1.7 1994/10/27 04:15:56 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #ifndef _MACHINE_ASM_H_ #define _MACHINE_ASM_H_ -#ifdef PIC +#ifdef __PIC__ #define PIC_PROLOGUE \ pushl %ebx; \ call 666f; \ diff --git a/sys/arch/powerpc/include/asm.h b/sys/arch/powerpc/include/asm.h index 14c950da7e9..305a55ef9cc 100644 --- a/sys/arch/powerpc/include/asm.h +++ b/sys/arch/powerpc/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.8 2010/10/01 05:02:19 guenther Exp $ */ +/* $OpenBSD: asm.h,v 1.9 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: asm.h,v 1.1 1996/09/30 16:34:20 ws Exp $ */ /* @@ -38,7 +38,7 @@ /* XXX */ #define TARGET_ELF -#ifdef PIC +#ifdef __PIC__ #define PIC_PROLOGUE XXX #define PIC_EPILOGUE XXX #ifdef __STDC__ diff --git a/sys/arch/sh/include/asm.h b/sys/arch/sh/include/asm.h index 69a8103db4a..e0c4afd9d65 100644 --- a/sys/arch/sh/include/asm.h +++ b/sys/arch/sh/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.2 2011/07/19 08:08:49 jsg Exp $ */ +/* $OpenBSD: asm.h,v 1.3 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: asm.h,v 1.25 2006/01/20 22:02:40 christos Exp $ */ /*- @@ -141,7 +141,7 @@ * CALL_DATUM(function, 2b) */ -#ifdef PIC +#ifdef __PIC__ #define PIC_PLT(x) x@PLT #define PIC_GOT(x) x@GOT diff --git a/sys/arch/sparc/include/asm.h b/sys/arch/sparc/include/asm.h index ad4dde78929..97b770066ff 100644 --- a/sys/arch/sparc/include/asm.h +++ b/sys/arch/sparc/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $ */ +/* $OpenBSD: asm.h,v 1.6 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: asm.h,v 1.5 1997/07/16 15:16:43 christos Exp $ */ /* @@ -71,7 +71,7 @@ #endif /* __ELF__ */ -#ifdef PIC +#ifdef __PIC__ /* * PIC_PROLOGUE() is akin to the compiler generated function prologue for * PIC code. It leaves the address of the Global Offset Table in DEST, diff --git a/sys/arch/sparc/include/profile.h b/sys/arch/sparc/include/profile.h index 972b8d476f5..ad607e94c70 100644 --- a/sys/arch/sparc/include/profile.h +++ b/sys/arch/sparc/include/profile.h @@ -1,4 +1,4 @@ -/* $OpenBSD: profile.h,v 1.8 2003/06/02 23:27:54 millert Exp $ */ +/* $OpenBSD: profile.h,v 1.9 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: profile.h,v 1.8 1997/02/01 20:56:40 mrg Exp $ */ /* @@ -53,7 +53,7 @@ #define _MCOUNT_ENTRY "mcount" #endif -#ifdef PIC +#ifdef __PIC__ /* Inline expansion of PICCY_SET() (see <machine/asm.h>). */ #define MCOUNT \ __asm__(".global " _MCOUNT_ENTRY);\ diff --git a/sys/arch/sparc64/include/asm.h b/sys/arch/sparc64/include/asm.h index b36bd0bacaf..433a38da925 100644 --- a/sys/arch/sparc64/include/asm.h +++ b/sys/arch/sparc64/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $ */ +/* $OpenBSD: asm.h,v 1.6 2012/08/22 17:19:35 pascal Exp $ */ /* $NetBSD: asm.h,v 1.15 2000/08/02 22:24:39 eeh Exp $ */ /* @@ -63,7 +63,7 @@ #endif #define _ASM_LABEL(name) name -#ifdef PIC +#ifdef __PIC__ /* * PIC_PROLOGUE() is akin to the compiler generated function prologue for * PIC code. It leaves the address of the Global Offset Table in DEST, diff --git a/sys/arch/sparc64/include/profile.h b/sys/arch/sparc64/include/profile.h index e2a46dd7530..f59ee450f8f 100644 --- a/sys/arch/sparc64/include/profile.h +++ b/sys/arch/sparc64/include/profile.h @@ -1,4 +1,4 @@ -/* $OpenBSD: profile.h,v 1.3 2003/06/02 23:27:56 millert Exp $ */ +/* $OpenBSD: profile.h,v 1.4 2012/08/22 17:19:35 pascal Exp $ */ /* * Copyright (c) 1992, 1993 @@ -40,7 +40,7 @@ * @(#)profile.h 8.1 (Berkeley) 6/11/93 */ -#ifdef PIC +#ifdef __PIC__ /* Inline expansion of PICCY_SET() (see <machine/asm.h>). */ #define MCOUNT \ __asm__(".global _mcount");\ |