diff --git a/flang/lib/Frontend/CompilerInvocation.cpp b/flang/lib/Frontend/CompilerInvocation.cpp
--- a/flang/lib/Frontend/CompilerInvocation.cpp
+++ b/flang/lib/Frontend/CompilerInvocation.cpp
@@ -677,8 +677,6 @@
                                    llvm::opt::ArgList &args,
                                    clang::DiagnosticsEngine &diags) {
   LangOptions &opts = invoc.getLangOpts();
-  const unsigned diagUnimplemented = diags.getCustomDiagID(
-      clang::DiagnosticsEngine::Warning, "%0 is not currently implemented");
 
   if (const llvm::opt::Arg *a =
           args.getLastArg(clang::driver::options::OPT_ffp_contract)) {
@@ -695,43 +693,36 @@
       return false;
     }
 
-    diags.Report(diagUnimplemented) << a->getOption().getName();
     opts.setFPContractMode(fpContractMode);
   }
 
   if (const llvm::opt::Arg *a =
           args.getLastArg(clang::driver::options::OPT_menable_no_infinities)) {
-    diags.Report(diagUnimplemented) << a->getOption().getName();
     opts.NoHonorInfs = true;
   }
 
   if (const llvm::opt::Arg *a =
           args.getLastArg(clang::driver::options::OPT_menable_no_nans)) {
-    diags.Report(diagUnimplemented) << a->getOption().getName();
     opts.NoHonorNaNs = true;
   }
 
   if (const llvm::opt::Arg *a =
           args.getLastArg(clang::driver::options::OPT_fapprox_func)) {
-    diags.Report(diagUnimplemented) << a->getOption().getName();
     opts.ApproxFunc = true;
   }
 
   if (const llvm::opt::Arg *a =
           args.getLastArg(clang::driver::options::OPT_fno_signed_zeros)) {
-    diags.Report(diagUnimplemented) << a->getOption().getName();
     opts.NoSignedZeros = true;
   }
 
   if (const llvm::opt::Arg *a =
           args.getLastArg(clang::driver::options::OPT_mreassociate)) {
-    diags.Report(diagUnimplemented) << a->getOption().getName();
     opts.AssociativeMath = true;
   }
 
   if (const llvm::opt::Arg *a =
           args.getLastArg(clang::driver::options::OPT_freciprocal_math)) {
-    diags.Report(diagUnimplemented) << a->getOption().getName();
     opts.ReciprocalMath = true;
   }
 
diff --git a/flang/test/Driver/flang_fp_opts.f90 b/flang/test/Driver/flang_fp_opts.f90
deleted file mode 100644
--- a/flang/test/Driver/flang_fp_opts.f90
+++ /dev/null
@@ -1,18 +0,0 @@
-! Test for handling of floating point options within the frontend driver
-
-! RUN: %flang_fc1 \
-! RUN:      -ffp-contract=fast \
-! RUN:      -menable-no-infs \
-! RUN:      -menable-no-nans \
-! RUN:      -fapprox-func \
-! RUN:      -fno-signed-zeros \
-! RUN:      -mreassociate \
-! RUN:      -freciprocal-math \
-! RUN:      %s 2>&1 | FileCheck %s
-! CHECK: ffp-contract= is not currently implemented
-! CHECK: menable-no-infs is not currently implemented
-! CHECK: menable-no-nans is not currently implemented
-! CHECK: fapprox-func is not currently implemented
-! CHECK: fno-signed-zeros is not currently implemented
-! CHECK: mreassociate is not currently implemented
-! CHECK: freciprocal-math is not currently implemented