diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -1327,28 +1327,18 @@
 
   unsigned Index = Args.getBaseArgs().MakeIndex(A->getValue(ValuePos));
   unsigned Prev = Index;
-  std::unique_ptr<llvm::opt::Arg> XarchArg(Opts.ParseOneArg(Args, Index));
+  std::unique_ptr<llvm::opt::Arg> XarchArg(
+      Opts.ParseOneArg(Args, Index, 0, options::NoXarchOption));
 
   // If the argument parsing failed or more than one argument was
   // consumed, the -Xarch_ argument's parameter tried to consume
   // extra arguments. Emit an error and ignore.
-  //
-  // We also want to disallow any options which would alter the
-  // driver behavior; that isn't going to work in our model. We
-  // use options::NoXarchOption to control this.
   if (!XarchArg || Index > Prev + 1) {
     getDriver().Diag(diag::err_drv_invalid_Xarch_argument_with_args)
         << A->getAsString(Args);
     return;
-  } else if (XarchArg->getOption().hasFlag(options::NoXarchOption)) {
-    auto &Diags = getDriver().getDiags();
-    unsigned DiagID =
-        Diags.getCustomDiagID(DiagnosticsEngine::Error,
-                              "invalid Xarch argument: '%0', not all driver "
-                              "options can be forwared via Xarch argument");
-    Diags.Report(DiagID) << A->getAsString(Args);
-    return;
   }
+
   XarchArg->setBaseArg(A);
   A = XarchArg.release();
   if (!AllocatedArgs)
diff --git a/clang/test/Driver/hip-options.hip b/clang/test/Driver/hip-options.hip
--- a/clang/test/Driver/hip-options.hip
+++ b/clang/test/Driver/hip-options.hip
@@ -33,6 +33,11 @@
 // DEV: "-cc1"{{.*}} "-fcuda-is-device" {{.*}} "-debug-info-kind={{.*}}" {{.*}} "-fcf-protection=branch" {{.*}}"-mllvm" "--inline-threshold=100"
 // DEV-NOT: clang{{.*}} {{.*}} "-debug-info-kind={{.*}}"
 
+// RUN: %clang -### -Xarch_device -O1 --cuda-gpu-arch=gfx900 -v \
+// RUN:   %s 2>&1 | FileCheck -check-prefix=DEV %s
+// DEV: "-cc1" {{.*}} "-O1" {{.*}} 
+
+
 // RUN: %clang -### -Xarch_host -g -nogpulib --cuda-gpu-arch=gfx900 \
 // RUN:   --cuda-gpu-arch=gfx906  %s 2>&1 | FileCheck -check-prefix=HOST %s
 // HOST-NOT: "-fcuda-is-device" {{.*}} "-debug-info-kind={{.*}}"