From owner-svn-src-all@FreeBSD.ORG Sat Jul 10 14:39:09 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A404E106566C; Sat, 10 Jul 2010 14:39:09 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 79D1D8FC16; Sat, 10 Jul 2010 14:39:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6AEd9tX082508; Sat, 10 Jul 2010 14:39:09 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6AEd9Qg082505; Sat, 10 Jul 2010 14:39:09 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201007101439.o6AEd9Qg082505@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 10 Jul 2010 14:39:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209876 - in head: lib/libc/gen sys/sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Sat, 10 Jul 2010 14:39:09 -0000 Author: nwhitehorn Date: Sat Jul 10 14:39:08 2010 New Revision: 209876 URL: http://svn.freebsd.org/changeset/base/209876 Log: The 64-bit PowerPC ABI implemented in binutils 2.15 requires some special quirks for weak-symbol handling. Text symbols require also marking weak the special dot-symbol associated with the function, and data symbols require that you not do that. To fix this, provide a hacked __weak_reference for powerpc64, and define a new __weak_reference_data for the single weak data symbol in base. Revert after: binutils 2.17 import Obtained from: projects/ppc64 Modified: head/lib/libc/gen/_thread_init.c head/sys/sys/cdefs.h Modified: head/lib/libc/gen/_thread_init.c ============================================================================== --- head/lib/libc/gen/_thread_init.c Sat Jul 10 14:34:37 2010 (r209875) +++ head/lib/libc/gen/_thread_init.c Sat Jul 10 14:39:08 2010 (r209876) @@ -32,7 +32,8 @@ __FBSDID("$FreeBSD$"); void _thread_init_stub(void); __weak_reference(_thread_init_stub, _thread_init); -__weak_reference(_thread_autoinit_dummy_decl_stub, _thread_autoinit_dummy_decl); +__weak_reference_data(_thread_autoinit_dummy_decl_stub, + _thread_autoinit_dummy_decl); int _thread_autoinit_dummy_decl_stub = 0; Modified: head/sys/sys/cdefs.h ============================================================================== --- head/sys/sys/cdefs.h Sat Jul 10 14:34:37 2010 (r209875) +++ head/sys/sys/cdefs.h Sat Jul 10 14:39:08 2010 (r209876) @@ -356,8 +356,19 @@ extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym))) #endif #ifdef __STDC__ +#ifdef __powerpc64__ #define __weak_reference(sym,alias) \ __asm__(".weak " #alias); \ + __asm__(".equ " #alias ", " #sym); \ + __asm__(".weak ." #alias); \ + __asm__(".equ ." #alias ", ." #sym) +#else +#define __weak_reference(sym,alias) \ + __asm__(".weak " #alias); \ + __asm__(".equ " #alias ", " #sym) +#endif +#define __weak_reference_data(sym,alias)\ + __asm__(".weak " #alias); \ __asm__(".equ " #alias ", " #sym) #define __warn_references(sym,msg) \ __asm__(".section .gnu.warning." #sym); \