diff options
| -rw-r--r-- | lib/Driver/Tools.cpp | 3 | ||||
| -rw-r--r-- | test/Driver/flags.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 77c7d2270b..c5499dea76 100644 --- a/lib/Driver/Tools.cpp +++ b/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/test/Driver/flags.c b/test/Driver/flags.c index 698a54ecf7..d328b827bb 100644 --- a/test/Driver/flags.c +++ b/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 |