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@

3 files changed, 10 insertions, 10 deletions

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