From owner-svn-src-head@freebsd.org  Wed Jan 11 02:21:36 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 488E5CAA3FC;
 Wed, 11 Jan 2017 02:21:36 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 14F911575;
 Wed, 11 Jan 2017 02:21:36 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0B2LZ1v010287;
 Wed, 11 Jan 2017 02:21:35 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0B2LZCV010286;
 Wed, 11 Jan 2017 02:21:35 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201701110221.v0B2LZCV010286@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to
 jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Wed, 11 Jan 2017 02:21:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r311912 - head/sys/powerpc/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Jan 2017 02:21:36 -0000

Author: jhibbits
Date: Wed Jan 11 02:21:34 2017
New Revision: 311912
URL: https://svnweb.freebsd.org/changeset/base/311912

Log:
  Force all TOC references in asm to include '@toc'
  
  This reportedly fixes one problem with booting a clang kernel.
  
  PR:		kern/215819
  Submitted by:	Mark Millard <markmi AT dsl-only.net>
  MFC after:	2 weeks

Modified:
  head/sys/powerpc/include/asm.h

Modified: head/sys/powerpc/include/asm.h
==============================================================================
--- head/sys/powerpc/include/asm.h	Wed Jan 11 01:53:54 2017	(r311911)
+++ head/sys/powerpc/include/asm.h	Wed Jan 11 02:21:34 2017	(r311912)
@@ -89,10 +89,11 @@
 	name:
 
 #ifdef __powerpc64__
-#define TOC_REF(name)	__CONCAT(.L,name)
+#define TOC_NAME_FOR_REF(name)	__CONCAT(.L,name)
+#define	TOC_REF(name)	TOC_NAME_FOR_REF(name)@toc
 #define TOC_ENTRY(name) \
 	.section ".toc","aw"; \
-	TOC_REF(name): \
+	TOC_NAME_FOR_REF(name): \
         .tc name[TC],name
 #endif