--- a/hotspot/src/share/vm/runtime/arguments.cpp	Fri Jul 21 21:01:59 2017 -0400
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Mon Jul 24 09:32:35 2017 -0400
@@ -3073,16 +3073,6 @@
       if (FLAG_SET_CMDLINE(intx, ThreadStackSize, value) != Flag::SUCCESS) {
         return JNI_EINVAL;
       }
-    // -Xoss, -Xsqnopause, -Xoptimize, -Xboundthreads, -Xusealtsigs
-    } else if (match_option(option, "-Xoss", &tail) ||
-               match_option(option, "-Xsqnopause") ||
-               match_option(option, "-Xoptimize") ||
-               match_option(option, "-Xboundthreads") ||
-               match_option(option, "-Xusealtsigs")) {
-      // All these options are deprecated in JDK 9 and will be removed in a future release
-      char version[256];
-      JDK_Version::jdk(9).to_string(version, sizeof(version));
-      warning("Ignoring option %s; support was removed in %s", option->optionString, version);
     } else if (match_option(option, "-XX:CodeCacheExpansionSize=", &tail)) {
       julong long_CodeCacheExpansionSize = 0;
       ArgsRange errcode = parse_memory_size(tail, &long_CodeCacheExpansionSize, os::vm_page_size());

--- a/hotspot/test/runtime/CommandLine/TestNullTerminatedFlags.java	Fri Jul 21 21:01:59 2017 -0400
+++ b/hotspot/test/runtime/CommandLine/TestNullTerminatedFlags.java	Mon Jul 24 09:32:35 2017 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,10 +41,7 @@
             "-Xbatch",
             "-green",
             "-native",
-            "-Xsqnopause",
             "-Xrs",
-            "-Xusealtsigs",
-            "-Xoptimize",
             "-Xprof",
             "-Xconcurrentio",
             "-Xinternalversion",
@@ -57,8 +54,7 @@
             "-Xshare:auto",
             "-Xshare:off",
             "-Xdebug",
-            "-Xnoagent",
-            "-Xboundthreads"
+            "-Xnoagent"
         };
 
     public static void main(String args[]) throws Exception{