From 2cc9690f5e1df4bb602379d6cd43361e4fbd2276 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Sun, 10 Feb 2013 15:25:44 +0000 Subject: [PATCH] Recognize -mno-implicit-float option for x86 as well as ARM. For x86 targets, we've been using the -msoft-float option to control passing the no-implicit-float option to cc1. Since the -mno-implicit-float option is now accepted by the driver, this just makes it work for x86 the same as it does for ARM targets. llvm-svn: 174836 --- clang/lib/Driver/Tools.cpp | 3 ++- clang/test/Driver/flags.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 77c7d22..c5499de 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -1202,7 +1202,8 @@ void Clang::AddX86TargetArgs(const ArgList &Args, if (Args.hasFlag(options::OPT_msoft_float, options::OPT_mno_soft_float, - false)) + false) || + Args.hasArg(options::OPT_mno_implicit_float)) CmdArgs.push_back("-no-implicit-float"); if (const char *CPUName = getX86TargetCPU(Args, getToolChain().getTriple())) { diff --git a/clang/test/Driver/flags.c b/clang/test/Driver/flags.c index 698a54e..d328b82 100644 --- a/clang/test/Driver/flags.c +++ b/clang/test/Driver/flags.c @@ -7,5 +7,8 @@ // RUN: %clang -target i386-apple-darwin9 -### -S -mno-soft-float %s -msoft-float 2> %t.log // RUN: grep '"-no-implicit-float"' %t.log +// RUN: %clang -target i386-apple-darwin9 -### -S -mno-implicit-float %s 2> %t.log +// RUN: grep '"-no-implicit-float"' %t.log + // RUN: %clang -target armv7-apple-darwin10 -### -S -mno-implicit-float %s 2> %t.log -// RUN: grep '"-no-implicit-float"' %t.log | count 1 +// RUN: grep '"-no-implicit-float"' %t.log -- 2.7.4