--- /dev/null	2020-01-24 17:51:16.000000000 -0800
+++ new/test/hotspot/jtreg/runtime/StackGap/TestStackGap.java	2020-01-24 17:51:15.000000000 -0800
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2020, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary Linux kernel stack guard should not cause segfaults on x86-32
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib
+ * @requires os.family == "linux"
+ * @compile T.java
+ * @run main/native TestStackGap
+ */
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class TestStackGap {
+    public static void main(String args[]) throws Exception {
+        ProcessBuilder pb = new ProcessBuilder("stack-gap");
+        (new OutputAnalyzer(pb.start()))
+            .shouldHaveExitValue(0);
+
+        pb = new ProcessBuilder("stack-gap", "-XX:+DisablePrimordialThreadGuardPages");
+        (new OutputAnalyzer(pb.start()))
+            .shouldHaveExitValue(0);
+    }
+}
+