From owner-svn-src-head@FreeBSD.ORG  Wed Mar 20 08:34:31 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 618F2F1A;
 Wed, 20 Mar 2013 08:34:31 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3D0A13F8;
 Wed, 20 Mar 2013 08:34:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2K8YVAX053257;
 Wed, 20 Mar 2013 08:34:31 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2K8YV9w053256;
 Wed, 20 Mar 2013 08:34:31 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201303200834.r2K8YV9w053256@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Wed, 20 Mar 2013 08:34:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248548 - head/contrib/llvm/tools/clang/lib/Driver
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Wed, 20 Mar 2013 08:34:31 -0000

Author: andrew
Date: Wed Mar 20 08:34:30 2013
New Revision: 248548
URL: http://svnweb.freebsd.org/changeset/base/248548

Log:
  Pull in r177252 from upstream clang trunk:
  
   Make sure to use same EABI version for external assembler as for
   integrated as.
  
  This allows us to use gcc on a world built with clang on ARM.

Modified:
  head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp

Modified: head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Wed Mar 20 08:26:16 2013	(r248547)
+++ head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Wed Mar 20 08:34:30 2013	(r248548)
@@ -5438,6 +5438,7 @@ void freebsd::Assemble::ConstructJob(Com
     switch(getToolChain().getTriple().getEnvironment()) {
     case llvm::Triple::GNUEABI:
     case llvm::Triple::EABI:
+      CmdArgs.push_back("-meabi=5");
       break;
 
     default: