From owner-svn-src-projects@FreeBSD.ORG  Tue May 18 09:15:26 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F219E106566B;
	Tue, 18 May 2010 09:15:26 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E24838FC15;
	Tue, 18 May 2010 09:15:26 +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 o4I9FQLp002468;
	Tue, 18 May 2010 09:15:26 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4I9FQq9002466;
	Tue, 18 May 2010 09:15:26 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <201005180915.o4I9FQq9002466@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Tue, 18 May 2010 09:15:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208257 - projects/clangbsd/contrib/llvm/lib/System
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 May 2010 09:15:27 -0000

Author: rdivacky
Date: Tue May 18 09:15:26 2010
New Revision: 208257
URL: http://svn.freebsd.org/changeset/base/208257

Log:
  Follow up on r208038.

Modified:
  projects/clangbsd/contrib/llvm/lib/System/Memory.cpp

Modified: projects/clangbsd/contrib/llvm/lib/System/Memory.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/lib/System/Memory.cpp	Tue May 18 08:55:23 2010	(r208256)
+++ projects/clangbsd/contrib/llvm/lib/System/Memory.cpp	Tue May 18 09:15:26 2010	(r208257)
@@ -61,7 +61,7 @@ void llvm::sys::Memory::InvalidateInstru
   for (intptr_t Line = StartLine; Line < EndLine; Line += LineSize)
     asm volatile("icbi 0, %0" : : "r"(Line));
   asm volatile("isync");
-#  elif defined(__arm__) && defined(__GNUC__)
+#  elif defined(__arm__) && defined(__GNUC__) && !defined(__FreeBSD__)
   // FIXME: Can we safely always call this for __GNUC__ everywhere?
   char *Start = (char*) Addr;
   char *End = Start + Len;