From owner-svn-src-all@FreeBSD.ORG Tue Nov 25 03:50:37 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C43965E0; Tue, 25 Nov 2014 03:50:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AA316310; Tue, 25 Nov 2014 03:50:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAP3obAO087913; Tue, 25 Nov 2014 03:50:37 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAP3oWG2087885; Tue, 25 Nov 2014 03:50:32 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201411250350.sAP3oWG2087885@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 25 Nov 2014 03:50:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r275004 - in head: lib/libc/gen lib/libc/include lib/libc/sys lib/libkiconv lib/libmd lib/libthr/thread lib/msun/src libexec/rtld-elf sys/amd64/include sys/arm/include sys/i386/include ... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 03:50:37 -0000 Author: emaste Date: Tue Nov 25 03:50:31 2014 New Revision: 275004 URL: https://svnweb.freebsd.org/changeset/base/275004 Log: Revert r274772: it is not valid on MIPS Reported by: sbruno Modified: head/lib/libc/gen/errlst.c head/lib/libc/gen/isnan.c head/lib/libc/gen/tls.c head/lib/libc/include/errlst.h head/lib/libc/sys/stack_protector.c head/lib/libc/sys/stack_protector_compat.c head/lib/libkiconv/quirks.c head/lib/libkiconv/xlat16_iconv.c head/lib/libkiconv/xlat16_sysctl.c head/lib/libmd/rmd160c.c head/lib/libmd/sha1c.c head/lib/libthr/thread/thr_exit.c head/lib/libthr/thread/thr_private.h head/lib/msun/src/s_isnan.c head/libexec/rtld-elf/rtld.c head/sys/amd64/include/asm.h head/sys/arm/include/asm.h head/sys/i386/include/asm.h head/sys/powerpc/include/asm.h head/sys/powerpc/include/profile.h head/sys/sparc64/include/asm.h Modified: head/lib/libc/gen/errlst.c ============================================================================== --- head/lib/libc/gen/errlst.c Tue Nov 25 02:58:38 2014 (r275003) +++ head/lib/libc/gen/errlst.c Tue Nov 25 03:50:31 2014 (r275004) @@ -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 Modified: head/lib/libc/gen/isnan.c ============================================================================== --- head/lib/libc/gen/isnan.c Tue Nov 25 02:58:38 2014 (r275003) +++ head/lib/libc/gen/isnan.c Tue Nov 25 03:50:31 2014 (r275004) @@ -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 */ Modified: head/lib/libc/gen/tls.c ============================================================================== --- head/lib/libc/gen/tls.c Tue Nov 25 02:58:38 2014 (r275003) +++ head/lib/libc/gen/tls.c Tue Nov 25 03:50:31 2014 (r275004) @@ -78,7 +78,7 @@ void __libc_free_tls(void *tls, size_t t #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 { } -#endif /* __PIC__ */ +#endif /* PIC */ extern char **environ; void _init_tls() { -#ifndef __PIC__ +#ifndef PIC Elf_Addr *sp; Elf_Auxinfo *aux, *auxp; Elf_Phdr *phdr; Modified: head/lib/libc/include/errlst.h ============================================================================== --- head/lib/libc/include/errlst.h Tue Nov 25 02:58:38 2014 (r275003) +++ head/lib/libc/include/errlst.h Tue Nov 25 03:50:31 2014 (r275004) @@ -31,7 +31,7 @@ #include -#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; Modified: head/lib/libc/sys/stack_protector.c ============================================================================== --- head/lib/libc/sys/stack_protector.c Tue Nov 25 02:58:38 2014 (r275003) +++ head/lib/libc/sys/stack_protector.c Tue Nov 25 03:50:31 2014 (r275004) @@ -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 Modified: head/lib/libc/sys/stack_protector_compat.c ============================================================================== --- head/lib/libc/sys/stack_protector_compat.c Tue Nov 25 02:58:38 2014 (r275003) +++ head/lib/libc/sys/stack_protector_compat.c Tue Nov 25 03:50:31 2014 (r275004) @@ -8,7 +8,7 @@ __FBSDID("$FreeBSD$"); void __stack_chk_fail(void); -#ifdef __PIC__ +#ifdef PIC void __stack_chk_fail_local_hidden(void) { Modified: head/lib/libkiconv/quirks.c ============================================================================== --- head/lib/libkiconv/quirks.c Tue Nov 25 02:58:38 2014 (r275003) +++ head/lib/libkiconv/quirks.c Tue Nov 25 03:50:31 2014 (r275004) @@ -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 return (base); } -#endif /* __PIC__ */ +#endif /* PIC */ Modified: head/lib/libkiconv/xlat16_iconv.c ============================================================================== --- head/lib/libkiconv/xlat16_iconv.c Tue Nov 25 02:58:38 2014 (r275003) +++ head/lib/libkiconv/xlat16_iconv.c Tue Nov 25 03:50:31 2014 (r275004) @@ -31,7 +31,7 @@ * when statically linked. */ -#ifdef __PIC__ +#ifdef PIC #include #include @@ -462,4 +462,4 @@ kiconv_add_xlat16_cspairs(const char *to return (-1); } -#endif /* __PIC__ */ +#endif /* PIC */ Modified: head/lib/libkiconv/xlat16_sysctl.c ============================================================================== --- head/lib/libkiconv/xlat16_sysctl.c Tue Nov 25 02:58:38 2014 (r275003) +++ head/lib/libkiconv/xlat16_sysctl.c Tue Nov 25 03:50:31 2014 (r275004) @@ -37,7 +37,7 @@ * when statically linked. */ -#ifdef __PIC__ +#ifdef PIC #include #include @@ -82,4 +82,4 @@ kiconv_add_xlat16_table(const char *to _ return (EINVAL); } -#endif /* __PIC__ */ +#endif /* PIC */ Modified: head/lib/libmd/rmd160c.c ============================================================================== --- head/lib/libmd/rmd160c.c Tue Nov 25 02:58:38 2014 (r275003) +++ head/lib/libmd/rmd160c.c Tue Nov 25 03:50:31 2014 (r275004) @@ -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 Modified: head/lib/libmd/sha1c.c ============================================================================== --- head/lib/libmd/sha1c.c Tue Nov 25 02:58:38 2014 (r275003) +++ head/lib/libmd/sha1c.c Tue Nov 25 03:50:31 2014 (r275004) @@ -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 Modified: head/lib/libthr/thread/thr_exit.c ============================================================================== --- head/lib/libthr/thread/thr_exit.c Tue Nov 25 02:58:38 2014 (r275003) +++ head/lib/libthr/thread/thr_exit.c Tue Nov 25 03:50:31 2014 (r275004) @@ -54,7 +54,7 @@ __weak_reference(_pthread_exit, pthread_ 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 *c #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_ 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) { Modified: head/lib/libthr/thread/thr_private.h ============================================================================== --- head/lib/libthr/thread/thr_private.h Tue Nov 25 02:58:38 2014 (r275003) +++ head/lib/libthr/thread/thr_private.h Tue Nov 25 03:50:31 2014 (r275004) @@ -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) Modified: head/lib/msun/src/s_isnan.c ============================================================================== --- head/lib/msun/src/s_isnan.c Tue Nov 25 02:58:38 2014 (r275003) +++ head/lib/msun/src/s_isnan.c Tue Nov 25 03:50:31 2014 (r275004) @@ -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) Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Tue Nov 25 02:58:38 2014 (r275003) +++ head/libexec/rtld-elf/rtld.c Tue Nov 25 03:50:31 2014 (r275004) @@ -1817,7 +1817,7 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo * objtmp.path = NULL; objtmp.rtld = true; objtmp.mapbase = mapbase; -#ifdef __PIC__ +#ifdef PIC objtmp.relocbase = mapbase; #endif if (RTLD_IS_DYNAMIC()) { Modified: head/sys/amd64/include/asm.h ============================================================================== --- head/sys/amd64/include/asm.h Tue Nov 25 02:58:38 2014 (r275003) +++ head/sys/amd64/include/asm.h Tue Nov 25 03:50:31 2014 (r275004) @@ -38,7 +38,7 @@ #include -#ifdef __PIC__ +#ifdef PIC #define PIC_PLT(x) x@PLT #define PIC_GOT(x) x@GOTPCREL(%rip) #else Modified: head/sys/arm/include/asm.h ============================================================================== --- head/sys/arm/include/asm.h Tue Nov 25 02:58:38 2014 (r275003) +++ head/sys/arm/include/asm.h Tue Nov 25 03:50:31 2014 (r275004) @@ -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) Modified: head/sys/i386/include/asm.h ============================================================================== --- head/sys/i386/include/asm.h Tue Nov 25 02:58:38 2014 (r275003) +++ head/sys/i386/include/asm.h Tue Nov 25 03:50:31 2014 (r275004) @@ -38,7 +38,7 @@ #include -#ifdef __PIC__ +#ifdef PIC #define PIC_PROLOGUE \ pushl %ebx; \ call 1f; \ Modified: head/sys/powerpc/include/asm.h ============================================================================== --- head/sys/powerpc/include/asm.h Tue Nov 25 02:58:38 2014 (r275003) +++ head/sys/powerpc/include/asm.h Tue Nov 25 03:50:31 2014 (r275004) @@ -37,7 +37,7 @@ #include -#if defined(__PIC__) && !defined(__powerpc64__) +#if defined(PIC) && !defined(__powerpc64__) #define PIC_PROLOGUE XXX #define PIC_EPILOGUE XXX #define PIC_PLT(x) x@plt Modified: head/sys/powerpc/include/profile.h ============================================================================== --- head/sys/powerpc/include/profile.h Tue Nov 25 02:58:38 2014 (r275003) +++ head/sys/powerpc/include/profile.h Tue Nov 25 03:50:31 2014 (r275004) @@ -119,7 +119,7 @@ __asm( " .text \n" \ " blr \n"); #else -#ifdef __PIC__ +#ifdef PIC #define _PLT "@plt" #else #define _PLT Modified: head/sys/sparc64/include/asm.h ============================================================================== --- head/sys/sparc64/include/asm.h Tue Nov 25 02:58:38 2014 (r275003) +++ head/sys/sparc64/include/asm.h Tue Nov 25 03:50:31 2014 (r275004) @@ -41,7 +41,7 @@ #include -#ifdef __PIC__ +#ifdef PIC #define PIC_PROLOGUE(r1, r2) \ sethi %hi(_GLOBAL_OFFSET_TABLE_-4), r1 ; \ rd %pc, r2 ; \