From owner-svn-src-stable-7@FreeBSD.ORG  Tue Sep 21 12:57:44 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 45F081065670;
	Tue, 21 Sep 2010 12:57:44 +0000 (UTC)
	(envelope-from tijl@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 348A88FC19;
	Tue, 21 Sep 2010 12:57:44 +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 o8LCviu5094953;
	Tue, 21 Sep 2010 12:57:44 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8LCvi4a094950;
	Tue, 21 Sep 2010 12:57:44 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201009211257.o8LCvi4a094950@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 21 Sep 2010 12:57:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212963 - stable/7/gnu/lib/libstdc++
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Sep 2010 12:57:44 -0000

Author: tijl
Date: Tue Sep 21 12:57:43 2010
New Revision: 212963
URL: http://svn.freebsd.org/changeset/base/212963

Log:
  MFC r212286:
  
  GCC defines built-ins for atomic instructions found on i486 and higher.
  Because FreeBSD no longer supports the 80386 cpu all code targeting
  FreeBSD/i386 necessarily runs on i486 or higher so the compiler
  built-ins can be used by default inside libstdc++ and in C++ headers.
  This allows newly compiled C++ code to inline some atomic operations.
  Old binaries continue to use libstdc++ functions.
  
  Approved by:	kib (mentor)

Modified:
  stable/7/gnu/lib/libstdc++/Makefile
  stable/7/gnu/lib/libstdc++/config.h
Directory Properties:
  stable/7/gnu/lib/libstdc++/   (props changed)

Modified: stable/7/gnu/lib/libstdc++/Makefile
==============================================================================
--- stable/7/gnu/lib/libstdc++/Makefile	Tue Sep 21 12:55:20 2010	(r212962)
+++ stable/7/gnu/lib/libstdc++/Makefile	Tue Sep 21 12:57:43 2010	(r212963)
@@ -82,7 +82,7 @@ ATOMICITY_H=	${SRCDIR}/config/cpu/${MARC
 ATOMICITY_H=	${SRCDIR}/config/cpu/generic/atomicity_mutex/atomicity.h
 .endif
 
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 .if exists(${SRCDIR}/config/cpu/generic/atomicity_builtins/atomicity.h)
 ATOMICITY_H=	${SRCDIR}/config/cpu/generic/atomicity_builtins/atomicity.h
 .endif

Modified: stable/7/gnu/lib/libstdc++/config.h
==============================================================================
--- stable/7/gnu/lib/libstdc++/config.h	Tue Sep 21 12:55:20 2010	(r212962)
+++ stable/7/gnu/lib/libstdc++/config.h	Tue Sep 21 12:57:43 2010	(r212963)
@@ -671,7 +671,7 @@
 /* #undef VERSION */
 
 /* Define if builtin atomic operations are supported on this host. */
-#if defined(__amd64__)
+#if defined(__amd64__) || defined(__i386__)
 #define _GLIBCXX_ATOMIC_BUILTINS 1
 #endif