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@

14 files changed, 31 insertions, 31 deletions

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