From owner-svn-src-stable-10@freebsd.org  Fri Jun 26 21:35:38 2015
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 0D89398DC0F;
 Fri, 26 Jun 2015 21:35:38 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
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 F2F531072;
 Fri, 26 Jun 2015 21:35:37 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5QLZb94086320;
 Fri, 26 Jun 2015 21:35:37 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5QLZbXn086318;
 Fri, 26 Jun 2015 21:35:37 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201506262135.t5QLZbXn086318@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Fri, 26 Jun 2015 21:35:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r284880 - stable/10/sys/sys
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Jun 2015 21:35:38 -0000

Author: hselasky
Date: Fri Jun 26 21:35:36 2015
New Revision: 284880
URL: https://svnweb.freebsd.org/changeset/base/284880

Log:
  MFC r284743:
  Rename __weak to __weak_symbol to avoid language conflict with objective-C.
  
  PR:		200972 (exp-run)
  Suggested by:	theraven@

Modified:
  stable/10/sys/sys/cdefs.h
  stable/10/sys/sys/linker_set.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/sys/cdefs.h
==============================================================================
--- stable/10/sys/sys/cdefs.h	Fri Jun 26 19:55:01 2015	(r284879)
+++ stable/10/sys/sys/cdefs.h	Fri Jun 26 21:35:36 2015	(r284880)
@@ -213,9 +213,9 @@
 #define	__packed
 #define	__aligned(x)
 #define	__section(x)
-#define	__weak
+#define	__weak_symbol
 #else
-#define	__weak		__attribute__((__weak__))
+#define	__weak_symbol	__attribute__((__weak__))
 #if !__GNUC_PREREQ__(2, 5) && !defined(__INTEL_COMPILER)
 #define	__dead2
 #define	__pure2

Modified: stable/10/sys/sys/linker_set.h
==============================================================================
--- stable/10/sys/sys/linker_set.h	Fri Jun 26 19:55:01 2015	(r284879)
+++ stable/10/sys/sys/linker_set.h	Fri Jun 26 21:35:36 2015	(r284880)
@@ -69,8 +69,8 @@
  * Initialize before referring to a given linker set.
  */
 #define SET_DECLARE(set, ptype)					\
-	extern ptype __weak *__CONCAT(__start_set_,set);	\
-	extern ptype __weak *__CONCAT(__stop_set_,set)
+	extern ptype __weak_symbol *__CONCAT(__start_set_,set);	\
+	extern ptype __weak_symbol *__CONCAT(__stop_set_,set)
 
 #define SET_BEGIN(set)							\
 	(&__CONCAT(__start_set_,set))