From owner-svn-src-head@FreeBSD.ORG  Fri Jan 20 19:18:11 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DF0801065739;
	Fri, 20 Jan 2012 19:18:11 +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 C9CC48FC14;
	Fri, 20 Jan 2012 19:18:11 +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 q0KJIBGo055078;
	Fri, 20 Jan 2012 19:18:11 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0KJIBFv055076;
	Fri, 20 Jan 2012 19:18:11 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201201201918.q0KJIBFv055076@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 20 Jan 2012 19:18:11 +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: r230393 - head/contrib/llvm/lib/Target/X86
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Jan 2012 19:18:12 -0000

Author: dim
Date: Fri Jan 20 19:18:11 2012
New Revision: 230393
URL: http://svn.freebsd.org/changeset/base/230393

Log:
  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.
  
  MFC after:	3 days

Modified:
  head/contrib/llvm/lib/Target/X86/X86InstrCompiler.td

Modified: head/contrib/llvm/lib/Target/X86/X86InstrCompiler.td
==============================================================================
--- head/contrib/llvm/lib/Target/X86/X86InstrCompiler.td	Fri Jan 20 18:55:56 2012	(r230392)
+++ head/contrib/llvm/lib/Target/X86/X86InstrCompiler.td	Fri Jan 20 19:18:11 2012	(r230393)
@@ -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}",