Revert r274772: it is not valid on MIPS

Reported by:	sbruno

6 files changed, 10 insertions, 10 deletions

diff --git a/lib/libc/gen/errlst.c b/lib/libc/gen/errlst.c
index 12d9f8b..f8fe968 100644
--- a/lib/libc/gen/errlst.c
+++ b/lib/libc/gen/errlst.c
@@ -158,7 +158,7 @@ const char *const sys_errlist[] = {
 };
 const int sys_nerr = sizeof(sys_errlist) / sizeof(sys_errlist[0]);
 
-#ifdef __PIC__
+#ifdef PIC
 __strong_reference(sys_errlist, __hidden_sys_errlist);
 __strong_reference(sys_nerr, __hidden_sys_nerr);
 #endif
diff --git a/lib/libc/gen/isnan.c b/lib/libc/gen/isnan.c
index 0eb7372..72c2868 100644
--- a/lib/libc/gen/isnan.c
+++ b/lib/libc/gen/isnan.c
@@ -40,7 +40,7 @@
  * time, when calling both functions.
  */
 
-#ifdef __PIC__
+#ifdef PIC
 __weak_reference(__isnan, isnan);
 __weak_reference(__isnanf, isnanf);
 
@@ -61,4 +61,4 @@ __isnanf(float f)
 	u.f = f;
 	return (u.bits.exp == 255 && u.bits.man != 0);
 }
-#endif /* __PIC__ */
+#endif /* PIC */
diff --git a/lib/libc/gen/tls.c b/lib/libc/gen/tls.c
index 96b15ec..5219418 100644
--- a/lib/libc/gen/tls.c
+++ b/lib/libc/gen/tls.c
@@ -78,7 +78,7 @@ void __libc_free_tls(void *tls, size_t tcbsize, size_t tcbalign);
 #define TLS_VARIANT_II
 #endif
 
-#ifndef __PIC__
+#ifndef PIC
 
 #define round(size, align) \
 	(((size) + (align) - 1) & ~((align) - 1))
@@ -107,7 +107,7 @@ __libc_tls_get_addr(void *ti __unused)
 	return (0);
 }
 
-#ifndef __PIC__
+#ifndef PIC
 
 #ifdef TLS_VARIANT_I
 
@@ -264,14 +264,14 @@ __libc_free_tls(void *tcb __unused, size_t tcbsize __unused,
 {
 }
 
-#endif /* __PIC__ */
+#endif /* PIC */
 
 extern char **environ;
 
 void
 _init_tls()
 {
-#ifndef __PIC__
+#ifndef PIC
 	Elf_Addr *sp;
 	Elf_Auxinfo *aux, *auxp;
 	Elf_Phdr *phdr;
diff --git a/lib/libc/include/errlst.h b/lib/libc/include/errlst.h
index 1b329b3..4e9e29f 100644
--- a/lib/libc/include/errlst.h
+++ b/lib/libc/include/errlst.h
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-#ifdef __PIC__
+#ifdef PIC
 /* If the main executable imports these, do not use its copy from libc.so. */
 extern const char *const __hidden_sys_errlist[] __hidden;
 extern const int __hidden_sys_nerr __hidden;
diff --git a/lib/libc/sys/stack_protector.c b/lib/libc/sys/stack_protector.c
index 6ce2a25..ed7d635 100644
--- a/lib/libc/sys/stack_protector.c
+++ b/lib/libc/sys/stack_protector.c
@@ -115,6 +115,6 @@ __chk_fail(void)
 	__fail("buffer overflow detected; terminated");
 }
 
-#ifndef __PIC__
+#ifndef PIC
 __weak_reference(__stack_chk_fail, __stack_chk_fail_local);
 #endif
diff --git a/lib/libc/sys/stack_protector_compat.c b/lib/libc/sys/stack_protector_compat.c
index 888eb5e..cacb863 100644
--- a/lib/libc/sys/stack_protector_compat.c
+++ b/lib/libc/sys/stack_protector_compat.c
@@ -8,7 +8,7 @@ __FBSDID("$FreeBSD$");
 
 void __stack_chk_fail(void);
 
-#ifdef __PIC__
+#ifdef PIC
 void
 __stack_chk_fail_local_hidden(void)
 {