From e9a848494f11dbb436871fccf88d2906dad117ae Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Wed, 20 Mar 2013 08:34:30 +0000 Subject: [PATCH] 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. --- contrib/llvm/tools/clang/lib/Driver/Tools.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/llvm/tools/clang/lib/Driver/Tools.cpp b/contrib/llvm/tools/clang/lib/Driver/Tools.cpp index 4976b45b6328..5739fa106e04 100644 --- a/contrib/llvm/tools/clang/lib/Driver/Tools.cpp +++ b/contrib/llvm/tools/clang/lib/Driver/Tools.cpp @@ -5438,6 +5438,7 @@ void freebsd::Assemble::ConstructJob(Compilation &C, const JobAction &JA, switch(getToolChain().getTriple().getEnvironment()) { case llvm::Triple::GNUEABI: case llvm::Triple::EABI: + CmdArgs.push_back("-meabi=5"); break; default: