From owner-svn-src-stable@FreeBSD.ORG  Fri Feb  3 23:32:23 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7CFDD1065670;
	Fri,  3 Feb 2012 23:32:23 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B2488FC12;
	Fri,  3 Feb 2012 23:32:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q13NWNBW009480;
	Fri, 3 Feb 2012 23:32:23 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q13NWN3J009478;
	Fri, 3 Feb 2012 23:32:23 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201202032332.q13NWN3J009478@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 3 Feb 2012 23:32:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230969 - stable/9/contrib/llvm/lib/Target/X86
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Feb 2012 23:32:23 -0000

Author: dim
Date: Fri Feb  3 23:32:22 2012
New Revision: 230969
URL: http://svn.freebsd.org/changeset/base/230969

Log:
  MFC r230393:
  
  Pull in r148240 from upstream llvm trunk:
  
    Make sure the non-SSE lowering for fences correctly clobbers EFLAGS.
    PR11768.
  
  In particular, this fixes segfaults during the build of devel/icu on
  i386.  The __sync_synchronize() builtin used for implementing icu's
  internal barrier could lead to incorrect behaviour.

Modified:
  stable/9/contrib/llvm/lib/Target/X86/X86InstrCompiler.td
Directory Properties:
  stable/9/contrib/llvm/   (props changed)

Modified: stable/9/contrib/llvm/lib/Target/X86/X86InstrCompiler.td
==============================================================================
--- stable/9/contrib/llvm/lib/Target/X86/X86InstrCompiler.td	Fri Feb  3 23:27:07 2012	(r230968)
+++ stable/9/contrib/llvm/lib/Target/X86/X86InstrCompiler.td	Fri Feb  3 23:32:22 2012	(r230969)
@@ -533,7 +533,7 @@ def ATOMSWAP6432 : I<0, Pseudo, (outs GR
 // Memory barriers
 
 // TODO: Get this to fold the constant into the instruction.
-let isCodeGenOnly = 1 in
+let isCodeGenOnly = 1, Defs = [EFLAGS] in
 def OR32mrLocked  : I<0x09, MRMDestMem, (outs), (ins i32mem:$dst, GR32:$zero),
                       "lock\n\t"
                       "or{l}\t{$zero, $dst|$dst, $zero}",