From owner-svn-src-projects@FreeBSD.ORG Fri Aug 30 08:25:08 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A291ED9F; Fri, 30 Aug 2013 08:25:08 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 765FD2134; Fri, 30 Aug 2013 08:25:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7U8P82B077293; Fri, 30 Aug 2013 08:25:08 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7U8P8so077291; Fri, 30 Aug 2013 08:25:08 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201308300825.r7U8P8so077291@svn.freebsd.org> From: Andrew Turner Date: Fri, 30 Aug 2013 08:25:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r255061 - projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/Driver X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Aug 2013 08:25:08 -0000 Author: andrew Date: Fri Aug 30 08:25:07 2013 New Revision: 255061 URL: http://svnweb.freebsd.org/changeset/base/255061 Log: Start supporting the ARM EABI Hard-Float ABI in clang Modified: projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Modified: projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp ============================================================================== --- projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp Fri Aug 30 07:59:49 2013 (r255060) +++ projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp Fri Aug 30 08:25:07 2013 (r255061) @@ -1841,6 +1841,7 @@ Tool *FreeBSD::buildLinker() const { bool FreeBSD::UseSjLjExceptions() const { // FreeBSD uses SjLj exceptions on ARM oabi. switch (getTriple().getEnvironment()) { + case llvm::Triple::GNUEABIHF: case llvm::Triple::GNUEABI: case llvm::Triple::EABI: return false; Modified: projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/Driver/Tools.cpp ============================================================================== --- projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Fri Aug 30 07:59:49 2013 (r255060) +++ projects/arm_eabi_vfp/contrib/llvm/tools/clang/lib/Driver/Tools.cpp Fri Aug 30 08:25:07 2013 (r255061) @@ -660,8 +660,15 @@ static StringRef getARMFloatABI(const Dr } case llvm::Triple::FreeBSD: - // FreeBSD defaults to soft float - FloatABI = "soft"; + switch(Triple.getEnvironment()) { + case llvm::Triple::GNUEABIHF: + FloatABI = "hard"; + break; + default: + // FreeBSD defaults to soft float + FloatABI = "soft"; + break; + } break; default: @@ -5401,8 +5408,18 @@ void freebsd::Assemble::ConstructJob(Com } } else if (getToolChain().getArch() == llvm::Triple::arm || getToolChain().getArch() == llvm::Triple::thumb) { - CmdArgs.push_back("-mfpu=softvfp"); + const Driver &D = getToolChain().getDriver(); + llvm::Triple Triple = getToolChain().getTriple(); + StringRef FloatABI = getARMFloatABI(D, Args, Triple); + + if (FloatABI == "hard") { + CmdArgs.push_back("-mfpu=vfp"); + } else { + CmdArgs.push_back("-mfpu=softvfp"); + } + switch(getToolChain().getTriple().getEnvironment()) { + case llvm::Triple::GNUEABIHF: case llvm::Triple::GNUEABI: case llvm::Triple::EABI: CmdArgs.push_back("-meabi=5");