diff options
author | emaste <emaste@FreeBSD.org> | 2014-11-25 03:50:31 +0000 |
---|---|---|
committer | emaste <emaste@FreeBSD.org> | 2014-11-25 03:50:31 +0000 |
commit | fda27c9937b724b3c3e24266d58c4be4d1839e7f (patch) | |
tree | 8af8a3fb8f37ea396b60dd6e474d26d3b108cc1a | |
parent | d375864ce9ed7583a0bf26a4f4933a26c49ecd60 (diff) | |
download | FreeBSD-src-fda27c9937b724b3c3e24266d58c4be4d1839e7f.zip FreeBSD-src-fda27c9937b724b3c3e24266d58c4be4d1839e7f.tar.gz |
Revert r274772: it is not valid on MIPS
Reported by: sbruno
-rw-r--r-- | lib/libc/gen/errlst.c | 2 | ||||
-rw-r--r-- | lib/libc/gen/isnan.c | 4 | ||||
-rw-r--r-- | lib/libc/gen/tls.c | 8 | ||||
-rw-r--r-- | lib/libc/include/errlst.h | 2 | ||||
-rw-r--r-- | lib/libc/sys/stack_protector.c | 2 | ||||
-rw-r--r-- | lib/libc/sys/stack_protector_compat.c | 2 | ||||
-rw-r--r-- | lib/libkiconv/quirks.c | 4 | ||||
-rw-r--r-- | lib/libkiconv/xlat16_iconv.c | 4 | ||||
-rw-r--r-- | lib/libkiconv/xlat16_sysctl.c | 4 | ||||
-rw-r--r-- | lib/libmd/rmd160c.c | 2 | ||||
-rw-r--r-- | lib/libmd/sha1c.c | 2 | ||||
-rw-r--r-- | lib/libthr/thread/thr_exit.c | 10 | ||||
-rw-r--r-- | lib/libthr/thread/thr_private.h | 2 | ||||
-rw-r--r-- | lib/msun/src/s_isnan.c | 4 | ||||
-rw-r--r-- | libexec/rtld-elf/rtld.c | 2 | ||||
-rw-r--r-- | sys/amd64/include/asm.h | 2 | ||||
-rw-r--r-- | sys/arm/include/asm.h | 4 | ||||
-rw-r--r-- | sys/i386/include/asm.h | 2 | ||||
-rw-r--r-- | sys/powerpc/include/asm.h | 2 | ||||
-rw-r--r-- | sys/powerpc/include/profile.h | 2 | ||||
-rw-r--r-- | sys/sparc64/include/asm.h | 2 |
21 files changed, 34 insertions, 34 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) { diff --git a/lib/libkiconv/quirks.c b/lib/libkiconv/quirks.c index 2bab7c5..d1cc607 100644 --- a/lib/libkiconv/quirks.c +++ b/lib/libkiconv/quirks.c @@ -31,7 +31,7 @@ * when statically linked. */ -#ifdef __PIC__ +#ifdef PIC /* * Why do we need quirks? @@ -193,4 +193,4 @@ kiconv_quirkcs(const char* base __unused, int vendor __unused) return (base); } -#endif /* __PIC__ */ +#endif /* PIC */ diff --git a/lib/libkiconv/xlat16_iconv.c b/lib/libkiconv/xlat16_iconv.c index 702eba8..fee3c77 100644 --- a/lib/libkiconv/xlat16_iconv.c +++ b/lib/libkiconv/xlat16_iconv.c @@ -31,7 +31,7 @@ * when statically linked. */ -#ifdef __PIC__ +#ifdef PIC #include <sys/types.h> #include <sys/iconv.h> @@ -462,4 +462,4 @@ kiconv_add_xlat16_cspairs(const char *tocode __unused, const char *fromcode __un return (-1); } -#endif /* __PIC__ */ +#endif /* PIC */ diff --git a/lib/libkiconv/xlat16_sysctl.c b/lib/libkiconv/xlat16_sysctl.c index 7c3504f..ae4dae7 100644 --- a/lib/libkiconv/xlat16_sysctl.c +++ b/lib/libkiconv/xlat16_sysctl.c @@ -37,7 +37,7 @@ * when statically linked. */ -#ifdef __PIC__ +#ifdef PIC #include <sys/types.h> #include <sys/iconv.h> @@ -82,4 +82,4 @@ kiconv_add_xlat16_table(const char *to __unused, const char *from __unused, return (EINVAL); } -#endif /* __PIC__ */ +#endif /* PIC */ diff --git a/lib/libmd/rmd160c.c b/lib/libmd/rmd160c.c index 522b4c7..e01f1e0 100644 --- a/lib/libmd/rmd160c.c +++ b/lib/libmd/rmd160c.c @@ -75,7 +75,7 @@ __FBSDID("$FreeBSD$"); * The assembly-language code is not position-independent, so don't * try to use it in a shared library. */ -#ifdef __PIC__ +#ifdef PIC #undef RMD160_ASM #endif diff --git a/lib/libmd/sha1c.c b/lib/libmd/sha1c.c index 2ca4618e..ba3278a 100644 --- a/lib/libmd/sha1c.c +++ b/lib/libmd/sha1c.c @@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$"); * The assembly-language code is not position-independent, so don't * try to use it in a shared library. */ -#ifdef __PIC__ +#ifdef PIC #undef SHA1_ASM #endif diff --git a/lib/libthr/thread/thr_exit.c b/lib/libthr/thread/thr_exit.c index 7b13db6..7001311 100644 --- a/lib/libthr/thread/thr_exit.c +++ b/lib/libthr/thread/thr_exit.c @@ -54,7 +54,7 @@ __weak_reference(_pthread_exit, pthread_exit); static int message_printed; static void thread_unwind(void) __dead2; -#ifdef __PIC__ +#ifdef PIC static void thread_uw_init(void); static _Unwind_Reason_Code thread_unwind_stop(int version, _Unwind_Action actions, @@ -114,7 +114,7 @@ _Unwind_GetCFA(struct _Unwind_Context *context) #else #pragma weak _Unwind_GetCFA #pragma weak _Unwind_ForcedUnwind -#endif /* __PIC__ */ +#endif /* PIC */ static void thread_unwind_cleanup(_Unwind_Reason_Code code, struct _Unwind_Exception *e) @@ -222,11 +222,11 @@ _pthread_exit_mask(void *status, sigset_t *mask) curthread->ret = status; #ifdef _PTHREAD_FORCED_UNWIND -#ifdef __PIC__ +#ifdef PIC thread_uw_init(); -#endif /* __PIC__ */ +#endif /* PIC */ -#ifdef __PIC__ +#ifdef PIC if (uwl_forcedunwind != NULL) { #else if (_Unwind_ForcedUnwind != NULL) { diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index f9735e7..c6651cd 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -100,7 +100,7 @@ TAILQ_HEAD(mutex_queue, pthread_mutex); #define THR_ASSERT(cond, msg) #endif -#ifdef __PIC__ +#ifdef PIC # define STATIC_LIB_REQUIRE(name) #else # define STATIC_LIB_REQUIRE(name) __asm (".globl " #name) diff --git a/lib/msun/src/s_isnan.c b/lib/msun/src/s_isnan.c index eabae9d..a54ded3 100644 --- a/lib/msun/src/s_isnan.c +++ b/lib/msun/src/s_isnan.c @@ -31,7 +31,7 @@ #include "fpmath.h" /* Provided by libc.so */ -#ifndef __PIC__ +#ifndef PIC #undef isnan int isnan(double d) @@ -41,7 +41,7 @@ isnan(double d) u.d = d; return (u.bits.exp == 2047 && (u.bits.manl != 0 || u.bits.manh != 0)); } -#endif /* !__PIC__ */ +#endif /* !PIC */ int __isnanf(float f) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 57cb306..cc7afda 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1817,7 +1817,7 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info) objtmp.path = NULL; objtmp.rtld = true; objtmp.mapbase = mapbase; -#ifdef __PIC__ +#ifdef PIC objtmp.relocbase = mapbase; #endif if (RTLD_IS_DYNAMIC()) { diff --git a/sys/amd64/include/asm.h b/sys/amd64/include/asm.h index 429c6a9..87272f7 100644 --- a/sys/amd64/include/asm.h +++ b/sys/amd64/include/asm.h @@ -38,7 +38,7 @@ #include <sys/cdefs.h> -#ifdef __PIC__ +#ifdef PIC #define PIC_PLT(x) x@PLT #define PIC_GOT(x) x@GOTPCREL(%rip) #else diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h index c718848..9577001 100644 --- a/sys/arm/include/asm.h +++ b/sys/arm/include/asm.h @@ -104,7 +104,7 @@ #define ASMSTR .asciz -#if defined(__PIC__) +#if defined(PIC) #define PLT_SYM(x) PIC_SYM(x, PLT) #define GOT_SYM(x) PIC_SYM(x, GOT) #define GOT_GET(x,got,sym) \ @@ -131,7 +131,7 @@ #define GOT_INIT(got,gotsym,pclabel) #define GOT_INITSYM(gotsym,pclabel) #define PIC_SYM(x,y) x -#endif /* __PIC__ */ +#endif /* PIC */ #undef __FBSDID #if !defined(lint) && !defined(STRIP_FBSDID) diff --git a/sys/i386/include/asm.h b/sys/i386/include/asm.h index 378a585..b2d4a6b 100644 --- a/sys/i386/include/asm.h +++ b/sys/i386/include/asm.h @@ -38,7 +38,7 @@ #include <sys/cdefs.h> -#ifdef __PIC__ +#ifdef PIC #define PIC_PROLOGUE \ pushl %ebx; \ call 1f; \ diff --git a/sys/powerpc/include/asm.h b/sys/powerpc/include/asm.h index 6b0ec1a..e571316 100644 --- a/sys/powerpc/include/asm.h +++ b/sys/powerpc/include/asm.h @@ -37,7 +37,7 @@ #include <sys/cdefs.h> -#if defined(__PIC__) && !defined(__powerpc64__) +#if defined(PIC) && !defined(__powerpc64__) #define PIC_PROLOGUE XXX #define PIC_EPILOGUE XXX #define PIC_PLT(x) x@plt diff --git a/sys/powerpc/include/profile.h b/sys/powerpc/include/profile.h index 5c578c4..eb11fc9 100644 --- a/sys/powerpc/include/profile.h +++ b/sys/powerpc/include/profile.h @@ -119,7 +119,7 @@ __asm( " .text \n" \ " blr \n"); #else -#ifdef __PIC__ +#ifdef PIC #define _PLT "@plt" #else #define _PLT diff --git a/sys/sparc64/include/asm.h b/sys/sparc64/include/asm.h index 8a9f354..dea06c5 100644 --- a/sys/sparc64/include/asm.h +++ b/sys/sparc64/include/asm.h @@ -41,7 +41,7 @@ #include <sys/cdefs.h> -#ifdef __PIC__ +#ifdef PIC #define PIC_PROLOGUE(r1, r2) \ sethi %hi(_GLOBAL_OFFSET_TABLE_-4), r1 ; \ rd %pc, r2 ; \ |