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@

9 files changed, 20 insertions, 20 deletions

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