From owner-svn-src-projects@FreeBSD.ORG  Fri Oct 16 09:03:31 2009
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 E0F401065672;
	Fri, 16 Oct 2009 09:03:31 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D0A688FC15;
	Fri, 16 Oct 2009 09:03:31 +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 n9G93VoD098638;
	Fri, 16 Oct 2009 09:03:31 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9G93VSa098636;
	Fri, 16 Oct 2009 09:03:31 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200910160903.n9G93VSa098636@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Fri, 16 Oct 2009 09:03:31 +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: r198166 -
	projects/clangbsd/contrib/llvm/tools/clang/lib/Driver
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: Fri, 16 Oct 2009 09:03:32 -0000

Author: rdivacky
Date: Fri Oct 16 09:03:31 2009
New Revision: 198166
URL: http://svn.freebsd.org/changeset/base/198166

Log:
  Fix mismerge.

Modified:
  projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Driver.cpp

Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Driver.cpp
==============================================================================
--- projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Driver.cpp	Fri Oct 16 08:19:08 2009	(r198165)
+++ projects/clangbsd/contrib/llvm/tools/clang/lib/Driver/Driver.cpp	Fri Oct 16 09:03:31 2009	(r198166)
@@ -65,9 +65,6 @@ Driver::Driver(const char *_Name, const 
 
     CCCUseClangCXX = false;
   }
-
-  // XXX: Enable ARM
-  CCCClangArchs.insert("arm");
 }
 
 Driver::~Driver() {